revisit the linking logic

25 files changed, 2096 insertions, 2008 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 42b858f..9b150e1 100644
--- a/common/gtk-3.0/3.14/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.14/gtk-contained-dark.css
@@ -163,9 +163,10 @@ GtkFlowBox .grid-child {
   .entry:focus {
     background-clip: border-box;
     color: #D3DAE3;
-    border-color: #5294E2;
+    border-color: #2b2e39;
     background-color: #404552;
-    background-image: linear-gradient(to bottom, #404552); }
+    background-image: linear-gradient(to bottom, #404552);
+    box-shadow: inset 1px 1px #5294E2, inset -1px -1px #5294E2; }
   .entry:insensitive {
     color: rgba(211, 218, 227, 0.45);
     border-color: rgba(43, 46, 57, 0.55);
@@ -303,9 +304,7 @@ GtkSearchEntry.entry {
     background-clip: padding-box;
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #8b98b0;
-    background-color: #8b98b0;
-    border-color: transparent;
+    border-color: #2b2e39;
     background-color: #5294E2;
     transition-duration: 50ms; }
   .button:active {
@@ -535,9 +534,7 @@ GtkSearchEntry.entry {
   .inline-toolbar GtkToolButton > .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #8b98b0;
-    background-color: #8b98b0;
-    border-color: transparent;
+    border-color: #2b2e39;
     background-color: #5294E2; }
   .inline-toolbar GtkToolButton > .button:insensitive {
     color: rgba(211, 218, 227, 0.45);
@@ -784,9 +781,7 @@ GtkSearchEntry.entry {
     .spinbutton.vertical .button:first-child:active, .spinbutton.vertical:dir(rtl) .button:first-child:active {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #8b98b0;
-      background-color: #8b98b0;
-      border-color: transparent;
+      border-color: #2b2e39;
       background-color: #5294E2; }
     .spinbutton.vertical .button:first-child:hover, .spinbutton.vertical:dir(rtl) .button:first-child:hover {
       color: #D3DAE3;
@@ -807,9 +802,7 @@ GtkSearchEntry.entry {
     .spinbutton.vertical .button:last-child:active, .spinbutton.vertical:dir(rtl) .button:last-child:active {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #8b98b0;
-      background-color: #8b98b0;
-      border-color: transparent;
+      border-color: #2b2e39;
       background-color: #5294E2; }
     .spinbutton.vertical .button:last-child:hover, .spinbutton.vertical:dir(rtl) .button:last-child:hover {
       color: #D3DAE3;
@@ -854,12 +847,8 @@ GtkComboBox {
     -GtkWidget-wide-separators: true; }
   GtkComboBox.combobox-entry .entry:dir(ltr) {
     border-right-style: none; }
-    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 {
@@ -2165,6 +2154,10 @@ GtkCalendar {
     background-image: none; }
     GtkCalendar.button:hover, GtkCalendar.button:focus:hover {
       color: #D3DAE3; }
+    GtkCalendar.button:insensitive, GtkCalendar.button:focus:insensitive {
+      color: rgba(211, 218, 227, 0.45);
+      background-color: transparent;
+      background-image: none; }
   GtkCalendar.highlight {
     color: alpha(currentColor,0.55); }
 
@@ -3548,9 +3541,7 @@ GtkListBox .h4 {
   #content_frame .button:active, #content_frame .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #8b98b0;
-    background-color: #8b98b0;
-    border-color: transparent;
+    border-color: #2b2e39;
     background-color: #5294E2; }
   #content_frame .button:insensitive {
     color: rgba(211, 218, 227, 0.45);
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 2d2523f..c987323 100644
--- a/common/gtk-3.0/3.14/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.14/gtk-contained-darker.css
@@ -303,9 +303,7 @@ GtkSearchEntry.entry {
     background-clip: border-box;
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #8f9aae;
-    background-color: #8f9aae;
-    border-color: transparent;
+    border-color: #5294E2;
     background-color: #5294E2;
     transition-duration: 50ms; }
   .button:active {
@@ -535,9 +533,7 @@ GtkSearchEntry.entry {
   .inline-toolbar GtkToolButton > .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #8f9aae;
-    background-color: #8f9aae;
-    border-color: transparent;
+    border-color: #5294E2;
     background-color: #5294E2; }
   .inline-toolbar GtkToolButton > .button:insensitive {
     color: rgba(92, 97, 108, 0.55);
@@ -784,9 +780,7 @@ GtkSearchEntry.entry {
     .spinbutton.vertical .button:first-child:active, .spinbutton.vertical:dir(rtl) .button:first-child:active {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #8f9aae;
-      background-color: #8f9aae;
-      border-color: transparent;
+      border-color: #5294E2;
       background-color: #5294E2; }
     .spinbutton.vertical .button:first-child:hover, .spinbutton.vertical:dir(rtl) .button:first-child:hover {
       color: #5c616c;
@@ -807,9 +801,7 @@ GtkSearchEntry.entry {
     .spinbutton.vertical .button:last-child:active, .spinbutton.vertical:dir(rtl) .button:last-child:active {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #8f9aae;
-      background-color: #8f9aae;
-      border-color: transparent;
+      border-color: #5294E2;
       background-color: #5294E2; }
     .spinbutton.vertical .button:last-child:hover, .spinbutton.vertical:dir(rtl) .button:last-child:hover {
       color: #5c616c;
@@ -2165,6 +2157,10 @@ GtkCalendar {
     background-image: none; }
     GtkCalendar.button:hover, GtkCalendar.button:focus:hover {
       color: #5c616c; }
+    GtkCalendar.button:insensitive, GtkCalendar.button:focus:insensitive {
+      color: rgba(92, 97, 108, 0.55);
+      background-color: transparent;
+      background-image: none; }
   GtkCalendar.highlight {
     color: alpha(currentColor,0.55); }
 
@@ -3548,9 +3544,7 @@ GtkListBox .h4 {
   #content_frame .button:active, #content_frame .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #8f9aae;
-    background-color: #8f9aae;
-    border-color: transparent;
+    border-color: #5294E2;
     background-color: #5294E2; }
   #content_frame .button:insensitive {
     color: rgba(92, 97, 108, 0.55);
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 be60037..f0970de 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
@@ -163,9 +163,10 @@ GtkFlowBox .grid-child {
   .entry:focus {
     background-clip: border-box;
     color: #D3DAE3;
-    border-color: #5294E2;
+    border-color: #2b2e39;
     background-color: #404552;
-    background-image: linear-gradient(to bottom, #404552); }
+    background-image: linear-gradient(to bottom, #404552);
+    box-shadow: inset 1px 1px #5294E2, inset -1px -1px #5294E2; }
   .entry:insensitive {
     color: rgba(211, 218, 227, 0.45);
     border-color: rgba(43, 46, 57, 0.55);
@@ -303,9 +304,7 @@ GtkSearchEntry.entry {
     background-clip: padding-box;
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #8b98b0;
-    background-color: #8b98b0;
-    border-color: transparent;
+    border-color: #2b2e39;
     background-color: #5294E2;
     transition-duration: 50ms; }
   .button:active {
@@ -535,9 +534,7 @@ GtkSearchEntry.entry {
   .inline-toolbar GtkToolButton > .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #8b98b0;
-    background-color: #8b98b0;
-    border-color: transparent;
+    border-color: #2b2e39;
     background-color: #5294E2; }
   .inline-toolbar GtkToolButton > .button:insensitive {
     color: rgba(211, 218, 227, 0.45);
@@ -784,9 +781,7 @@ GtkSearchEntry.entry {
     .spinbutton.vertical .button:first-child:active, .spinbutton.vertical:dir(rtl) .button:first-child:active {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #8b98b0;
-      background-color: #8b98b0;
-      border-color: transparent;
+      border-color: #2b2e39;
       background-color: #5294E2; }
     .spinbutton.vertical .button:first-child:hover, .spinbutton.vertical:dir(rtl) .button:first-child:hover {
       color: #D3DAE3;
@@ -807,9 +802,7 @@ GtkSearchEntry.entry {
     .spinbutton.vertical .button:last-child:active, .spinbutton.vertical:dir(rtl) .button:last-child:active {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #8b98b0;
-      background-color: #8b98b0;
-      border-color: transparent;
+      border-color: #2b2e39;
       background-color: #5294E2; }
     .spinbutton.vertical .button:last-child:hover, .spinbutton.vertical:dir(rtl) .button:last-child:hover {
       color: #D3DAE3;
@@ -854,12 +847,8 @@ GtkComboBox {
     -GtkWidget-wide-separators: true; }
   GtkComboBox.combobox-entry .entry:dir(ltr) {
     border-right-style: none; }
-    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 {
@@ -2165,6 +2154,10 @@ GtkCalendar {
     background-image: none; }
     GtkCalendar.button:hover, GtkCalendar.button:focus:hover {
       color: #D3DAE3; }
+    GtkCalendar.button:insensitive, GtkCalendar.button:focus:insensitive {
+      color: rgba(211, 218, 227, 0.45);
+      background-color: transparent;
+      background-image: none; }
   GtkCalendar.highlight {
     color: alpha(currentColor,0.55); }
 
@@ -3548,9 +3541,7 @@ GtkListBox .h4 {
   #content_frame .button:active, #content_frame .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #8b98b0;
-    background-color: #8b98b0;
-    border-color: transparent;
+    border-color: #2b2e39;
     background-color: #5294E2; }
   #content_frame .button:insensitive {
     color: rgba(211, 218, 227, 0.45);
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 249859f..1a61ad6 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
@@ -303,9 +303,7 @@ GtkSearchEntry.entry {
     background-clip: border-box;
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #8f9aae;
-    background-color: #8f9aae;
-    border-color: transparent;
+    border-color: #5294E2;
     background-color: #5294E2;
     transition-duration: 50ms; }
   .button:active {
@@ -535,9 +533,7 @@ GtkSearchEntry.entry {
   .inline-toolbar GtkToolButton > .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #8f9aae;
-    background-color: #8f9aae;
-    border-color: transparent;
+    border-color: #5294E2;
     background-color: #5294E2; }
   .inline-toolbar GtkToolButton > .button:insensitive {
     color: rgba(92, 97, 108, 0.55);
@@ -784,9 +780,7 @@ GtkSearchEntry.entry {
     .spinbutton.vertical .button:first-child:active, .spinbutton.vertical:dir(rtl) .button:first-child:active {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #8f9aae;
-      background-color: #8f9aae;
-      border-color: transparent;
+      border-color: #5294E2;
       background-color: #5294E2; }
     .spinbutton.vertical .button:first-child:hover, .spinbutton.vertical:dir(rtl) .button:first-child:hover {
       color: #5c616c;
@@ -807,9 +801,7 @@ GtkSearchEntry.entry {
     .spinbutton.vertical .button:last-child:active, .spinbutton.vertical:dir(rtl) .button:last-child:active {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #8f9aae;
-      background-color: #8f9aae;
-      border-color: transparent;
+      border-color: #5294E2;
       background-color: #5294E2; }
     .spinbutton.vertical .button:last-child:hover, .spinbutton.vertical:dir(rtl) .button:last-child:hover {
       color: #5c616c;
@@ -2165,6 +2157,10 @@ GtkCalendar {
     background-image: none; }
     GtkCalendar.button:hover, GtkCalendar.button:focus:hover {
       color: #5c616c; }
+    GtkCalendar.button:insensitive, GtkCalendar.button:focus:insensitive {
+      color: rgba(92, 97, 108, 0.55);
+      background-color: transparent;
+      background-image: none; }
   GtkCalendar.highlight {
     color: alpha(currentColor,0.55); }
 
@@ -3548,9 +3544,7 @@ GtkListBox .h4 {
   #content_frame .button:active, #content_frame .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #8f9aae;
-    background-color: #8f9aae;
-    border-color: transparent;
+    border-color: #5294E2;
     background-color: #5294E2; }
   #content_frame .button:insensitive {
     color: rgba(92, 97, 108, 0.55);
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 2fe72f4..e57fad9 100644
--- a/common/gtk-3.0/3.14/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.14/gtk-contained-solid.css
@@ -303,8 +303,6 @@ GtkSearchEntry.entry {
     background-clip: border-box;
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #8f9aae;
-    background-color: #8f9aae;
     border-color: #5294E2;
     background-color: #5294E2;
     transition-duration: 50ms; }
@@ -535,8 +533,6 @@ GtkSearchEntry.entry {
   .inline-toolbar GtkToolButton > .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #8f9aae;
-    background-color: #8f9aae;
     border-color: #5294E2;
     background-color: #5294E2; }
   .inline-toolbar GtkToolButton > .button:insensitive {
@@ -784,8 +780,6 @@ GtkSearchEntry.entry {
     .spinbutton.vertical .button:first-child:active, .spinbutton.vertical:dir(rtl) .button:first-child:active {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #8f9aae;
-      background-color: #8f9aae;
       border-color: #5294E2;
       background-color: #5294E2; }
     .spinbutton.vertical .button:first-child:hover, .spinbutton.vertical:dir(rtl) .button:first-child:hover {
@@ -807,8 +801,6 @@ GtkSearchEntry.entry {
     .spinbutton.vertical .button:last-child:active, .spinbutton.vertical:dir(rtl) .button:last-child:active {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #8f9aae;
-      background-color: #8f9aae;
       border-color: #5294E2;
       background-color: #5294E2; }
     .spinbutton.vertical .button:last-child:hover, .spinbutton.vertical:dir(rtl) .button:last-child:hover {
@@ -2165,6 +2157,10 @@ GtkCalendar {
     background-image: none; }
     GtkCalendar.button:hover, GtkCalendar.button:focus:hover {
       color: #5c616c; }
+    GtkCalendar.button:insensitive, GtkCalendar.button:focus:insensitive {
+      color: rgba(92, 97, 108, 0.55);
+      background-color: transparent;
+      background-image: none; }
   GtkCalendar.highlight {
     color: alpha(currentColor,0.55); }
 
@@ -3548,8 +3544,6 @@ GtkListBox .h4 {
   #content_frame .button:active, #content_frame .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #8f9aae;
-    background-color: #8f9aae;
     border-color: #5294E2;
     background-color: #5294E2; }
   #content_frame .button:insensitive {
diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css
index eb43577..14206f1 100644
--- a/common/gtk-3.0/3.14/gtk-contained.css
+++ b/common/gtk-3.0/3.14/gtk-contained.css
@@ -303,8 +303,6 @@ GtkSearchEntry.entry {
     background-clip: border-box;
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #8f9aae;
-    background-color: #8f9aae;
     border-color: #5294E2;
     background-color: #5294E2;
     transition-duration: 50ms; }
@@ -535,8 +533,6 @@ GtkSearchEntry.entry {
   .inline-toolbar GtkToolButton > .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #8f9aae;
-    background-color: #8f9aae;
     border-color: #5294E2;
     background-color: #5294E2; }
   .inline-toolbar GtkToolButton > .button:insensitive {
@@ -784,8 +780,6 @@ GtkSearchEntry.entry {
     .spinbutton.vertical .button:first-child:active, .spinbutton.vertical:dir(rtl) .button:first-child:active {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #8f9aae;
-      background-color: #8f9aae;
       border-color: #5294E2;
       background-color: #5294E2; }
     .spinbutton.vertical .button:first-child:hover, .spinbutton.vertical:dir(rtl) .button:first-child:hover {
@@ -807,8 +801,6 @@ GtkSearchEntry.entry {
     .spinbutton.vertical .button:last-child:active, .spinbutton.vertical:dir(rtl) .button:last-child:active {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #8f9aae;
-      background-color: #8f9aae;
       border-color: #5294E2;
       background-color: #5294E2; }
     .spinbutton.vertical .button:last-child:hover, .spinbutton.vertical:dir(rtl) .button:last-child:hover {
@@ -2165,6 +2157,10 @@ GtkCalendar {
     background-image: none; }
     GtkCalendar.button:hover, GtkCalendar.button:focus:hover {
       color: #5c616c; }
+    GtkCalendar.button:insensitive, GtkCalendar.button:focus:insensitive {
+      color: rgba(92, 97, 108, 0.55);
+      background-color: transparent;
+      background-image: none; }
   GtkCalendar.highlight {
     color: alpha(currentColor,0.55); }
 
@@ -3548,8 +3544,6 @@ GtkListBox .h4 {
   #content_frame .button:active, #content_frame .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #8f9aae;
-    background-color: #8f9aae;
     border-color: #5294E2;
     background-color: #5294E2; }
   #content_frame .button:insensitive {
diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss
index f97c1bc..cbf1fdd 100644
--- a/common/gtk-3.0/3.14/sass/_common.scss
+++ b/common/gtk-3.0/3.14/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; } }
     }
   }
 
@@ -2329,6 +2329,11 @@ GtkCalendar {
     &:hover {
       color: $fg_color;
     }
+    &:insensitive {
+      color: $insensitive_fg_color;
+      background-color: transparent;
+      background-image: none;
+    }
   }
   &.highlight { color: gtkalpha(currentColor,0.55); }
 }
diff --git a/common/gtk-3.0/3.14/sass/_drawing.scss b/common/gtk-3.0/3.14/sass/_drawing.scss
index 73c4962..2b24642 100644
--- a/common/gtk-3.0/3.14/sass/_drawing.scss
+++ b/common/gtk-3.0/3.14/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 {
@@ -147,13 +152,8 @@
   //
     color: $selected_fg_color;
     outline-color: transparentize($selected_fg_color, 0.7);
-    border-color: saturate(mix($fg_color, $bg_color, 60%), 10%);
-    background-color: saturate(mix($fg_color, $bg_color, 60%), 10%);
 
-    //border-color: if($variant=='light', saturate(mix($fg_color, $bg_color, 60%), 10%), transparent);
-    //background-color: if($variant=='light', saturate(mix($fg_color, $bg_color, 60%), 10%), darken($button_bg, 10%));
-
-    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/gtk-contained-dark.css b/common/gtk-3.0/3.16/gtk-contained-dark.css
index e646807..f9f1f7f 100644
--- a/common/gtk-3.0/3.16/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.16/gtk-contained-dark.css
@@ -163,9 +163,10 @@ GtkTextView {
   .entry:focus {
     background-clip: border-box;
     color: #D3DAE3;
-    border-color: #5294E2;
+    border-color: #2b2e39;
     background-color: #404552;
-    background-image: linear-gradient(to bottom, #404552); }
+    background-image: linear-gradient(to bottom, #404552);
+    box-shadow: inset 1px 1px #5294E2, inset -1px -1px #5294E2; }
   .entry:insensitive {
     color: rgba(211, 218, 227, 0.45);
     border-color: rgba(43, 46, 57, 0.55);
@@ -303,7 +304,7 @@ GtkSearchEntry.entry {
     background-clip: padding-box;
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: transparent;
+    border-color: #2b2e39;
     background-color: #5294E2;
     transition-duration: 50ms; }
   .button:active {
@@ -533,7 +534,7 @@ GtkSearchEntry.entry {
   .inline-toolbar GtkToolButton > .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: transparent;
+    border-color: #2b2e39;
     background-color: #5294E2; }
   .inline-toolbar GtkToolButton > .button:insensitive {
     color: rgba(211, 218, 227, 0.45);
@@ -780,7 +781,7 @@ GtkSearchEntry.entry {
     .spinbutton.vertical .button:first-child:active, .spinbutton.vertical:dir(rtl) .button:first-child:active {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: transparent;
+      border-color: #2b2e39;
       background-color: #5294E2; }
     .spinbutton.vertical .button:first-child:hover, .spinbutton.vertical:dir(rtl) .button:first-child:hover {
       color: #D3DAE3;
@@ -801,7 +802,7 @@ GtkSearchEntry.entry {
     .spinbutton.vertical .button:last-child:active, .spinbutton.vertical:dir(rtl) .button:last-child:active {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: transparent;
+      border-color: #2b2e39;
       background-color: #5294E2; }
     .spinbutton.vertical .button:last-child:hover, .spinbutton.vertical:dir(rtl) .button:last-child:hover {
       color: #D3DAE3;
@@ -846,12 +847,8 @@ GtkComboBox {
     -GtkWidget-wide-separators: true; }
   GtkComboBox.combobox-entry .entry:dir(ltr) {
     border-right-style: none; }
-    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 {
@@ -3510,7 +3507,7 @@ GtkListBox .h4 {
   #content_frame .button:active, #content_frame .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: transparent;
+    border-color: #2b2e39;
     background-color: #5294E2; }
   #content_frame .button:insensitive {
     color: rgba(211, 218, 227, 0.45);
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 439dcea..074a139 100644
--- a/common/gtk-3.0/3.16/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.16/gtk-contained-darker.css
@@ -303,7 +303,7 @@ GtkSearchEntry.entry {
     background-clip: border-box;
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: transparent;
+    border-color: #5294E2;
     background-color: #5294E2;
     transition-duration: 50ms; }
   .button:active {
@@ -533,7 +533,7 @@ GtkSearchEntry.entry {
   .inline-toolbar GtkToolButton > .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: transparent;
+    border-color: #5294E2;
     background-color: #5294E2; }
   .inline-toolbar GtkToolButton > .button:insensitive {
     color: rgba(92, 97, 108, 0.55);
@@ -780,7 +780,7 @@ GtkSearchEntry.entry {
     .spinbutton.vertical .button:first-child:active, .spinbutton.vertical:dir(rtl) .button:first-child:active {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: transparent;
+      border-color: #5294E2;
       background-color: #5294E2; }
     .spinbutton.vertical .button:first-child:hover, .spinbutton.vertical:dir(rtl) .button:first-child:hover {
       color: #5c616c;
@@ -801,7 +801,7 @@ GtkSearchEntry.entry {
     .spinbutton.vertical .button:last-child:active, .spinbutton.vertical:dir(rtl) .button:last-child:active {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: transparent;
+      border-color: #5294E2;
       background-color: #5294E2; }
     .spinbutton.vertical .button:last-child:hover, .spinbutton.vertical:dir(rtl) .button:last-child:hover {
       color: #5c616c;
@@ -3510,7 +3510,7 @@ GtkListBox .h4 {
   #content_frame .button:active, #content_frame .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: transparent;
+    border-color: #5294E2;
     background-color: #5294E2; }
   #content_frame .button:insensitive {
     color: rgba(92, 97, 108, 0.55);
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 f8fecc9..ecaf9ae 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
@@ -163,9 +163,10 @@ GtkTextView {
   .entry:focus {
     background-clip: border-box;
     color: #D3DAE3;
-    border-color: #5294E2;
+    border-color: #2b2e39;
     background-color: #404552;
-    background-image: linear-gradient(to bottom, #404552); }
+    background-image: linear-gradient(to bottom, #404552);
+    box-shadow: inset 1px 1px #5294E2, inset -1px -1px #5294E2; }
   .entry:insensitive {
     color: rgba(211, 218, 227, 0.45);
     border-color: rgba(43, 46, 57, 0.55);
@@ -303,7 +304,7 @@ GtkSearchEntry.entry {
     background-clip: padding-box;
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: transparent;
+    border-color: #2b2e39;
     background-color: #5294E2;
     transition-duration: 50ms; }
   .button:active {
@@ -533,7 +534,7 @@ GtkSearchEntry.entry {
   .inline-toolbar GtkToolButton > .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: transparent;
+    border-color: #2b2e39;
     background-color: #5294E2; }
   .inline-toolbar GtkToolButton > .button:insensitive {
     color: rgba(211, 218, 227, 0.45);
@@ -780,7 +781,7 @@ GtkSearchEntry.entry {
     .spinbutton.vertical .button:first-child:active, .spinbutton.vertical:dir(rtl) .button:first-child:active {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: transparent;
+      border-color: #2b2e39;
       background-color: #5294E2; }
     .spinbutton.vertical .button:first-child:hover, .spinbutton.vertical:dir(rtl) .button:first-child:hover {
       color: #D3DAE3;
@@ -801,7 +802,7 @@ GtkSearchEntry.entry {
     .spinbutton.vertical .button:last-child:active, .spinbutton.vertical:dir(rtl) .button:last-child:active {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: transparent;
+      border-color: #2b2e39;
       background-color: #5294E2; }
     .spinbutton.vertical .button:last-child:hover, .spinbutton.vertical:dir(rtl) .button:last-child:hover {
       color: #D3DAE3;
@@ -846,12 +847,8 @@ GtkComboBox {
     -GtkWidget-wide-separators: true; }
   GtkComboBox.combobox-entry .entry:dir(ltr) {
     border-right-style: none; }
-    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 {
@@ -3510,7 +3507,7 @@ GtkListBox .h4 {
   #content_frame .button:active, #content_frame .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: transparent;
+    border-color: #2b2e39;
     background-color: #5294E2; }
   #content_frame .button:insensitive {
     color: rgba(211, 218, 227, 0.45);
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 3a5a46f..38bbe40 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
@@ -303,7 +303,7 @@ GtkSearchEntry.entry {
     background-clip: border-box;
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: transparent;
+    border-color: #5294E2;
     background-color: #5294E2;
     transition-duration: 50ms; }
   .button:active {
@@ -533,7 +533,7 @@ GtkSearchEntry.entry {
   .inline-toolbar GtkToolButton > .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: transparent;
+    border-color: #5294E2;
     background-color: #5294E2; }
   .inline-toolbar GtkToolButton > .button:insensitive {
     color: rgba(92, 97, 108, 0.55);
@@ -780,7 +780,7 @@ GtkSearchEntry.entry {
     .spinbutton.vertical .button:first-child:active, .spinbutton.vertical:dir(rtl) .button:first-child:active {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: transparent;
+      border-color: #5294E2;
       background-color: #5294E2; }
     .spinbutton.vertical .button:first-child:hover, .spinbutton.vertical:dir(rtl) .button:first-child:hover {
       color: #5c616c;
@@ -801,7 +801,7 @@ GtkSearchEntry.entry {
     .spinbutton.vertical .button:last-child:active, .spinbutton.vertical:dir(rtl) .button:last-child:active {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: transparent;
+      border-color: #5294E2;
       background-color: #5294E2; }
     .spinbutton.vertical .button:last-child:hover, .spinbutton.vertical:dir(rtl) .button:last-child:hover {
       color: #5c616c;
@@ -3510,7 +3510,7 @@ GtkListBox .h4 {
   #content_frame .button:active, #content_frame .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: transparent;
+    border-color: #5294E2;
     background-color: #5294E2; }
   #content_frame .button:insensitive {
     color: rgba(92, 97, 108, 0.55);
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,
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 6abbece..434f4aa 100644
--- a/common/gtk-3.0/3.18/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.18/gtk-contained-dark.css
@@ -162,14 +162,19 @@ GtkTextView {
   .entry:focus {
     background-clip: border-box;
     color: #D3DAE3;
-    border-color: #5294E2;
+    border-color: #2b2e39;
     background-color: #404552;
-    background-image: linear-gradient(to bottom, #404552); }
+    background-image: linear-gradient(to bottom, #404552);
+    box-shadow: inset 1px 1px #5294E2, inset -1px -1px #5294E2; }
   .entry:insensitive {
     color: rgba(211, 218, 227, 0.45);
     border-color: rgba(43, 46, 57, 0.55);
     background-color: rgba(64, 69, 82, 0.55);
     background-image: linear-gradient(to bottom, rgba(64, 69, 82, 0.55)); }
+  .entry:selected,
+  .entry:selected:focus {
+    background-color: #5294E2;
+    color: #ffffff; }
   .entry.progressbar {
     margin: 2px 12px;
     border-radius: 0;
@@ -179,17 +184,6 @@ GtkTextView {
     background-image: none;
     background-color: transparent;
     box-shadow: none; }
-  .linked > .entry:first-child {
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0; }
-    .linked > .entry:first-child:dir(rtl) {
-      border-right-style: none; }
-  .linked > .entry:last-child {
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0;
-    border-left-style: none; }
-    .linked > .entry:last-child:dir(rtl) {
-      border-left-style: solid; }
   .entry.error {
     color: white;
     border-color: #FC4138;
@@ -216,28 +210,6 @@ GtkTextView {
       color: #D3DAE3; }
     .entry.image:active {
       color: #5294E2; }
-  .linked.vertical > .entry {
-    border-bottom-color: #3a3e4a;
-    box-shadow: none; }
-    .linked.vertical > .entry:focus {
-      border-color: #5294E2;
-      box-shadow: 0 -1px 0 0 #5294E2; }
-    .linked.vertical > .entry:insensitive {
-      border-bottom-color: #3a3e4a; }
-    .linked.vertical > .entry:first-child {
-      border-bottom-color: #3a3e4a; }
-      .linked.vertical > .entry:first-child:focus {
-        border-bottom-color: #5294E2;
-        box-shadow: none; }
-      .linked.vertical > .entry:first-child:insensitive {
-        border-bottom-color: #3a3e4a; }
-    .linked.vertical > .entry:last-child {
-      border-bottom-color: rgba(0, 0, 0, 0.14); }
-      .linked.vertical > .entry:last-child:focus {
-        border-bottom-color: #5294E2;
-        box-shadow: 0 -1px 0 0 #5294E2; }
-      .linked.vertical > .entry:last-child:insensitive {
-        border-bottom-color: rgba(0, 0, 0, 0.14); }
   .osd .entry {
     color: #BAC3CF;
     border-color: rgba(26, 28, 34, 0.35);
@@ -298,7 +270,7 @@ GtkSearchEntry.entry {
     background-clip: padding-box;
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: transparent;
+    border-color: #2b2e39;
     background-color: #5294E2;
     transition-duration: 50ms; }
   .button:active {
@@ -528,7 +500,7 @@ GtkSearchEntry.entry {
   .inline-toolbar GtkToolButton > .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: transparent;
+    border-color: #2b2e39;
     background-color: #5294E2; }
   .inline-toolbar GtkToolButton > .button:insensitive {
     color: rgba(211, 218, 227, 0.45);
@@ -546,166 +518,219 @@ GtkSearchEntry.entry {
     .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel {
       color: inherit; }
 
-.inline-toolbar.toolbar GtkToolButton > .button.flat, .inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.toolbar GtkToolButton > .sidebar-button.button, .inline-toolbar GtkToolButton > .sidebar-button.button, .osd .button:hover, .osd .button:active, .osd .button:checked, .osd .button:insensitive, .inline-toolbar .button, .inline-toolbar .button:backdrop, .linked > .button,
-.linked > .button:hover,
-.linked > .button:active,
-.linked > .button:checked, GtkComboBox.combobox-entry .entry, GtkComboBox.combobox-entry .the-button-in-the-combobox, .primary-toolbar .linked.stack-switcher > .button,
-.header-bar .linked.stack-switcher > .button,
-.primary-toolbar .linked.path-bar > .button, .header-bar .linked.path-bar > .button, NemoWindow .primary-toolbar NemoPathBar.linked > .button, .linked > GtkComboBox > .the-button-in-the-combobox:dir(ltr) {
+.linked:not(.vertical):not(.pathbar) > .entry + .entry {
+  border-left-color: rgba(43, 46, 57, 0.3); }
+
+.linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:not(:last-child),
+.linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:last-child {
+  border-left-color: #2b2e39; }
+
+.linked:not(.vertical):not(.pathbar) > .entry + .button,
+.linked:not(.vertical):not(.pathbar) > .entry + .button:hover,
+.linked:not(.vertical):not(.pathbar) > .entry + .button:active,
+.linked:not(.vertical):not(.pathbar) > .entry + .button:checked,
+.linked:not(.vertical):not(.pathbar) > .entry + .button:insensitive {
+  border-left-style: solid; }
+
+.linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .entry,
+.linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .button,
+.linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox,
+.linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox {
+  border-left-color: #2b2e39; }
+
+.linked:not(.vertical):not(.pathbar) > .button:hover:not(:checked):not(:active):not(:only-child),
+.linked:not(.vertical):not(.pathbar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) {
+  box-shadow: -1px 0 #2b2e39; }
+
+.linked:not(.vertical):not(.pathbar) > .button:first-child:hover:not(:checked):not(:active) {
+  box-shadow: none; }
+
+.linked:not(.vertical):not(.pathbar) > .button:checked + .button:not(:checked):not(:active):hover {
+  box-shadow: none; }
+
+.linked:not(.vertical):not(.pathbar) > .button:checked + .entry {
+  border-left-color: #2b2e39; }
+
+.linked:not(.vertical):not(.pathbar) > .entry + .button:not(:checked):not(:active):hover {
+  box-shadow: none; }
+
+.linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):hover {
+  box-shadow: inset 1px 0 rgba(43, 46, 57, 0.5), inset -1px 0 rgba(43, 46, 57, 0.5); }
+
+.linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
+  box-shadow: inset -1px 0 rgba(43, 46, 57, 0.5); }
+
+.linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
+  box-shadow: inset 1px 0 rgba(43, 46, 57, 0.5); }
+
+.linked.vertical > .entry + .entry {
+  border-top-color: rgba(43, 46, 57, 0.3); }
+
+.linked.vertical > .entry + .entry:focus:not(:last-child),
+.linked.vertical > .entry + .entry:focus:last-child {
+  border-top-color: #2b2e39; }
+
+.linked.vertical > .entry + .button,
+.linked.vertical > .entry + .button:hover,
+.linked.vertical > .entry + .button:active,
+.linked.vertical > .entry + .button:checked,
+.linked.vertical > .entry + .button:insensitive {
+  border-top-style: solid; }
+
+.linked.vertical > .entry:focus:not(:only-child) + .entry,
+.linked.vertical > .entry:focus:not(:only-child) + .button,
+.linked.vertical > .entry:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox,
+.linked.vertical > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox {
+  border-top-color: #2b2e39; }
+
+.linked.vertical > .button:hover:not(:checked):not(:active):not(:only-child),
+.linked.vertical > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) {
+  box-shadow: 0 -1px #2b2e39; }
+
+.linked.vertical > .button:first-child:hover:not(:checked):not(:active) {
+  box-shadow: none; }
+
+.linked.vertical > .button:checked + .button:not(:checked):not(:active):hover {
+  box-shadow: none; }
+
+.linked.vertical > .button:checked + .entry {
+  border-top-color: #2b2e39; }
+
+.linked.vertical > .entry + .button:not(:checked):not(:active):hover {
+  box-shadow: none; }
+
+.inline-toolbar.toolbar GtkToolButton > .button.flat, .inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.toolbar GtkToolButton > .sidebar-button.button, .inline-toolbar GtkToolButton > .sidebar-button.button, .osd .button:hover, .osd .button:active, .osd .button:checked, .osd .button:insensitive, .inline-toolbar .button, .inline-toolbar .button:backdrop, .linked:not(.vertical) > .button,
+.linked:not(.vertical) > .button:hover,
+.linked:not(.vertical) > .button:active,
+.linked:not(.vertical) > .button:checked, .linked:not(.vertical):not(.pathbar) > .entry, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button,
+.primary-toolbar .linked:not(.vertical).path-bar > .button,
+.header-bar .linked:not(.vertical).path-bar > .button,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:hover,
+.header-bar .linked:not(.vertical).path-bar > .button:hover,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:active,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:active,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:active,
+.header-bar .linked:not(.vertical).path-bar > .button:active,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:checked,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:checked,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:checked,
+.header-bar .linked:not(.vertical).path-bar > .button:checked,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:insensitive,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:insensitive,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:insensitive, .header-bar .linked:not(.vertical).path-bar > .button:insensitive, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:active,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:checked,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:insensitive, .linked > GtkComboBox > .the-button-in-the-combobox:dir(ltr),
+.linked > GtkComboBox > .the-button-in-the-combobox:dir(rtl),
+.linked > GtkComboBoxText > .the-button-in-the-combobox:dir(ltr),
+.linked > GtkComboBoxText > .the-button-in-the-combobox:dir(rtl) {
   border-radius: 0;
-  border-left-style: none;
   border-right-style: none; }
-  .inline-toolbar GtkToolButton > .button.flat:hover, .inline-toolbar GtkToolButton > .sidebar-button.button:hover, .osd .button:hover, .inline-toolbar .button:hover, .linked > .button:hover,
-  GtkComboBox.combobox-entry .entry:hover, GtkComboBox.combobox-entry .the-button-in-the-combobox:hover, .primary-toolbar .linked.stack-switcher > .button:hover,
-  .header-bar .linked.stack-switcher > .button:hover,
-  .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover, .linked > GtkComboBox > .the-button-in-the-combobox:hover:dir(ltr) {
-    box-shadow: inset 1px 0 rgba(43, 46, 57, 0.5), inset -1px 0 rgba(43, 46, 57, 0.5); }
-  .inline-toolbar GtkToolButton > .button.flat:active, .inline-toolbar GtkToolButton > .sidebar-button.button:active, .osd .button:active, .inline-toolbar .button:active, .linked > .button:active,
-  GtkComboBox.combobox-entry .entry:active, GtkComboBox.combobox-entry .the-button-in-the-combobox:active, .primary-toolbar .linked.stack-switcher > .button:active,
-  .header-bar .linked.stack-switcher > .button:active,
-  .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, .linked > GtkComboBox > .the-button-in-the-combobox:active:dir(ltr), .inline-toolbar GtkToolButton > .button.flat:checked, .inline-toolbar GtkToolButton > .sidebar-button.button:checked, .osd .button:checked, .inline-toolbar .button:checked, .linked > .button:checked,
-  GtkComboBox.combobox-entry .entry:checked, GtkComboBox.combobox-entry .the-button-in-the-combobox:checked, .primary-toolbar .linked.stack-switcher > .button:checked,
-  .header-bar .linked.stack-switcher > .button:checked,
-  .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked, .linked > GtkComboBox > .the-button-in-the-combobox:checked:dir(ltr) {
-    box-shadow: none; }
-  .inline-toolbar GtkToolButton > .button.flat:dir(rtl), .inline-toolbar GtkToolButton > .sidebar-button.button:dir(rtl), .inline-toolbar.toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar.toolbar GtkToolButton:dir(rtl) > .sidebar-button.button, .inline-toolbar GtkToolButton:dir(rtl) > .sidebar-button.button, .osd .button:dir(rtl):hover, .osd .button:dir(rtl):active, .osd .button:dir(rtl):checked, .osd .button:dir(rtl):insensitive, .inline-toolbar .button:dir(rtl), .linked > .button:dir(rtl),
-  GtkComboBox.combobox-entry .entry:dir(rtl), GtkComboBox.combobox-entry .the-button-in-the-combobox:dir(rtl), .primary-toolbar .linked.stack-switcher > .button:dir(rtl),
-  .header-bar .linked.stack-switcher > .button:dir(rtl),
-  .primary-toolbar .linked.path-bar > .button:dir(rtl), .header-bar .linked.path-bar > .button:dir(rtl), NemoWindow .primary-toolbar NemoPathBar.linked > .button:dir(rtl), .linked > GtkComboBox > .the-button-in-the-combobox:dir(rtl) {
-    border-radius: 0; }
 
-.osd .button:first-child:hover, .osd .button:first-child:active, .osd .button:first-child:checked, .osd .button:first-child:insensitive, .inline-toolbar .button:first-child, .linked > .button:first-child,
-.inline-toolbar.toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar.toolbar GtkToolButton:first-child > .sidebar-button.button, .inline-toolbar GtkToolButton:first-child > .sidebar-button.button, GtkComboBox.combobox-entry .entry:first-child, GtkComboBox.combobox-entry .the-button-in-the-combobox:first-child, .linked > GtkComboBox:first-child > .the-button-in-the-combobox, .primary-toolbar .linked.stack-switcher > .button:first-child,
-.header-bar .linked.stack-switcher > .button:first-child,
-.primary-toolbar .linked.path-bar > .button:first-child, .header-bar .linked.path-bar > .button:first-child, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child {
-  border-radius: 3px 0 0 3px;
-  border-left-style: solid; }
-  .osd .button:first-child:hover, .inline-toolbar .button:first-child:hover, .linked > .button:first-child:hover,
-  .inline-toolbar GtkToolButton:first-child > .button.flat:hover, .inline-toolbar GtkToolButton:first-child > .sidebar-button.button:hover, GtkComboBox.combobox-entry .entry:first-child:hover, GtkComboBox.combobox-entry .the-button-in-the-combobox:first-child:hover, .linked > GtkComboBox:first-child > .the-button-in-the-combobox:hover, .primary-toolbar .linked.stack-switcher > .button:first-child:hover,
-  .header-bar .linked.stack-switcher > .button:first-child:hover,
-  .primary-toolbar .linked.path-bar > .button:first-child:hover, .header-bar .linked.path-bar > .button:first-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:hover {
-    box-shadow: inset -1px 0 rgba(43, 46, 57, 0.5); }
-  .osd .button:first-child:active, .inline-toolbar .button:first-child:active, .linked > .button:first-child:active,
-  .inline-toolbar GtkToolButton:first-child > .button.flat:active, .inline-toolbar GtkToolButton:first-child > .sidebar-button.button:active, GtkComboBox.combobox-entry .entry:first-child:active, GtkComboBox.combobox-entry .the-button-in-the-combobox:first-child:active, .linked > GtkComboBox:first-child > .the-button-in-the-combobox:active, .primary-toolbar .linked.stack-switcher > .button:first-child:active,
-  .header-bar .linked.stack-switcher > .button:first-child:active,
-  .primary-toolbar .linked.path-bar > .button:first-child:active, .header-bar .linked.path-bar > .button:first-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:active, .osd .button:first-child:checked, .inline-toolbar .button:first-child:checked, .linked > .button:first-child:checked,
-  .inline-toolbar GtkToolButton:first-child > .button.flat:checked, .inline-toolbar GtkToolButton:first-child > .sidebar-button.button:checked, GtkComboBox.combobox-entry .entry:first-child:checked, GtkComboBox.combobox-entry .the-button-in-the-combobox:first-child:checked, .linked > GtkComboBox:first-child > .the-button-in-the-combobox:checked, .primary-toolbar .linked.stack-switcher > .button:first-child:checked,
-  .header-bar .linked.stack-switcher > .button:first-child:checked,
-  .primary-toolbar .linked.path-bar > .button:first-child:checked, .header-bar .linked.path-bar > .button:first-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:checked {
-    box-shadow: none; }
+.osd .button:first-child:hover, .osd .button:first-child:active, .osd .button:first-child:checked, .osd .button:first-child:insensitive, .inline-toolbar .button:first-child, .linked:not(.vertical) > .button:first-child,
+.inline-toolbar.toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar.toolbar GtkToolButton:first-child > .sidebar-button.button, .inline-toolbar GtkToolButton:first-child > .sidebar-button.button, .linked:not(.vertical):not(.pathbar) > .entry:first-child, .linked > GtkComboBox:first-child > .the-button-in-the-combobox,
+.linked > GtkComboBoxText:first-child > .the-button-in-the-combobox, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:first-child,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:first-child,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:first-child,
+.header-bar .linked:not(.vertical).path-bar > .button:first-child,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:first-child {
+  border-top-left-radius: 3px;
+  border-bottom-left-radius: 3px; }
 
-.osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .inline-toolbar .button:last-child, .linked > .button:last-child,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar.toolbar GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar GtkToolButton:last-child > .sidebar-button.button, GtkComboBox.combobox-entry .entry:last-child, GtkComboBox.combobox-entry .the-button-in-the-combobox:last-child, .linked > GtkComboBox:last-child > .the-button-in-the-combobox, .primary-toolbar .linked.stack-switcher > .button:last-child,
-.header-bar .linked.stack-switcher > .button:last-child,
-.primary-toolbar .linked.path-bar > .button:last-child, .header-bar .linked.path-bar > .button:last-child, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child {
-  border-radius: 0 3px 3px 0;
+.osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .inline-toolbar .button:last-child, .linked:not(.vertical) > .button:last-child,
+.inline-toolbar.toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar.toolbar GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar GtkToolButton:last-child > .sidebar-button.button, .linked:not(.vertical):not(.pathbar) > .entry:last-child, .linked > GtkComboBox:last-child > .the-button-in-the-combobox,
+.linked > GtkComboBoxText:last-child > .the-button-in-the-combobox, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:last-child,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:last-child,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:last-child,
+.header-bar .linked:not(.vertical).path-bar > .button:last-child,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:last-child {
+  border-top-right-radius: 3px;
+  border-bottom-right-radius: 3px;
   border-right-style: solid; }
-  .osd .button:last-child:hover, .inline-toolbar .button:last-child:hover, .linked > .button:last-child:hover,
-  .inline-toolbar GtkToolButton:last-child > .button.flat:hover, .inline-toolbar GtkToolButton:last-child > .sidebar-button.button:hover, GtkComboBox.combobox-entry .entry:last-child:hover, GtkComboBox.combobox-entry .the-button-in-the-combobox:last-child:hover, .linked > GtkComboBox:last-child > .the-button-in-the-combobox:hover, .primary-toolbar .linked.stack-switcher > .button:last-child:hover,
-  .header-bar .linked.stack-switcher > .button:last-child:hover,
-  .primary-toolbar .linked.path-bar > .button:last-child:hover, .header-bar .linked.path-bar > .button:last-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:hover {
-    box-shadow: inset 1px 0 rgba(43, 46, 57, 0.5); }
-  .osd .button:last-child:active, .inline-toolbar .button:last-child:active, .linked > .button:last-child:active,
-  .inline-toolbar GtkToolButton:last-child > .button.flat:active, .inline-toolbar GtkToolButton:last-child > .sidebar-button.button:active, GtkComboBox.combobox-entry .entry:last-child:active, GtkComboBox.combobox-entry .the-button-in-the-combobox:last-child:active, .linked > GtkComboBox:last-child > .the-button-in-the-combobox:active, .primary-toolbar .linked.stack-switcher > .button:last-child:active,
-  .header-bar .linked.stack-switcher > .button:last-child:active,
-  .primary-toolbar .linked.path-bar > .button:last-child:active, .header-bar .linked.path-bar > .button:last-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:active, .osd .button:last-child:checked, .inline-toolbar .button:last-child:checked, .linked > .button:last-child:checked,
-  .inline-toolbar GtkToolButton:last-child > .button.flat:checked, .inline-toolbar GtkToolButton:last-child > .sidebar-button.button:checked, GtkComboBox.combobox-entry .entry:last-child:checked, GtkComboBox.combobox-entry .the-button-in-the-combobox:last-child:checked, .linked > GtkComboBox:last-child > .the-button-in-the-combobox:checked, .primary-toolbar .linked.stack-switcher > .button:last-child:checked,
-  .header-bar .linked.stack-switcher > .button:last-child:checked,
-  .primary-toolbar .linked.path-bar > .button:last-child:checked, .header-bar .linked.path-bar > .button:last-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:checked {
-    box-shadow: none; }
-  .osd .button:last-child:dir(rtl):hover, .osd .button:last-child:dir(rtl):active, .osd .button:last-child:dir(rtl):checked, .osd .button:last-child:dir(rtl):insensitive, .inline-toolbar .button:last-child:dir(rtl), .linked > .button:last-child:dir(rtl),
-  .inline-toolbar GtkToolButton:last-child > .button.flat:dir(rtl), .inline-toolbar GtkToolButton:last-child > .sidebar-button.button:dir(rtl), .inline-toolbar.toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar.toolbar GtkToolButton:last-child:dir(rtl) > .sidebar-button.button, .inline-toolbar GtkToolButton:last-child:dir(rtl) > .sidebar-button.button, GtkComboBox.combobox-entry .entry:last-child:dir(rtl), GtkComboBox.combobox-entry .the-button-in-the-combobox:last-child:dir(rtl), .linked > GtkComboBox:last-child > .the-button-in-the-combobox:dir(rtl), .primary-toolbar .linked.stack-switcher > .button:last-child:dir(rtl),
-  .header-bar .linked.stack-switcher > .button:last-child:dir(rtl),
-  .primary-toolbar .linked.path-bar > .button:last-child:dir(rtl), .header-bar .linked.path-bar > .button:last-child:dir(rtl), NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:dir(rtl) {
-    border-bottom-left-radius: 0; }
 
-.osd .button:only-child:hover, .osd .button:only-child:active, .osd .button:only-child:checked, .osd .button:only-child:insensitive, .inline-toolbar .button:only-child, .linked > .button:only-child,
-.inline-toolbar.toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar.toolbar GtkToolButton:only-child > .sidebar-button.button, .inline-toolbar GtkToolButton:only-child > .sidebar-button.button, GtkComboBox.combobox-entry .entry:only-child, GtkComboBox.combobox-entry .the-button-in-the-combobox:only-child, .linked > GtkComboBox:only-child > .the-button-in-the-combobox, .primary-toolbar .linked.stack-switcher > .button:only-child,
-.header-bar .linked.stack-switcher > .button:only-child,
-.primary-toolbar .linked.path-bar > .button:only-child, .header-bar .linked.path-bar > .button:only-child, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child {
+.osd .button:only-child:hover, .osd .button:only-child:active, .osd .button:only-child:checked, .osd .button:only-child:insensitive, .inline-toolbar .button:only-child, .linked:not(.vertical) > .button:only-child,
+.inline-toolbar.toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar.toolbar GtkToolButton:only-child > .sidebar-button.button, .inline-toolbar GtkToolButton:only-child > .sidebar-button.button, .linked:not(.vertical):not(.pathbar) > .entry:only-child, .linked > GtkComboBox:only-child > .the-button-in-the-combobox,
+.linked > GtkComboBoxText:only-child > .the-button-in-the-combobox, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:only-child,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:only-child,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:only-child,
+.header-bar .linked:not(.vertical).path-bar > .button:only-child,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:only-child {
   border-radius: 3px;
   border-style: solid; }
-  .osd .button:only-child:hover, .inline-toolbar .button:only-child:hover, .linked > .button:only-child:hover,
-  .inline-toolbar GtkToolButton:only-child > .button.flat:hover, .inline-toolbar GtkToolButton:only-child > .sidebar-button.button:hover, GtkComboBox.combobox-entry .entry:only-child:hover, GtkComboBox.combobox-entry .the-button-in-the-combobox:only-child:hover, .linked > GtkComboBox:only-child > .the-button-in-the-combobox:hover, .primary-toolbar .linked.stack-switcher > .button:only-child:hover,
-  .header-bar .linked.stack-switcher > .button:only-child:hover,
-  .primary-toolbar .linked.path-bar > .button:only-child:hover, .header-bar .linked.path-bar > .button:only-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:hover {
-    box-shadow: none; }
-  .osd .button:only-child:active, .inline-toolbar .button:only-child:active, .linked > .button:only-child:active,
-  .inline-toolbar GtkToolButton:only-child > .button.flat:active, .inline-toolbar GtkToolButton:only-child > .sidebar-button.button:active, GtkComboBox.combobox-entry .entry:only-child:active, GtkComboBox.combobox-entry .the-button-in-the-combobox:only-child:active, .linked > GtkComboBox:only-child > .the-button-in-the-combobox:active, .primary-toolbar .linked.stack-switcher > .button:only-child:active,
-  .header-bar .linked.stack-switcher > .button:only-child:active,
-  .primary-toolbar .linked.path-bar > .button:only-child:active, .header-bar .linked.path-bar > .button:only-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:active, .osd .button:only-child:checked, .inline-toolbar .button:only-child:checked, .linked > .button:only-child:checked,
-  .inline-toolbar GtkToolButton:only-child > .button.flat:checked, .inline-toolbar GtkToolButton:only-child > .sidebar-button.button:checked, GtkComboBox.combobox-entry .entry:only-child:checked, GtkComboBox.combobox-entry .the-button-in-the-combobox:only-child:checked, .linked > GtkComboBox:only-child > .the-button-in-the-combobox:checked, .primary-toolbar .linked.stack-switcher > .button:only-child:checked,
-  .header-bar .linked.stack-switcher > .button:only-child:checked,
-  .primary-toolbar .linked.path-bar > .button:only-child:checked, .header-bar .linked.path-bar > .button:only-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:checked {
-    box-shadow: none; }
 
-.linked.vertical > .entry, .linked.vertical > .entry:focus, .linked.vertical > .entry:insensitive, .linked.vertical > .button,
+.linked.vertical > .button,
 .linked.vertical > .button:hover,
 .linked.vertical > .button:active,
-.linked.vertical > .button:checked, .linked.vertical > GtkComboBoxText > .the-button-in-the-combobox,
+.linked.vertical > .button:checked, .linked.vertical > .entry, .linked.vertical > GtkComboBoxText > .the-button-in-the-combobox,
 .linked.vertical > GtkComboBox > .the-button-in-the-combobox {
-  border-style: solid;
-  border-bottom-style: none;
-  border-top-style: none;
-  border-radius: 0; }
-  .linked.vertical > .entry:hover, .linked.vertical > .button:hover,
-  .linked.vertical > GtkComboBoxText > .the-button-in-the-combobox:hover,
-  .linked.vertical > GtkComboBox > .the-button-in-the-combobox:hover {
-    box-shadow: inset 0 -1px rgba(43, 46, 57, 0.5), inset 0 1px rgba(43, 46, 57, 0.5); }
-  .linked.vertical > .entry:active, .linked.vertical > .button:active,
-  .linked.vertical > GtkComboBoxText > .the-button-in-the-combobox:active,
-  .linked.vertical > GtkComboBox > .the-button-in-the-combobox:active, .linked.vertical > .entry:checked, .linked.vertical > .button:checked,
-  .linked.vertical > GtkComboBoxText > .the-button-in-the-combobox:checked,
-  .linked.vertical > GtkComboBox > .the-button-in-the-combobox:checked {
-    box-shadow: none; }
+  border-radius: 0;
+  border-bottom-style: none; }
 
-.linked.vertical > .entry:first-child, .linked.vertical > .button:first-child,
-.linked.vertical > GtkComboBoxText:first-child > .the-button-in-the-combobox,
+.linked.vertical > .button:first-child,
+.linked.vertical > .entry:first-child, .linked.vertical > GtkComboBoxText:first-child > .the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:first-child > .the-button-in-the-combobox {
-  border-radius: 3px 3px 0 0;
-  border-top-style: solid; }
-  .linked.vertical > .entry:first-child:hover, .linked.vertical > .button:first-child:hover,
-  .linked.vertical > GtkComboBoxText:first-child > .the-button-in-the-combobox:hover,
-  .linked.vertical > GtkComboBox:first-child > .the-button-in-the-combobox:hover {
-    box-shadow: inset 0 -1px rgba(43, 46, 57, 0.5); }
-  .linked.vertical > .entry:first-child:active, .linked.vertical > .button:first-child:active,
-  .linked.vertical > GtkComboBoxText:first-child > .the-button-in-the-combobox:active,
-  .linked.vertical > GtkComboBox:first-child > .the-button-in-the-combobox:active, .linked.vertical > .entry:first-child:checked, .linked.vertical > .button:first-child:checked,
-  .linked.vertical > GtkComboBoxText:first-child > .the-button-in-the-combobox:checked,
-  .linked.vertical > GtkComboBox:first-child > .the-button-in-the-combobox:checked {
-    box-shadow: none; }
+  border-top-left-radius: 3px;
+  border-top-right-radius: 3px; }
 
-.linked.vertical > .entry:last-child, .linked.vertical > .button:last-child,
-.linked.vertical > GtkComboBoxText:last-child > .the-button-in-the-combobox,
+.linked.vertical > .button:last-child,
+.linked.vertical > .entry:last-child, .linked.vertical > GtkComboBoxText:last-child > .the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:last-child > .the-button-in-the-combobox {
-  border-radius: 0 0 3px 3px;
+  border-bottom-left-radius: 3px;
+  border-bottom-right-radius: 3px;
   border-bottom-style: solid; }
-  .linked.vertical > .entry:last-child:hover, .linked.vertical > .button:last-child:hover,
-  .linked.vertical > GtkComboBoxText:last-child > .the-button-in-the-combobox:hover,
-  .linked.vertical > GtkComboBox:last-child > .the-button-in-the-combobox:hover {
-    box-shadow: inset 0 1px rgba(43, 46, 57, 0.5); }
-  .linked.vertical > .entry:last-child:active, .linked.vertical > .button:last-child:active,
-  .linked.vertical > GtkComboBoxText:last-child > .the-button-in-the-combobox:active,
-  .linked.vertical > GtkComboBox:last-child > .the-button-in-the-combobox:active, .linked.vertical > .entry:last-child:checked, .linked.vertical > .button:last-child:checked,
-  .linked.vertical > GtkComboBoxText:last-child > .the-button-in-the-combobox:checked,
-  .linked.vertical > GtkComboBox:last-child > .the-button-in-the-combobox:checked {
-    box-shadow: none; }
 
-.linked.vertical > .entry:only-child, .linked.vertical > .button:only-child,
-.linked.vertical > GtkComboBoxText:only-child > .the-button-in-the-combobox,
+.linked.vertical > .button:only-child,
+.linked.vertical > .entry:only-child, .linked.vertical > GtkComboBoxText:only-child > .the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:only-child > .the-button-in-the-combobox {
   border-radius: 3px;
   border-style: solid; }
-  .linked.vertical > .entry:only-child:hover, .linked.vertical > .button:only-child:hover,
-  .linked.vertical > GtkComboBoxText:only-child > .the-button-in-the-combobox:hover,
-  .linked.vertical > GtkComboBox:only-child > .the-button-in-the-combobox:hover {
-    box-shadow: none; }
-  .linked.vertical > .entry:only-child:active, .linked.vertical > .button:only-child:active,
-  .linked.vertical > GtkComboBoxText:only-child > .the-button-in-the-combobox:active,
-  .linked.vertical > GtkComboBox:only-child > .the-button-in-the-combobox:active, .linked.vertical > .entry:only-child:checked, .linked.vertical > .button:only-child:checked,
-  .linked.vertical > GtkComboBoxText:only-child > .the-button-in-the-combobox:checked,
-  .linked.vertical > GtkComboBox:only-child > .the-button-in-the-combobox:checked {
-    box-shadow: none; }
+
+.linked:not(.vertical) > .button,
+.linked:not(.vertical) > .button:hover,
+.linked:not(.vertical) > .button:active,
+.linked:not(.vertical) > .button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button,
+.primary-toolbar .linked:not(.vertical).path-bar > .button,
+.header-bar .linked:not(.vertical).path-bar > .button,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:hover,
+.header-bar .linked:not(.vertical).path-bar > .button:hover,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:active,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:active,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:active,
+.header-bar .linked:not(.vertical).path-bar > .button:active,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:checked,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:checked,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:checked,
+.header-bar .linked:not(.vertical).path-bar > .button:checked,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:insensitive,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:insensitive,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:insensitive, .header-bar .linked:not(.vertical).path-bar > .button:insensitive, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:active,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:checked,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:insensitive {
+  border-left-style: none; }
+  .linked:not(.vertical) > .button:first-child,
+  .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:first-child,
+  .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:first-child,
+  .primary-toolbar .linked:not(.vertical).path-bar > .button:first-child,
+  .header-bar .linked:not(.vertical).path-bar > .button:first-child,
+  NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:first-child {
+    border-left-style: solid; }
+
+.linked.vertical > .button,
+.linked.vertical > .button:hover,
+.linked.vertical > .button:active,
+.linked.vertical > .button:checked {
+  border-top-style: none; }
+  .linked.vertical > .button:first-child {
+    border-top-style: solid; }
 
 .menuitem.button.flat, .menuitem.sidebar-button.button, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .app-notification .button.flat,
 .app-notification .sidebar-button.button,
@@ -780,7 +805,7 @@ GtkSearchEntry.entry {
     .spinbutton.vertical .button:first-child:active, .spinbutton.vertical:dir(rtl) .button:first-child:active {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: transparent;
+      border-color: #2b2e39;
       background-color: #5294E2; }
     .spinbutton.vertical .button:first-child:hover, .spinbutton.vertical:dir(rtl) .button:first-child:hover {
       color: #D3DAE3;
@@ -801,7 +826,7 @@ GtkSearchEntry.entry {
     .spinbutton.vertical .button:last-child:active, .spinbutton.vertical:dir(rtl) .button:last-child:active {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: transparent;
+      border-color: #2b2e39;
       background-color: #5294E2; }
     .spinbutton.vertical .button:last-child:hover, .spinbutton.vertical:dir(rtl) .button:last-child:hover {
       color: #D3DAE3;
@@ -845,21 +870,19 @@ GtkComboBox {
   GtkComboBox .separator.vertical, GtkComboBox .sidebar .vertical.view.separator, .sidebar GtkComboBox .vertical.view.separator {
     -GtkWidget-wide-separators: true; }
   GtkComboBox.combobox-entry .entry:dir(ltr) {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
     border-right-style: none; }
-    GtkComboBox.combobox-entry .entry:dir(ltr):focus {
-      box-shadow: 1px 0 #5294E2; }
   GtkComboBox.combobox-entry .entry:dir(rtl) {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
     border-left-style: none; }
-    GtkComboBox.combobox-entry .entry:dir(rtl):focus {
-      box-shadow: -1px 0 #5294E2; }
-  GtkComboBox.combobox-entry .the-button-in-the-combobox:dir(ltr) {
-    box-shadow: inset 1px 0 #2b2e39; }
-    GtkComboBox.combobox-entry .the-button-in-the-combobox:dir(ltr):insensitive {
-      box-shadow: inset 1px 0 rgba(43, 46, 57, 0.55); }
-  GtkComboBox.combobox-entry .the-button-in-the-combobox:dir(rtl) {
-    box-shadow: inset -1px 0 #2b2e39; }
-    GtkComboBox.combobox-entry .the-button-in-the-combobox:dir(rtl):insensitive {
-      box-shadow: inset -1px 0 rgba(43, 46, 57, 0.55); }
+  GtkComboBox.combobox-entry .button:dir(ltr) {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0; }
+  GtkComboBox.combobox-entry .button:dir(rtl) {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0; }
 
 /************
  * Toolbars *
@@ -1092,77 +1115,83 @@ GtkComboBox {
     border-color: rgba(82, 148, 226, 0.65);
     background-color: rgba(82, 148, 226, 0.65); }
 
-.primary-toolbar .linked > .button, .header-bar .linked > .button {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button,
+.header-bar .linked:not(.vertical):not(.path-bar) > .button,
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover,
+.header-bar .linked:not(.vertical):not(.path-bar) > .button:hover,
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:active,
+.header-bar .linked:not(.vertical):not(.path-bar) > .button:active,
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:checked,
+.header-bar .linked:not(.vertical):not(.path-bar) > .button:checked,
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:insensitive, .header-bar .linked:not(.vertical):not(.path-bar) > .button:insensitive {
   border-radius: 3px;
   border-style: solid; }
 
-.primary-toolbar .linked > .button:hover, .header-bar .linked > .button:hover {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child),
+.header-bar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child),
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active),
+.header-bar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active),
+.primary-toolbar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child),
+.header-bar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child),
+.primary-toolbar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active), .header-bar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) {
   box-shadow: none; }
 
-.primary-toolbar .linked.stack-switcher > .button,
-.header-bar .linked.stack-switcher > .button,
-.primary-toolbar .linked.path-bar > .button, .header-bar .linked.path-bar > .button {
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button,
+.primary-toolbar .linked:not(.vertical).path-bar > .button, .header-bar .linked:not(.vertical).path-bar > .button {
   color: rgba(207, 218, 231, 0.8);
   outline-color: rgba(207, 218, 231, 0.1);
   border-color: rgba(21, 23, 28, 0.37);
   background-color: rgba(95, 105, 127, 0.37); }
-  .primary-toolbar .linked.stack-switcher > .button:hover,
-  .header-bar .linked.stack-switcher > .button:hover,
-  .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover {
+  .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover,
+  .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover,
+  .primary-toolbar .linked:not(.vertical).path-bar > .button:hover, .header-bar .linked:not(.vertical).path-bar > .button:hover {
     background-color: rgba(134, 144, 165, 0.37); }
-  .primary-toolbar .linked.stack-switcher > .button:active,
-  .header-bar .linked.stack-switcher > .button:active,
-  .primary-toolbar .linked.stack-switcher > .button:checked,
-  .header-bar .linked.stack-switcher > .button:checked,
-  .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked {
+  .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:active,
+  .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:active,
+  .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:checked,
+  .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:checked,
+  .primary-toolbar .linked:not(.vertical).path-bar > .button:active, .header-bar .linked:not(.vertical).path-bar > .button:active, .primary-toolbar .linked:not(.vertical).path-bar > .button:checked, .header-bar .linked:not(.vertical).path-bar > .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: transparent;
     background-color: #5294E2; }
-  .primary-toolbar .linked.stack-switcher > .button:insensitive,
-  .header-bar .linked.stack-switcher > .button:insensitive,
-  .primary-toolbar .linked.path-bar > .button:insensitive, .header-bar .linked.path-bar > .button:insensitive {
+  .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:insensitive,
+  .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:insensitive,
+  .primary-toolbar .linked:not(.vertical).path-bar > .button:insensitive, .header-bar .linked:not(.vertical).path-bar > .button:insensitive {
     color: rgba(207, 218, 231, 0.4); }
-  .primary-toolbar .linked.stack-switcher > .button:hover,
-  .header-bar .linked.stack-switcher > .button:hover,
-  .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover {
-    box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37), inset -1px 0 rgba(21, 23, 28, 0.37); }
-  .primary-toolbar .linked.stack-switcher > .button:active,
-  .header-bar .linked.stack-switcher > .button:active,
-  .primary-toolbar .linked.stack-switcher > .button:checked,
-  .header-bar .linked.stack-switcher > .button:checked,
-  .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked {
-    box-shadow: none; }
-  .primary-toolbar .linked.stack-switcher > .button:first-child:hover,
-  .header-bar .linked.stack-switcher > .button:first-child:hover,
-  .primary-toolbar .linked.path-bar > .button:first-child:hover, .header-bar .linked.path-bar > .button:first-child:hover {
-    box-shadow: inset -1px 0 rgba(21, 23, 28, 0.37); }
-  .primary-toolbar .linked.stack-switcher > .button:first-child:active,
-  .header-bar .linked.stack-switcher > .button:first-child:active,
-  .primary-toolbar .linked.stack-switcher > .button:first-child:checked,
-  .header-bar .linked.stack-switcher > .button:first-child:checked,
-  .primary-toolbar .linked.path-bar > .button:first-child:active, .header-bar .linked.path-bar > .button:first-child:active, .primary-toolbar .linked.path-bar > .button:first-child:checked, .header-bar .linked.path-bar > .button:first-child:checked {
-    box-shadow: none; }
-  .primary-toolbar .linked.stack-switcher > .button:last-child:hover,
-  .header-bar .linked.stack-switcher > .button:last-child:hover,
-  .primary-toolbar .linked.path-bar > .button:last-child:hover, .header-bar .linked.path-bar > .button:last-child:hover {
-    box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); }
-  .primary-toolbar .linked.stack-switcher > .button:last-child:active,
-  .header-bar .linked.stack-switcher > .button:last-child:active,
-  .primary-toolbar .linked.stack-switcher > .button:last-child:checked,
-  .header-bar .linked.stack-switcher > .button:last-child:checked,
-  .primary-toolbar .linked.path-bar > .button:last-child:active, .header-bar .linked.path-bar > .button:last-child:active, .primary-toolbar .linked.path-bar > .button:last-child:checked, .header-bar .linked.path-bar > .button:last-child:checked {
-    box-shadow: none; }
-  .primary-toolbar .linked.stack-switcher > .button:only-child:hover,
-  .header-bar .linked.stack-switcher > .button:only-child:hover,
-  .primary-toolbar .linked.path-bar > .button:only-child:hover, .header-bar .linked.path-bar > .button:only-child:hover {
-    box-shadow: none; }
-  .primary-toolbar .linked.stack-switcher > .button:only-child:active,
-  .header-bar .linked.stack-switcher > .button:only-child:active,
-  .primary-toolbar .linked.stack-switcher > .button:only-child:checked,
-  .header-bar .linked.stack-switcher > .button:only-child:checked,
-  .primary-toolbar .linked.path-bar > .button:only-child:active, .header-bar .linked.path-bar > .button:only-child:active, .primary-toolbar .linked.path-bar > .button:only-child:checked, .header-bar .linked.path-bar > .button:only-child:checked {
-    box-shadow: none; }
+
+.primary-toolbar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):hover,
+.header-bar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):hover,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover:not(:checked):not(:active):not(:only-child):hover, .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover:not(:checked):not(:active):not(:only-child):hover {
+  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37), inset -1px 0 rgba(21, 23, 28, 0.37); }
+
+.primary-toolbar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):first-child:hover,
+.header-bar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):first-child:hover,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
+  box-shadow: inset -1px 0 rgba(21, 23, 28, 0.37); }
+
+.primary-toolbar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):last-child:hover,
+.header-bar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):last-child:hover,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
+  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); }
+
+.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry {
+  border-left-color: rgba(21, 23, 28, 0); }
+
+.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:not(:last-child),
+.header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:not(:last-child),
+.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:last-child, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:last-child {
+  border-left-color: rgba(21, 23, 28, 0.37); }
+
+.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .entry,
+.header-bar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .entry,
+.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .button,
+.header-bar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .button,
+.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox,
+.header-bar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox,
+.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox, .header-bar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox {
+  border-left-color: rgba(21, 23, 28, 0.37); }
 
 .primary-toolbar .button.suggested-action, .header-bar .button.suggested-action {
   background-clip: border-box;
@@ -1275,21 +1304,15 @@ GtkComboBox {
     color: rgba(207, 218, 231, 0.35);
     background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.22)); }
 
-.primary-toolbar GtkComboBox.combobox-entry .entry:dir(ltr):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(ltr):focus {
-  box-shadow: none; }
-
-.primary-toolbar GtkComboBox.combobox-entry .entry:dir(rtl):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(rtl):focus {
-  box-shadow: none; }
-
-.primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr), .header-bar GtkComboBox.combobox-entry .button:dir(ltr) {
-  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); }
-  .primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(ltr):insensitive {
-    box-shadow: inset 1px 0 rgba(21, 23, 28, 0); }
+.primary-toolbar GtkComboBox.combobox-entry .entry:dir(ltr), .header-bar GtkComboBox.combobox-entry .entry:dir(ltr) {
+  border-right-style: none; }
+  .primary-toolbar GtkComboBox.combobox-entry .entry:dir(ltr):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(ltr):focus {
+    box-shadow: none; }
 
-.primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl), .header-bar GtkComboBox.combobox-entry .button:dir(rtl) {
-  box-shadow: inset -1px 0 rgba(21, 23, 28, 0.37); }
-  .primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(rtl):insensitive {
-    box-shadow: inset -1px 0 rgba(21, 23, 28, 0); }
+.primary-toolbar GtkComboBox.combobox-entry .entry:dir(rtl), .header-bar GtkComboBox.combobox-entry .entry:dir(rtl) {
+  border-left-style: none; }
+  .primary-toolbar GtkComboBox.combobox-entry .entry:dir(rtl):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(rtl):focus {
+    box-shadow: none; }
 
 .primary-toolbar GtkSwitch:backdrop, .header-bar GtkSwitch:backdrop {
   opacity: 0.75; }
@@ -2604,8 +2627,7 @@ GtkVolumeButton.button {
 .view:selected:focus,
 .view:selected:hover, .label:selected,
 .label:selected:focus,
-.label:selected:hover, .grid-child:selected, .entry:selected,
-.entry:selected:focus, .menuitem.button.flat:active, .menuitem.sidebar-button.button:active, .menuitem.button.flat:selected, .menuitem.sidebar-button.button:selected, .list-row:selected, .sidebar:selected, .sidebar .view:selected, GtkPlacesSidebar.sidebar .list-row.activatable:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected,
+.label:selected:hover, .grid-child:selected, .menuitem.button.flat:active, .menuitem.sidebar-button.button:active, .menuitem.button.flat:selected, .menuitem.sidebar-button.button:selected, .list-row:selected, .sidebar:selected, .sidebar .view:selected, GtkPlacesSidebar.sidebar .list-row.activatable:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected,
 GtkEntry.gb-command-bar-entry.entry.flat:selected:focus,
 GtkFileChooserDialog GtkPlacesSidebar.sidebar .list-row.activatable:selected,
 GtkFileChooserDialog GtkPlacesSidebar.sidebar .list-row.activatable:selected:hover,
@@ -2826,36 +2848,29 @@ NemoWindow .sidebar .frame {
 NemoWindow GtkSeparator.separator.horizontal, NemoWindow .sidebar GtkSeparator.horizontal.view.separator, .sidebar NemoWindow GtkSeparator.horizontal.view.separator {
   color: #2b2e39; }
 
-NemoWindow .primary-toolbar NemoPathBar.linked > .button {
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button {
   color: rgba(207, 218, 231, 0.8);
   outline-color: rgba(207, 218, 231, 0.1);
   border-color: rgba(21, 23, 28, 0.37);
   background-color: rgba(95, 105, 127, 0.37); }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover {
+  NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover {
     background-color: rgba(134, 144, 165, 0.37); }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked {
+  NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: transparent;
     background-color: #5294E2; }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:insensitive {
+  NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:insensitive {
     color: rgba(207, 218, 231, 0.4); }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover {
-    box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37), inset -1px 0 rgba(21, 23, 28, 0.37); }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked {
-    box-shadow: none; }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:hover {
-    box-shadow: inset -1px 0 rgba(21, 23, 28, 0.37); }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:checked {
-    box-shadow: none; }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:hover {
-    box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:checked {
-    box-shadow: none; }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:hover {
-    box-shadow: none; }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:checked {
-    box-shadow: none; }
+
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child):hover {
+  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37), inset -1px 0 rgba(21, 23, 28, 0.37); }
+
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
+  box-shadow: inset -1px 0 rgba(21, 23, 28, 0.37); }
+
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
+  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); }
 
 .gedit-headerbar-paned {
   color: rgba(38, 42, 51, 0.97); }
@@ -3361,7 +3376,7 @@ UnityPanelWidget,
   box-shadow: none; }
   UnityPanelWidget:backdrop,
   .unity-panel:backdrop {
-    color: #abb6c5; }
+    color: #bdc6d1; }
 
 .unity-panel.menubar.menuitem:hover,
 .unity-panel.menubar .menuitem *:hover {
@@ -3574,7 +3589,7 @@ GtkListBox .h4 {
   #content_frame .button:active, #content_frame .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: transparent;
+    border-color: #2b2e39;
     background-color: #5294E2; }
   #content_frame .button:insensitive {
     color: rgba(211, 218, 227, 0.45);
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 844c306..f09e6f1 100644
--- a/common/gtk-3.0/3.18/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.18/gtk-contained-darker.css
@@ -170,6 +170,10 @@ GtkTextView {
     border-color: rgba(207, 214, 230, 0.55);
     background-color: rgba(255, 255, 255, 0.55);
     background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.55)); }
+  .entry:selected,
+  .entry:selected:focus {
+    background-color: #5294E2;
+    color: #ffffff; }
   .entry.progressbar {
     margin: 2px 12px;
     border-radius: 0;
@@ -179,17 +183,6 @@ GtkTextView {
     background-image: none;
     background-color: transparent;
     box-shadow: none; }
-  .linked > .entry:first-child {
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0; }
-    .linked > .entry:first-child:dir(rtl) {
-      border-right-style: none; }
-  .linked > .entry:last-child {
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0;
-    border-left-style: none; }
-    .linked > .entry:last-child:dir(rtl) {
-      border-left-style: solid; }
   .entry.error {
     color: white;
     border-color: #FC4138;
@@ -216,28 +209,6 @@ GtkTextView {
       color: #5c616c; }
     .entry.image:active {
       color: #5294E2; }
-  .linked.vertical > .entry {
-    border-bottom-color: #f4f5f6;
-    box-shadow: none; }
-    .linked.vertical > .entry:focus {
-      border-color: #5294E2;
-      box-shadow: 0 -1px 0 0 #5294E2; }
-    .linked.vertical > .entry:insensitive {
-      border-bottom-color: #f4f5f6; }
-    .linked.vertical > .entry:first-child {
-      border-bottom-color: #f4f5f6; }
-      .linked.vertical > .entry:first-child:focus {
-        border-bottom-color: #5294E2;
-        box-shadow: none; }
-      .linked.vertical > .entry:first-child:insensitive {
-        border-bottom-color: #f4f5f6; }
-    .linked.vertical > .entry:last-child {
-      border-bottom-color: rgba(0, 0, 0, 0.14); }
-      .linked.vertical > .entry:last-child:focus {
-        border-bottom-color: #5294E2;
-        box-shadow: 0 -1px 0 0 #5294E2; }
-      .linked.vertical > .entry:last-child:insensitive {
-        border-bottom-color: rgba(0, 0, 0, 0.14); }
   .osd .entry {
     color: #BAC3CF;
     border-color: rgba(26, 28, 34, 0.35);
@@ -298,7 +269,7 @@ GtkSearchEntry.entry {
     background-clip: border-box;
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: transparent;
+    border-color: #5294E2;
     background-color: #5294E2;
     transition-duration: 50ms; }
   .button:active {
@@ -528,7 +499,7 @@ GtkSearchEntry.entry {
   .inline-toolbar GtkToolButton > .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: transparent;
+    border-color: #5294E2;
     background-color: #5294E2; }
   .inline-toolbar GtkToolButton > .button:insensitive {
     color: rgba(92, 97, 108, 0.55);
@@ -546,166 +517,219 @@ GtkSearchEntry.entry {
     .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel {
       color: inherit; }
 
-.inline-toolbar.toolbar GtkToolButton > .button.flat, .inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.toolbar GtkToolButton > .sidebar-button.button, .inline-toolbar GtkToolButton > .sidebar-button.button, .osd .button:hover, .osd .button:active, .osd .button:checked, .osd .button:insensitive, .inline-toolbar .button, .inline-toolbar .button:backdrop, .linked > .button,
-.linked > .button:hover,
-.linked > .button:active,
-.linked > .button:checked, GtkComboBox.combobox-entry .entry, GtkComboBox.combobox-entry .the-button-in-the-combobox, .primary-toolbar .linked.stack-switcher > .button,
-.header-bar .linked.stack-switcher > .button,
-.primary-toolbar .linked.path-bar > .button, .header-bar .linked.path-bar > .button, NemoWindow .primary-toolbar NemoPathBar.linked > .button, .linked > GtkComboBox > .the-button-in-the-combobox:dir(ltr) {
+.linked:not(.vertical):not(.pathbar) > .entry + .entry {
+  border-left-color: rgba(207, 214, 230, 0.3); }
+
+.linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:not(:last-child),
+.linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:last-child {
+  border-left-color: #5294E2; }
+
+.linked:not(.vertical):not(.pathbar) > .entry + .button,
+.linked:not(.vertical):not(.pathbar) > .entry + .button:hover,
+.linked:not(.vertical):not(.pathbar) > .entry + .button:active,
+.linked:not(.vertical):not(.pathbar) > .entry + .button:checked,
+.linked:not(.vertical):not(.pathbar) > .entry + .button:insensitive {
+  border-left-style: solid; }
+
+.linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .entry,
+.linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .button,
+.linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox,
+.linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox {
+  border-left-color: #5294E2; }
+
+.linked:not(.vertical):not(.pathbar) > .button:hover:not(:checked):not(:active):not(:only-child),
+.linked:not(.vertical):not(.pathbar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) {
+  box-shadow: -1px 0 #cfd6e6; }
+
+.linked:not(.vertical):not(.pathbar) > .button:first-child:hover:not(:checked):not(:active) {
+  box-shadow: none; }
+
+.linked:not(.vertical):not(.pathbar) > .button:checked + .button:not(:checked):not(:active):hover {
+  box-shadow: none; }
+
+.linked:not(.vertical):not(.pathbar) > .button:checked + .entry {
+  border-left-color: #5294E2; }
+
+.linked:not(.vertical):not(.pathbar) > .entry + .button:not(:checked):not(:active):hover {
+  box-shadow: none; }
+
+.linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):hover {
+  box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4), inset -1px 0 rgba(207, 214, 230, 0.4); }
+
+.linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
+  box-shadow: inset -1px 0 rgba(207, 214, 230, 0.4); }
+
+.linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
+  box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4); }
+
+.linked.vertical > .entry + .entry {
+  border-top-color: rgba(207, 214, 230, 0.3); }
+
+.linked.vertical > .entry + .entry:focus:not(:last-child),
+.linked.vertical > .entry + .entry:focus:last-child {
+  border-top-color: #5294E2; }
+
+.linked.vertical > .entry + .button,
+.linked.vertical > .entry + .button:hover,
+.linked.vertical > .entry + .button:active,
+.linked.vertical > .entry + .button:checked,
+.linked.vertical > .entry + .button:insensitive {
+  border-top-style: solid; }
+
+.linked.vertical > .entry:focus:not(:only-child) + .entry,
+.linked.vertical > .entry:focus:not(:only-child) + .button,
+.linked.vertical > .entry:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox,
+.linked.vertical > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox {
+  border-top-color: #5294E2; }
+
+.linked.vertical > .button:hover:not(:checked):not(:active):not(:only-child),
+.linked.vertical > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) {
+  box-shadow: 0 -1px #cfd6e6; }
+
+.linked.vertical > .button:first-child:hover:not(:checked):not(:active) {
+  box-shadow: none; }
+
+.linked.vertical > .button:checked + .button:not(:checked):not(:active):hover {
+  box-shadow: none; }
+
+.linked.vertical > .button:checked + .entry {
+  border-top-color: #5294E2; }
+
+.linked.vertical > .entry + .button:not(:checked):not(:active):hover {
+  box-shadow: none; }
+
+.inline-toolbar.toolbar GtkToolButton > .button.flat, .inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.toolbar GtkToolButton > .sidebar-button.button, .inline-toolbar GtkToolButton > .sidebar-button.button, .osd .button:hover, .osd .button:active, .osd .button:checked, .osd .button:insensitive, .inline-toolbar .button, .inline-toolbar .button:backdrop, .linked:not(.vertical) > .button,
+.linked:not(.vertical) > .button:hover,
+.linked:not(.vertical) > .button:active,
+.linked:not(.vertical) > .button:checked, .linked:not(.vertical):not(.pathbar) > .entry, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button,
+.primary-toolbar .linked:not(.vertical).path-bar > .button,
+.header-bar .linked:not(.vertical).path-bar > .button,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:hover,
+.header-bar .linked:not(.vertical).path-bar > .button:hover,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:active,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:active,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:active,
+.header-bar .linked:not(.vertical).path-bar > .button:active,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:checked,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:checked,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:checked,
+.header-bar .linked:not(.vertical).path-bar > .button:checked,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:insensitive,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:insensitive,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:insensitive, .header-bar .linked:not(.vertical).path-bar > .button:insensitive, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:active,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:checked,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:insensitive, .linked > GtkComboBox > .the-button-in-the-combobox:dir(ltr),
+.linked > GtkComboBox > .the-button-in-the-combobox:dir(rtl),
+.linked > GtkComboBoxText > .the-button-in-the-combobox:dir(ltr),
+.linked > GtkComboBoxText > .the-button-in-the-combobox:dir(rtl) {
   border-radius: 0;
-  border-left-style: none;
   border-right-style: none; }
-  .inline-toolbar GtkToolButton > .button.flat:hover, .inline-toolbar GtkToolButton > .sidebar-button.button:hover, .osd .button:hover, .inline-toolbar .button:hover, .linked > .button:hover,
-  GtkComboBox.combobox-entry .entry:hover, GtkComboBox.combobox-entry .the-button-in-the-combobox:hover, .primary-toolbar .linked.stack-switcher > .button:hover,
-  .header-bar .linked.stack-switcher > .button:hover,
-  .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover, .linked > GtkComboBox > .the-button-in-the-combobox:hover:dir(ltr) {
-    box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4), inset -1px 0 rgba(207, 214, 230, 0.4); }
-  .inline-toolbar GtkToolButton > .button.flat:active, .inline-toolbar GtkToolButton > .sidebar-button.button:active, .osd .button:active, .inline-toolbar .button:active, .linked > .button:active,
-  GtkComboBox.combobox-entry .entry:active, GtkComboBox.combobox-entry .the-button-in-the-combobox:active, .primary-toolbar .linked.stack-switcher > .button:active,
-  .header-bar .linked.stack-switcher > .button:active,
-  .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, .linked > GtkComboBox > .the-button-in-the-combobox:active:dir(ltr), .inline-toolbar GtkToolButton > .button.flat:checked, .inline-toolbar GtkToolButton > .sidebar-button.button:checked, .osd .button:checked, .inline-toolbar .button:checked, .linked > .button:checked,
-  GtkComboBox.combobox-entry .entry:checked, GtkComboBox.combobox-entry .the-button-in-the-combobox:checked, .primary-toolbar .linked.stack-switcher > .button:checked,
-  .header-bar .linked.stack-switcher > .button:checked,
-  .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked, .linked > GtkComboBox > .the-button-in-the-combobox:checked:dir(ltr) {
-    box-shadow: none; }
-  .inline-toolbar GtkToolButton > .button.flat:dir(rtl), .inline-toolbar GtkToolButton > .sidebar-button.button:dir(rtl), .inline-toolbar.toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar.toolbar GtkToolButton:dir(rtl) > .sidebar-button.button, .inline-toolbar GtkToolButton:dir(rtl) > .sidebar-button.button, .osd .button:dir(rtl):hover, .osd .button:dir(rtl):active, .osd .button:dir(rtl):checked, .osd .button:dir(rtl):insensitive, .inline-toolbar .button:dir(rtl), .linked > .button:dir(rtl),
-  GtkComboBox.combobox-entry .entry:dir(rtl), GtkComboBox.combobox-entry .the-button-in-the-combobox:dir(rtl), .primary-toolbar .linked.stack-switcher > .button:dir(rtl),
-  .header-bar .linked.stack-switcher > .button:dir(rtl),
-  .primary-toolbar .linked.path-bar > .button:dir(rtl), .header-bar .linked.path-bar > .button:dir(rtl), NemoWindow .primary-toolbar NemoPathBar.linked > .button:dir(rtl), .linked > GtkComboBox > .the-button-in-the-combobox:dir(rtl) {
-    border-radius: 0; }
 
-.osd .button:first-child:hover, .osd .button:first-child:active, .osd .button:first-child:checked, .osd .button:first-child:insensitive, .inline-toolbar .button:first-child, .linked > .button:first-child,
-.inline-toolbar.toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar.toolbar GtkToolButton:first-child > .sidebar-button.button, .inline-toolbar GtkToolButton:first-child > .sidebar-button.button, GtkComboBox.combobox-entry .entry:first-child, GtkComboBox.combobox-entry .the-button-in-the-combobox:first-child, .linked > GtkComboBox:first-child > .the-button-in-the-combobox, .primary-toolbar .linked.stack-switcher > .button:first-child,
-.header-bar .linked.stack-switcher > .button:first-child,
-.primary-toolbar .linked.path-bar > .button:first-child, .header-bar .linked.path-bar > .button:first-child, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child {
-  border-radius: 3px 0 0 3px;
-  border-left-style: solid; }
-  .osd .button:first-child:hover, .inline-toolbar .button:first-child:hover, .linked > .button:first-child:hover,
-  .inline-toolbar GtkToolButton:first-child > .button.flat:hover, .inline-toolbar GtkToolButton:first-child > .sidebar-button.button:hover, GtkComboBox.combobox-entry .entry:first-child:hover, GtkComboBox.combobox-entry .the-button-in-the-combobox:first-child:hover, .linked > GtkComboBox:first-child > .the-button-in-the-combobox:hover, .primary-toolbar .linked.stack-switcher > .button:first-child:hover,
-  .header-bar .linked.stack-switcher > .button:first-child:hover,
-  .primary-toolbar .linked.path-bar > .button:first-child:hover, .header-bar .linked.path-bar > .button:first-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:hover {
-    box-shadow: inset -1px 0 rgba(207, 214, 230, 0.4); }
-  .osd .button:first-child:active, .inline-toolbar .button:first-child:active, .linked > .button:first-child:active,
-  .inline-toolbar GtkToolButton:first-child > .button.flat:active, .inline-toolbar GtkToolButton:first-child > .sidebar-button.button:active, GtkComboBox.combobox-entry .entry:first-child:active, GtkComboBox.combobox-entry .the-button-in-the-combobox:first-child:active, .linked > GtkComboBox:first-child > .the-button-in-the-combobox:active, .primary-toolbar .linked.stack-switcher > .button:first-child:active,
-  .header-bar .linked.stack-switcher > .button:first-child:active,
-  .primary-toolbar .linked.path-bar > .button:first-child:active, .header-bar .linked.path-bar > .button:first-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:active, .osd .button:first-child:checked, .inline-toolbar .button:first-child:checked, .linked > .button:first-child:checked,
-  .inline-toolbar GtkToolButton:first-child > .button.flat:checked, .inline-toolbar GtkToolButton:first-child > .sidebar-button.button:checked, GtkComboBox.combobox-entry .entry:first-child:checked, GtkComboBox.combobox-entry .the-button-in-the-combobox:first-child:checked, .linked > GtkComboBox:first-child > .the-button-in-the-combobox:checked, .primary-toolbar .linked.stack-switcher > .button:first-child:checked,
-  .header-bar .linked.stack-switcher > .button:first-child:checked,
-  .primary-toolbar .linked.path-bar > .button:first-child:checked, .header-bar .linked.path-bar > .button:first-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:checked {
-    box-shadow: none; }
+.osd .button:first-child:hover, .osd .button:first-child:active, .osd .button:first-child:checked, .osd .button:first-child:insensitive, .inline-toolbar .button:first-child, .linked:not(.vertical) > .button:first-child,
+.inline-toolbar.toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar.toolbar GtkToolButton:first-child > .sidebar-button.button, .inline-toolbar GtkToolButton:first-child > .sidebar-button.button, .linked:not(.vertical):not(.pathbar) > .entry:first-child, .linked > GtkComboBox:first-child > .the-button-in-the-combobox,
+.linked > GtkComboBoxText:first-child > .the-button-in-the-combobox, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:first-child,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:first-child,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:first-child,
+.header-bar .linked:not(.vertical).path-bar > .button:first-child,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:first-child {
+  border-top-left-radius: 3px;
+  border-bottom-left-radius: 3px; }
 
-.osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .inline-toolbar .button:last-child, .linked > .button:last-child,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar.toolbar GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar GtkToolButton:last-child > .sidebar-button.button, GtkComboBox.combobox-entry .entry:last-child, GtkComboBox.combobox-entry .the-button-in-the-combobox:last-child, .linked > GtkComboBox:last-child > .the-button-in-the-combobox, .primary-toolbar .linked.stack-switcher > .button:last-child,
-.header-bar .linked.stack-switcher > .button:last-child,
-.primary-toolbar .linked.path-bar > .button:last-child, .header-bar .linked.path-bar > .button:last-child, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child {
-  border-radius: 0 3px 3px 0;
+.osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .inline-toolbar .button:last-child, .linked:not(.vertical) > .button:last-child,
+.inline-toolbar.toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar.toolbar GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar GtkToolButton:last-child > .sidebar-button.button, .linked:not(.vertical):not(.pathbar) > .entry:last-child, .linked > GtkComboBox:last-child > .the-button-in-the-combobox,
+.linked > GtkComboBoxText:last-child > .the-button-in-the-combobox, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:last-child,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:last-child,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:last-child,
+.header-bar .linked:not(.vertical).path-bar > .button:last-child,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:last-child {
+  border-top-right-radius: 3px;
+  border-bottom-right-radius: 3px;
   border-right-style: solid; }
-  .osd .button:last-child:hover, .inline-toolbar .button:last-child:hover, .linked > .button:last-child:hover,
-  .inline-toolbar GtkToolButton:last-child > .button.flat:hover, .inline-toolbar GtkToolButton:last-child > .sidebar-button.button:hover, GtkComboBox.combobox-entry .entry:last-child:hover, GtkComboBox.combobox-entry .the-button-in-the-combobox:last-child:hover, .linked > GtkComboBox:last-child > .the-button-in-the-combobox:hover, .primary-toolbar .linked.stack-switcher > .button:last-child:hover,
-  .header-bar .linked.stack-switcher > .button:last-child:hover,
-  .primary-toolbar .linked.path-bar > .button:last-child:hover, .header-bar .linked.path-bar > .button:last-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:hover {
-    box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4); }
-  .osd .button:last-child:active, .inline-toolbar .button:last-child:active, .linked > .button:last-child:active,
-  .inline-toolbar GtkToolButton:last-child > .button.flat:active, .inline-toolbar GtkToolButton:last-child > .sidebar-button.button:active, GtkComboBox.combobox-entry .entry:last-child:active, GtkComboBox.combobox-entry .the-button-in-the-combobox:last-child:active, .linked > GtkComboBox:last-child > .the-button-in-the-combobox:active, .primary-toolbar .linked.stack-switcher > .button:last-child:active,
-  .header-bar .linked.stack-switcher > .button:last-child:active,
-  .primary-toolbar .linked.path-bar > .button:last-child:active, .header-bar .linked.path-bar > .button:last-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:active, .osd .button:last-child:checked, .inline-toolbar .button:last-child:checked, .linked > .button:last-child:checked,
-  .inline-toolbar GtkToolButton:last-child > .button.flat:checked, .inline-toolbar GtkToolButton:last-child > .sidebar-button.button:checked, GtkComboBox.combobox-entry .entry:last-child:checked, GtkComboBox.combobox-entry .the-button-in-the-combobox:last-child:checked, .linked > GtkComboBox:last-child > .the-button-in-the-combobox:checked, .primary-toolbar .linked.stack-switcher > .button:last-child:checked,
-  .header-bar .linked.stack-switcher > .button:last-child:checked,
-  .primary-toolbar .linked.path-bar > .button:last-child:checked, .header-bar .linked.path-bar > .button:last-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:checked {
-    box-shadow: none; }
-  .osd .button:last-child:dir(rtl):hover, .osd .button:last-child:dir(rtl):active, .osd .button:last-child:dir(rtl):checked, .osd .button:last-child:dir(rtl):insensitive, .inline-toolbar .button:last-child:dir(rtl), .linked > .button:last-child:dir(rtl),
-  .inline-toolbar GtkToolButton:last-child > .button.flat:dir(rtl), .inline-toolbar GtkToolButton:last-child > .sidebar-button.button:dir(rtl), .inline-toolbar.toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar.toolbar GtkToolButton:last-child:dir(rtl) > .sidebar-button.button, .inline-toolbar GtkToolButton:last-child:dir(rtl) > .sidebar-button.button, GtkComboBox.combobox-entry .entry:last-child:dir(rtl), GtkComboBox.combobox-entry .the-button-in-the-combobox:last-child:dir(rtl), .linked > GtkComboBox:last-child > .the-button-in-the-combobox:dir(rtl), .primary-toolbar .linked.stack-switcher > .button:last-child:dir(rtl),
-  .header-bar .linked.stack-switcher > .button:last-child:dir(rtl),
-  .primary-toolbar .linked.path-bar > .button:last-child:dir(rtl), .header-bar .linked.path-bar > .button:last-child:dir(rtl), NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:dir(rtl) {
-    border-bottom-left-radius: 0; }
 
-.osd .button:only-child:hover, .osd .button:only-child:active, .osd .button:only-child:checked, .osd .button:only-child:insensitive, .inline-toolbar .button:only-child, .linked > .button:only-child,
-.inline-toolbar.toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar.toolbar GtkToolButton:only-child > .sidebar-button.button, .inline-toolbar GtkToolButton:only-child > .sidebar-button.button, GtkComboBox.combobox-entry .entry:only-child, GtkComboBox.combobox-entry .the-button-in-the-combobox:only-child, .linked > GtkComboBox:only-child > .the-button-in-the-combobox, .primary-toolbar .linked.stack-switcher > .button:only-child,
-.header-bar .linked.stack-switcher > .button:only-child,
-.primary-toolbar .linked.path-bar > .button:only-child, .header-bar .linked.path-bar > .button:only-child, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child {
+.osd .button:only-child:hover, .osd .button:only-child:active, .osd .button:only-child:checked, .osd .button:only-child:insensitive, .inline-toolbar .button:only-child, .linked:not(.vertical) > .button:only-child,
+.inline-toolbar.toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar.toolbar GtkToolButton:only-child > .sidebar-button.button, .inline-toolbar GtkToolButton:only-child > .sidebar-button.button, .linked:not(.vertical):not(.pathbar) > .entry:only-child, .linked > GtkComboBox:only-child > .the-button-in-the-combobox,
+.linked > GtkComboBoxText:only-child > .the-button-in-the-combobox, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:only-child,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:only-child,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:only-child,
+.header-bar .linked:not(.vertical).path-bar > .button:only-child,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:only-child {
   border-radius: 3px;
   border-style: solid; }
-  .osd .button:only-child:hover, .inline-toolbar .button:only-child:hover, .linked > .button:only-child:hover,
-  .inline-toolbar GtkToolButton:only-child > .button.flat:hover, .inline-toolbar GtkToolButton:only-child > .sidebar-button.button:hover, GtkComboBox.combobox-entry .entry:only-child:hover, GtkComboBox.combobox-entry .the-button-in-the-combobox:only-child:hover, .linked > GtkComboBox:only-child > .the-button-in-the-combobox:hover, .primary-toolbar .linked.stack-switcher > .button:only-child:hover,
-  .header-bar .linked.stack-switcher > .button:only-child:hover,
-  .primary-toolbar .linked.path-bar > .button:only-child:hover, .header-bar .linked.path-bar > .button:only-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:hover {
-    box-shadow: none; }
-  .osd .button:only-child:active, .inline-toolbar .button:only-child:active, .linked > .button:only-child:active,
-  .inline-toolbar GtkToolButton:only-child > .button.flat:active, .inline-toolbar GtkToolButton:only-child > .sidebar-button.button:active, GtkComboBox.combobox-entry .entry:only-child:active, GtkComboBox.combobox-entry .the-button-in-the-combobox:only-child:active, .linked > GtkComboBox:only-child > .the-button-in-the-combobox:active, .primary-toolbar .linked.stack-switcher > .button:only-child:active,
-  .header-bar .linked.stack-switcher > .button:only-child:active,
-  .primary-toolbar .linked.path-bar > .button:only-child:active, .header-bar .linked.path-bar > .button:only-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:active, .osd .button:only-child:checked, .inline-toolbar .button:only-child:checked, .linked > .button:only-child:checked,
-  .inline-toolbar GtkToolButton:only-child > .button.flat:checked, .inline-toolbar GtkToolButton:only-child > .sidebar-button.button:checked, GtkComboBox.combobox-entry .entry:only-child:checked, GtkComboBox.combobox-entry .the-button-in-the-combobox:only-child:checked, .linked > GtkComboBox:only-child > .the-button-in-the-combobox:checked, .primary-toolbar .linked.stack-switcher > .button:only-child:checked,
-  .header-bar .linked.stack-switcher > .button:only-child:checked,
-  .primary-toolbar .linked.path-bar > .button:only-child:checked, .header-bar .linked.path-bar > .button:only-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:checked {
-    box-shadow: none; }
 
-.linked.vertical > .entry, .linked.vertical > .entry:focus, .linked.vertical > .entry:insensitive, .linked.vertical > .button,
+.linked.vertical > .button,
 .linked.vertical > .button:hover,
 .linked.vertical > .button:active,
-.linked.vertical > .button:checked, .linked.vertical > GtkComboBoxText > .the-button-in-the-combobox,
+.linked.vertical > .button:checked, .linked.vertical > .entry, .linked.vertical > GtkComboBoxText > .the-button-in-the-combobox,
 .linked.vertical > GtkComboBox > .the-button-in-the-combobox {
-  border-style: solid;
-  border-bottom-style: none;
-  border-top-style: none;
-  border-radius: 0; }
-  .linked.vertical > .entry:hover, .linked.vertical > .button:hover,
-  .linked.vertical > GtkComboBoxText > .the-button-in-the-combobox:hover,
-  .linked.vertical > GtkComboBox > .the-button-in-the-combobox:hover {
-    box-shadow: inset 0 -1px rgba(207, 214, 230, 0.4), inset 0 1px rgba(207, 214, 230, 0.4); }
-  .linked.vertical > .entry:active, .linked.vertical > .button:active,
-  .linked.vertical > GtkComboBoxText > .the-button-in-the-combobox:active,
-  .linked.vertical > GtkComboBox > .the-button-in-the-combobox:active, .linked.vertical > .entry:checked, .linked.vertical > .button:checked,
-  .linked.vertical > GtkComboBoxText > .the-button-in-the-combobox:checked,
-  .linked.vertical > GtkComboBox > .the-button-in-the-combobox:checked {
-    box-shadow: none; }
+  border-radius: 0;
+  border-bottom-style: none; }
 
-.linked.vertical > .entry:first-child, .linked.vertical > .button:first-child,
-.linked.vertical > GtkComboBoxText:first-child > .the-button-in-the-combobox,
+.linked.vertical > .button:first-child,
+.linked.vertical > .entry:first-child, .linked.vertical > GtkComboBoxText:first-child > .the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:first-child > .the-button-in-the-combobox {
-  border-radius: 3px 3px 0 0;
-  border-top-style: solid; }
-  .linked.vertical > .entry:first-child:hover, .linked.vertical > .button:first-child:hover,
-  .linked.vertical > GtkComboBoxText:first-child > .the-button-in-the-combobox:hover,
-  .linked.vertical > GtkComboBox:first-child > .the-button-in-the-combobox:hover {
-    box-shadow: inset 0 -1px rgba(207, 214, 230, 0.4); }
-  .linked.vertical > .entry:first-child:active, .linked.vertical > .button:first-child:active,
-  .linked.vertical > GtkComboBoxText:first-child > .the-button-in-the-combobox:active,
-  .linked.vertical > GtkComboBox:first-child > .the-button-in-the-combobox:active, .linked.vertical > .entry:first-child:checked, .linked.vertical > .button:first-child:checked,
-  .linked.vertical > GtkComboBoxText:first-child > .the-button-in-the-combobox:checked,
-  .linked.vertical > GtkComboBox:first-child > .the-button-in-the-combobox:checked {
-    box-shadow: none; }
+  border-top-left-radius: 3px;
+  border-top-right-radius: 3px; }
 
-.linked.vertical > .entry:last-child, .linked.vertical > .button:last-child,
-.linked.vertical > GtkComboBoxText:last-child > .the-button-in-the-combobox,
+.linked.vertical > .button:last-child,
+.linked.vertical > .entry:last-child, .linked.vertical > GtkComboBoxText:last-child > .the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:last-child > .the-button-in-the-combobox {
-  border-radius: 0 0 3px 3px;
+  border-bottom-left-radius: 3px;
+  border-bottom-right-radius: 3px;
   border-bottom-style: solid; }
-  .linked.vertical > .entry:last-child:hover, .linked.vertical > .button:last-child:hover,
-  .linked.vertical > GtkComboBoxText:last-child > .the-button-in-the-combobox:hover,
-  .linked.vertical > GtkComboBox:last-child > .the-button-in-the-combobox:hover {
-    box-shadow: inset 0 1px rgba(207, 214, 230, 0.4); }
-  .linked.vertical > .entry:last-child:active, .linked.vertical > .button:last-child:active,
-  .linked.vertical > GtkComboBoxText:last-child > .the-button-in-the-combobox:active,
-  .linked.vertical > GtkComboBox:last-child > .the-button-in-the-combobox:active, .linked.vertical > .entry:last-child:checked, .linked.vertical > .button:last-child:checked,
-  .linked.vertical > GtkComboBoxText:last-child > .the-button-in-the-combobox:checked,
-  .linked.vertical > GtkComboBox:last-child > .the-button-in-the-combobox:checked {
-    box-shadow: none; }
 
-.linked.vertical > .entry:only-child, .linked.vertical > .button:only-child,
-.linked.vertical > GtkComboBoxText:only-child > .the-button-in-the-combobox,
+.linked.vertical > .button:only-child,
+.linked.vertical > .entry:only-child, .linked.vertical > GtkComboBoxText:only-child > .the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:only-child > .the-button-in-the-combobox {
   border-radius: 3px;
   border-style: solid; }
-  .linked.vertical > .entry:only-child:hover, .linked.vertical > .button:only-child:hover,
-  .linked.vertical > GtkComboBoxText:only-child > .the-button-in-the-combobox:hover,
-  .linked.vertical > GtkComboBox:only-child > .the-button-in-the-combobox:hover {
-    box-shadow: none; }
-  .linked.vertical > .entry:only-child:active, .linked.vertical > .button:only-child:active,
-  .linked.vertical > GtkComboBoxText:only-child > .the-button-in-the-combobox:active,
-  .linked.vertical > GtkComboBox:only-child > .the-button-in-the-combobox:active, .linked.vertical > .entry:only-child:checked, .linked.vertical > .button:only-child:checked,
-  .linked.vertical > GtkComboBoxText:only-child > .the-button-in-the-combobox:checked,
-  .linked.vertical > GtkComboBox:only-child > .the-button-in-the-combobox:checked {
-    box-shadow: none; }
+
+.linked:not(.vertical) > .button,
+.linked:not(.vertical) > .button:hover,
+.linked:not(.vertical) > .button:active,
+.linked:not(.vertical) > .button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button,
+.primary-toolbar .linked:not(.vertical).path-bar > .button,
+.header-bar .linked:not(.vertical).path-bar > .button,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:hover,
+.header-bar .linked:not(.vertical).path-bar > .button:hover,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:active,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:active,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:active,
+.header-bar .linked:not(.vertical).path-bar > .button:active,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:checked,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:checked,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:checked,
+.header-bar .linked:not(.vertical).path-bar > .button:checked,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:insensitive,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:insensitive,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:insensitive, .header-bar .linked:not(.vertical).path-bar > .button:insensitive, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:active,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:checked,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:insensitive {
+  border-left-style: none; }
+  .linked:not(.vertical) > .button:first-child,
+  .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:first-child,
+  .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:first-child,
+  .primary-toolbar .linked:not(.vertical).path-bar > .button:first-child,
+  .header-bar .linked:not(.vertical).path-bar > .button:first-child,
+  NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:first-child {
+    border-left-style: solid; }
+
+.linked.vertical > .button,
+.linked.vertical > .button:hover,
+.linked.vertical > .button:active,
+.linked.vertical > .button:checked {
+  border-top-style: none; }
+  .linked.vertical > .button:first-child {
+    border-top-style: solid; }
 
 .menuitem.button.flat, .menuitem.sidebar-button.button, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .app-notification .button.flat,
 .app-notification .sidebar-button.button,
@@ -780,7 +804,7 @@ GtkSearchEntry.entry {
     .spinbutton.vertical .button:first-child:active, .spinbutton.vertical:dir(rtl) .button:first-child:active {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: transparent;
+      border-color: #5294E2;
       background-color: #5294E2; }
     .spinbutton.vertical .button:first-child:hover, .spinbutton.vertical:dir(rtl) .button:first-child:hover {
       color: #5c616c;
@@ -801,7 +825,7 @@ GtkSearchEntry.entry {
     .spinbutton.vertical .button:last-child:active, .spinbutton.vertical:dir(rtl) .button:last-child:active {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: transparent;
+      border-color: #5294E2;
       background-color: #5294E2; }
     .spinbutton.vertical .button:last-child:hover, .spinbutton.vertical:dir(rtl) .button:last-child:hover {
       color: #5c616c;
@@ -845,21 +869,23 @@ GtkComboBox {
   GtkComboBox .separator.vertical, GtkComboBox .sidebar .vertical.view.separator, .sidebar GtkComboBox .vertical.view.separator {
     -GtkWidget-wide-separators: true; }
   GtkComboBox.combobox-entry .entry:dir(ltr) {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
     border-right-style: none; }
     GtkComboBox.combobox-entry .entry:dir(ltr):focus {
       box-shadow: 1px 0 #5294E2; }
   GtkComboBox.combobox-entry .entry:dir(rtl) {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
     border-left-style: none; }
     GtkComboBox.combobox-entry .entry:dir(rtl):focus {
       box-shadow: -1px 0 #5294E2; }
-  GtkComboBox.combobox-entry .the-button-in-the-combobox:dir(ltr) {
-    box-shadow: inset 1px 0 #cfd6e6; }
-    GtkComboBox.combobox-entry .the-button-in-the-combobox:dir(ltr):insensitive {
-      box-shadow: inset 1px 0 rgba(207, 214, 230, 0.55); }
-  GtkComboBox.combobox-entry .the-button-in-the-combobox:dir(rtl) {
-    box-shadow: inset -1px 0 #cfd6e6; }
-    GtkComboBox.combobox-entry .the-button-in-the-combobox:dir(rtl):insensitive {
-      box-shadow: inset -1px 0 rgba(207, 214, 230, 0.55); }
+  GtkComboBox.combobox-entry .button:dir(ltr) {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0; }
+  GtkComboBox.combobox-entry .button:dir(rtl) {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0; }
 
 /************
  * Toolbars *
@@ -1092,77 +1118,83 @@ GtkComboBox {
     border-color: rgba(82, 148, 226, 0.65);
     background-color: rgba(82, 148, 226, 0.65); }
 
-.primary-toolbar .linked > .button, .header-bar .linked > .button {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button,
+.header-bar .linked:not(.vertical):not(.path-bar) > .button,
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover,
+.header-bar .linked:not(.vertical):not(.path-bar) > .button:hover,
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:active,
+.header-bar .linked:not(.vertical):not(.path-bar) > .button:active,
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:checked,
+.header-bar .linked:not(.vertical):not(.path-bar) > .button:checked,
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:insensitive, .header-bar .linked:not(.vertical):not(.path-bar) > .button:insensitive {
   border-radius: 3px;
   border-style: solid; }
 
-.primary-toolbar .linked > .button:hover, .header-bar .linked > .button:hover {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child),
+.header-bar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child),
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active),
+.header-bar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active),
+.primary-toolbar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child),
+.header-bar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child),
+.primary-toolbar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active), .header-bar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) {
   box-shadow: none; }
 
-.primary-toolbar .linked.stack-switcher > .button,
-.header-bar .linked.stack-switcher > .button,
-.primary-toolbar .linked.path-bar > .button, .header-bar .linked.path-bar > .button {
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button,
+.primary-toolbar .linked:not(.vertical).path-bar > .button, .header-bar .linked:not(.vertical).path-bar > .button {
   color: rgba(207, 218, 231, 0.8);
   outline-color: rgba(207, 218, 231, 0.1);
   border-color: rgba(21, 23, 28, 0.37);
   background-color: rgba(95, 105, 127, 0.37); }
-  .primary-toolbar .linked.stack-switcher > .button:hover,
-  .header-bar .linked.stack-switcher > .button:hover,
-  .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover {
+  .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover,
+  .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover,
+  .primary-toolbar .linked:not(.vertical).path-bar > .button:hover, .header-bar .linked:not(.vertical).path-bar > .button:hover {
     background-color: rgba(134, 144, 165, 0.37); }
-  .primary-toolbar .linked.stack-switcher > .button:active,
-  .header-bar .linked.stack-switcher > .button:active,
-  .primary-toolbar .linked.stack-switcher > .button:checked,
-  .header-bar .linked.stack-switcher > .button:checked,
-  .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked {
+  .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:active,
+  .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:active,
+  .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:checked,
+  .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:checked,
+  .primary-toolbar .linked:not(.vertical).path-bar > .button:active, .header-bar .linked:not(.vertical).path-bar > .button:active, .primary-toolbar .linked:not(.vertical).path-bar > .button:checked, .header-bar .linked:not(.vertical).path-bar > .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: transparent;
     background-color: #5294E2; }
-  .primary-toolbar .linked.stack-switcher > .button:insensitive,
-  .header-bar .linked.stack-switcher > .button:insensitive,
-  .primary-toolbar .linked.path-bar > .button:insensitive, .header-bar .linked.path-bar > .button:insensitive {
+  .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:insensitive,
+  .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:insensitive,
+  .primary-toolbar .linked:not(.vertical).path-bar > .button:insensitive, .header-bar .linked:not(.vertical).path-bar > .button:insensitive {
     color: rgba(207, 218, 231, 0.4); }
-  .primary-toolbar .linked.stack-switcher > .button:hover,
-  .header-bar .linked.stack-switcher > .button:hover,
-  .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover {
-    box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37), inset -1px 0 rgba(21, 23, 28, 0.37); }
-  .primary-toolbar .linked.stack-switcher > .button:active,
-  .header-bar .linked.stack-switcher > .button:active,
-  .primary-toolbar .linked.stack-switcher > .button:checked,
-  .header-bar .linked.stack-switcher > .button:checked,
-  .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked {
-    box-shadow: none; }
-  .primary-toolbar .linked.stack-switcher > .button:first-child:hover,
-  .header-bar .linked.stack-switcher > .button:first-child:hover,
-  .primary-toolbar .linked.path-bar > .button:first-child:hover, .header-bar .linked.path-bar > .button:first-child:hover {
-    box-shadow: inset -1px 0 rgba(21, 23, 28, 0.37); }
-  .primary-toolbar .linked.stack-switcher > .button:first-child:active,
-  .header-bar .linked.stack-switcher > .button:first-child:active,
-  .primary-toolbar .linked.stack-switcher > .button:first-child:checked,
-  .header-bar .linked.stack-switcher > .button:first-child:checked,
-  .primary-toolbar .linked.path-bar > .button:first-child:active, .header-bar .linked.path-bar > .button:first-child:active, .primary-toolbar .linked.path-bar > .button:first-child:checked, .header-bar .linked.path-bar > .button:first-child:checked {
-    box-shadow: none; }
-  .primary-toolbar .linked.stack-switcher > .button:last-child:hover,
-  .header-bar .linked.stack-switcher > .button:last-child:hover,
-  .primary-toolbar .linked.path-bar > .button:last-child:hover, .header-bar .linked.path-bar > .button:last-child:hover {
-    box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); }
-  .primary-toolbar .linked.stack-switcher > .button:last-child:active,
-  .header-bar .linked.stack-switcher > .button:last-child:active,
-  .primary-toolbar .linked.stack-switcher > .button:last-child:checked,
-  .header-bar .linked.stack-switcher > .button:last-child:checked,
-  .primary-toolbar .linked.path-bar > .button:last-child:active, .header-bar .linked.path-bar > .button:last-child:active, .primary-toolbar .linked.path-bar > .button:last-child:checked, .header-bar .linked.path-bar > .button:last-child:checked {
-    box-shadow: none; }
-  .primary-toolbar .linked.stack-switcher > .button:only-child:hover,
-  .header-bar .linked.stack-switcher > .button:only-child:hover,
-  .primary-toolbar .linked.path-bar > .button:only-child:hover, .header-bar .linked.path-bar > .button:only-child:hover {
-    box-shadow: none; }
-  .primary-toolbar .linked.stack-switcher > .button:only-child:active,
-  .header-bar .linked.stack-switcher > .button:only-child:active,
-  .primary-toolbar .linked.stack-switcher > .button:only-child:checked,
-  .header-bar .linked.stack-switcher > .button:only-child:checked,
-  .primary-toolbar .linked.path-bar > .button:only-child:active, .header-bar .linked.path-bar > .button:only-child:active, .primary-toolbar .linked.path-bar > .button:only-child:checked, .header-bar .linked.path-bar > .button:only-child:checked {
-    box-shadow: none; }
+
+.primary-toolbar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):hover,
+.header-bar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):hover,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover:not(:checked):not(:active):not(:only-child):hover, .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover:not(:checked):not(:active):not(:only-child):hover {
+  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37), inset -1px 0 rgba(21, 23, 28, 0.37); }
+
+.primary-toolbar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):first-child:hover,
+.header-bar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):first-child:hover,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
+  box-shadow: inset -1px 0 rgba(21, 23, 28, 0.37); }
+
+.primary-toolbar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):last-child:hover,
+.header-bar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):last-child:hover,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
+  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); }
+
+.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry {
+  border-left-color: rgba(21, 23, 28, 0); }
+
+.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:not(:last-child),
+.header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:not(:last-child),
+.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:last-child, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:last-child {
+  border-left-color: rgba(21, 23, 28, 0.37); }
+
+.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .entry,
+.header-bar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .entry,
+.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .button,
+.header-bar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .button,
+.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox,
+.header-bar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox,
+.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox, .header-bar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox {
+  border-left-color: rgba(21, 23, 28, 0.37); }
 
 .primary-toolbar .button.suggested-action, .header-bar .button.suggested-action {
   background-clip: border-box;
@@ -1275,21 +1307,15 @@ GtkComboBox {
     color: rgba(207, 218, 231, 0.35);
     background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.22)); }
 
-.primary-toolbar GtkComboBox.combobox-entry .entry:dir(ltr):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(ltr):focus {
-  box-shadow: none; }
-
-.primary-toolbar GtkComboBox.combobox-entry .entry:dir(rtl):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(rtl):focus {
-  box-shadow: none; }
-
-.primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr), .header-bar GtkComboBox.combobox-entry .button:dir(ltr) {
-  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); }
-  .primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(ltr):insensitive {
-    box-shadow: inset 1px 0 rgba(21, 23, 28, 0); }
+.primary-toolbar GtkComboBox.combobox-entry .entry:dir(ltr), .header-bar GtkComboBox.combobox-entry .entry:dir(ltr) {
+  border-right-style: none; }
+  .primary-toolbar GtkComboBox.combobox-entry .entry:dir(ltr):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(ltr):focus {
+    box-shadow: none; }
 
-.primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl), .header-bar GtkComboBox.combobox-entry .button:dir(rtl) {
-  box-shadow: inset -1px 0 rgba(21, 23, 28, 0.37); }
-  .primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(rtl):insensitive {
-    box-shadow: inset -1px 0 rgba(21, 23, 28, 0); }
+.primary-toolbar GtkComboBox.combobox-entry .entry:dir(rtl), .header-bar GtkComboBox.combobox-entry .entry:dir(rtl) {
+  border-left-style: none; }
+  .primary-toolbar GtkComboBox.combobox-entry .entry:dir(rtl):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(rtl):focus {
+    box-shadow: none; }
 
 .primary-toolbar GtkSwitch:backdrop, .header-bar GtkSwitch:backdrop {
   opacity: 0.75; }
@@ -2604,8 +2630,7 @@ GtkVolumeButton.button {
 .view:selected:focus,
 .view:selected:hover, .label:selected,
 .label:selected:focus,
-.label:selected:hover, .grid-child:selected, .entry:selected,
-.entry:selected:focus, .menuitem.button.flat:active, .menuitem.sidebar-button.button:active, .menuitem.button.flat:selected, .menuitem.sidebar-button.button:selected, .list-row:selected, .sidebar:selected, .sidebar .view:selected, GtkPlacesSidebar.sidebar .list-row.activatable:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected,
+.label:selected:hover, .grid-child:selected, .menuitem.button.flat:active, .menuitem.sidebar-button.button:active, .menuitem.button.flat:selected, .menuitem.sidebar-button.button:selected, .list-row:selected, .sidebar:selected, .sidebar .view:selected, GtkPlacesSidebar.sidebar .list-row.activatable:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected,
 GtkEntry.gb-command-bar-entry.entry.flat:selected:focus,
 GtkFileChooserDialog GtkPlacesSidebar.sidebar .list-row.activatable:selected,
 GtkFileChooserDialog GtkPlacesSidebar.sidebar .list-row.activatable:selected:hover,
@@ -2826,36 +2851,29 @@ NemoWindow .sidebar .frame {
 NemoWindow GtkSeparator.separator.horizontal, NemoWindow .sidebar GtkSeparator.horizontal.view.separator, .sidebar NemoWindow GtkSeparator.horizontal.view.separator {
   color: #dbdfe3; }
 
-NemoWindow .primary-toolbar NemoPathBar.linked > .button {
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button {
   color: rgba(207, 218, 231, 0.8);
   outline-color: rgba(207, 218, 231, 0.1);
   border-color: rgba(21, 23, 28, 0.37);
   background-color: rgba(95, 105, 127, 0.37); }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover {
+  NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover {
     background-color: rgba(134, 144, 165, 0.37); }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked {
+  NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: transparent;
     background-color: #5294E2; }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:insensitive {
+  NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:insensitive {
     color: rgba(207, 218, 231, 0.4); }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover {
-    box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37), inset -1px 0 rgba(21, 23, 28, 0.37); }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked {
-    box-shadow: none; }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:hover {
-    box-shadow: inset -1px 0 rgba(21, 23, 28, 0.37); }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:checked {
-    box-shadow: none; }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:hover {
-    box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:checked {
-    box-shadow: none; }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:hover {
-    box-shadow: none; }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:checked {
-    box-shadow: none; }
+
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child):hover {
+  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37), inset -1px 0 rgba(21, 23, 28, 0.37); }
+
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
+  box-shadow: inset -1px 0 rgba(21, 23, 28, 0.37); }
+
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
+  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); }
 
 .gedit-headerbar-paned {
   color: rgba(38, 42, 51, 0.97); }
@@ -3361,7 +3379,7 @@ UnityPanelWidget,
   box-shadow: none; }
   UnityPanelWidget:backdrop,
   .unity-panel:backdrop {
-    color: #abb6c5; }
+    color: #bdc6d1; }
 
 .unity-panel.menubar.menuitem:hover,
 .unity-panel.menubar .menuitem *:hover {
@@ -3574,7 +3592,7 @@ GtkListBox .h4 {
   #content_frame .button:active, #content_frame .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: transparent;
+    border-color: #5294E2;
     background-color: #5294E2; }
   #content_frame .button:insensitive {
     color: rgba(92, 97, 108, 0.55);
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 ced1b32..8166d16 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
@@ -162,14 +162,19 @@ GtkTextView {
   .entry:focus {
     background-clip: border-box;
     color: #D3DAE3;
-    border-color: #5294E2;
+    border-color: #2b2e39;
     background-color: #404552;
-    background-image: linear-gradient(to bottom, #404552); }
+    background-image: linear-gradient(to bottom, #404552);
+    box-shadow: inset 1px 1px #5294E2, inset -1px -1px #5294E2; }
   .entry:insensitive {
     color: rgba(211, 218, 227, 0.45);
     border-color: rgba(43, 46, 57, 0.55);
     background-color: rgba(64, 69, 82, 0.55);
     background-image: linear-gradient(to bottom, rgba(64, 69, 82, 0.55)); }
+  .entry:selected,
+  .entry:selected:focus {
+    background-color: #5294E2;
+    color: #ffffff; }
   .entry.progressbar {
     margin: 2px 12px;
     border-radius: 0;
@@ -179,17 +184,6 @@ GtkTextView {
     background-image: none;
     background-color: transparent;
     box-shadow: none; }
-  .linked > .entry:first-child {
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0; }
-    .linked > .entry:first-child:dir(rtl) {
-      border-right-style: none; }
-  .linked > .entry:last-child {
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0;
-    border-left-style: none; }
-    .linked > .entry:last-child:dir(rtl) {
-      border-left-style: solid; }
   .entry.error {
     color: white;
     border-color: #FC4138;
@@ -216,28 +210,6 @@ GtkTextView {
       color: #D3DAE3; }
     .entry.image:active {
       color: #5294E2; }
-  .linked.vertical > .entry {
-    border-bottom-color: #3a3e4a;
-    box-shadow: none; }
-    .linked.vertical > .entry:focus {
-      border-color: #5294E2;
-      box-shadow: 0 -1px 0 0 #5294E2; }
-    .linked.vertical > .entry:insensitive {
-      border-bottom-color: #3a3e4a; }
-    .linked.vertical > .entry:first-child {
-      border-bottom-color: #3a3e4a; }
-      .linked.vertical > .entry:first-child:focus {
-        border-bottom-color: #5294E2;
-        box-shadow: none; }
-      .linked.vertical > .entry:first-child:insensitive {
-        border-bottom-color: #3a3e4a; }
-    .linked.vertical > .entry:last-child {
-      border-bottom-color: rgba(0, 0, 0, 0.14); }
-      .linked.vertical > .entry:last-child:focus {
-        border-bottom-color: #5294E2;
-        box-shadow: 0 -1px 0 0 #5294E2; }
-      .linked.vertical > .entry:last-child:insensitive {
-        border-bottom-color: rgba(0, 0, 0, 0.14); }
   .osd .entry {
     color: #BAC3CF;
     border-color: rgba(26, 28, 34, 0.4);
@@ -298,7 +270,7 @@ GtkSearchEntry.entry {
     background-clip: padding-box;
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: transparent;
+    border-color: #2b2e39;
     background-color: #5294E2;
     transition-duration: 50ms; }
   .button:active {
@@ -528,7 +500,7 @@ GtkSearchEntry.entry {
   .inline-toolbar GtkToolButton > .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: transparent;
+    border-color: #2b2e39;
     background-color: #5294E2; }
   .inline-toolbar GtkToolButton > .button:insensitive {
     color: rgba(211, 218, 227, 0.45);
@@ -546,166 +518,219 @@ GtkSearchEntry.entry {
     .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel {
       color: inherit; }
 
-.inline-toolbar.toolbar GtkToolButton > .button.flat, .inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.toolbar GtkToolButton > .sidebar-button.button, .inline-toolbar GtkToolButton > .sidebar-button.button, .osd .button:hover, .osd .button:active, .osd .button:checked, .osd .button:insensitive, .inline-toolbar .button, .inline-toolbar .button:backdrop, .linked > .button,
-.linked > .button:hover,
-.linked > .button:active,
-.linked > .button:checked, GtkComboBox.combobox-entry .entry, GtkComboBox.combobox-entry .the-button-in-the-combobox, .primary-toolbar .linked.stack-switcher > .button,
-.header-bar .linked.stack-switcher > .button,
-.primary-toolbar .linked.path-bar > .button, .header-bar .linked.path-bar > .button, NemoWindow .primary-toolbar NemoPathBar.linked > .button, .linked > GtkComboBox > .the-button-in-the-combobox:dir(ltr) {
+.linked:not(.vertical):not(.pathbar) > .entry + .entry {
+  border-left-color: rgba(43, 46, 57, 0.3); }
+
+.linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:not(:last-child),
+.linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:last-child {
+  border-left-color: #2b2e39; }
+
+.linked:not(.vertical):not(.pathbar) > .entry + .button,
+.linked:not(.vertical):not(.pathbar) > .entry + .button:hover,
+.linked:not(.vertical):not(.pathbar) > .entry + .button:active,
+.linked:not(.vertical):not(.pathbar) > .entry + .button:checked,
+.linked:not(.vertical):not(.pathbar) > .entry + .button:insensitive {
+  border-left-style: solid; }
+
+.linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .entry,
+.linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .button,
+.linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox,
+.linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox {
+  border-left-color: #2b2e39; }
+
+.linked:not(.vertical):not(.pathbar) > .button:hover:not(:checked):not(:active):not(:only-child),
+.linked:not(.vertical):not(.pathbar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) {
+  box-shadow: -1px 0 #2b2e39; }
+
+.linked:not(.vertical):not(.pathbar) > .button:first-child:hover:not(:checked):not(:active) {
+  box-shadow: none; }
+
+.linked:not(.vertical):not(.pathbar) > .button:checked + .button:not(:checked):not(:active):hover {
+  box-shadow: none; }
+
+.linked:not(.vertical):not(.pathbar) > .button:checked + .entry {
+  border-left-color: #2b2e39; }
+
+.linked:not(.vertical):not(.pathbar) > .entry + .button:not(:checked):not(:active):hover {
+  box-shadow: none; }
+
+.linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):hover {
+  box-shadow: inset 1px 0 rgba(43, 46, 57, 0.5), inset -1px 0 rgba(43, 46, 57, 0.5); }
+
+.linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
+  box-shadow: inset -1px 0 rgba(43, 46, 57, 0.5); }
+
+.linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
+  box-shadow: inset 1px 0 rgba(43, 46, 57, 0.5); }
+
+.linked.vertical > .entry + .entry {
+  border-top-color: rgba(43, 46, 57, 0.3); }
+
+.linked.vertical > .entry + .entry:focus:not(:last-child),
+.linked.vertical > .entry + .entry:focus:last-child {
+  border-top-color: #2b2e39; }
+
+.linked.vertical > .entry + .button,
+.linked.vertical > .entry + .button:hover,
+.linked.vertical > .entry + .button:active,
+.linked.vertical > .entry + .button:checked,
+.linked.vertical > .entry + .button:insensitive {
+  border-top-style: solid; }
+
+.linked.vertical > .entry:focus:not(:only-child) + .entry,
+.linked.vertical > .entry:focus:not(:only-child) + .button,
+.linked.vertical > .entry:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox,
+.linked.vertical > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox {
+  border-top-color: #2b2e39; }
+
+.linked.vertical > .button:hover:not(:checked):not(:active):not(:only-child),
+.linked.vertical > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) {
+  box-shadow: 0 -1px #2b2e39; }
+
+.linked.vertical > .button:first-child:hover:not(:checked):not(:active) {
+  box-shadow: none; }
+
+.linked.vertical > .button:checked + .button:not(:checked):not(:active):hover {
+  box-shadow: none; }
+
+.linked.vertical > .button:checked + .entry {
+  border-top-color: #2b2e39; }
+
+.linked.vertical > .entry + .button:not(:checked):not(:active):hover {
+  box-shadow: none; }
+
+.inline-toolbar.toolbar GtkToolButton > .button.flat, .inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.toolbar GtkToolButton > .sidebar-button.button, .inline-toolbar GtkToolButton > .sidebar-button.button, .osd .button:hover, .osd .button:active, .osd .button:checked, .osd .button:insensitive, .inline-toolbar .button, .inline-toolbar .button:backdrop, .linked:not(.vertical) > .button,
+.linked:not(.vertical) > .button:hover,
+.linked:not(.vertical) > .button:active,
+.linked:not(.vertical) > .button:checked, .linked:not(.vertical):not(.pathbar) > .entry, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button,
+.primary-toolbar .linked:not(.vertical).path-bar > .button,
+.header-bar .linked:not(.vertical).path-bar > .button,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:hover,
+.header-bar .linked:not(.vertical).path-bar > .button:hover,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:active,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:active,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:active,
+.header-bar .linked:not(.vertical).path-bar > .button:active,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:checked,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:checked,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:checked,
+.header-bar .linked:not(.vertical).path-bar > .button:checked,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:insensitive,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:insensitive,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:insensitive, .header-bar .linked:not(.vertical).path-bar > .button:insensitive, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:active,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:checked,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:insensitive, .linked > GtkComboBox > .the-button-in-the-combobox:dir(ltr),
+.linked > GtkComboBox > .the-button-in-the-combobox:dir(rtl),
+.linked > GtkComboBoxText > .the-button-in-the-combobox:dir(ltr),
+.linked > GtkComboBoxText > .the-button-in-the-combobox:dir(rtl) {
   border-radius: 0;
-  border-left-style: none;
   border-right-style: none; }
-  .inline-toolbar GtkToolButton > .button.flat:hover, .inline-toolbar GtkToolButton > .sidebar-button.button:hover, .osd .button:hover, .inline-toolbar .button:hover, .linked > .button:hover,
-  GtkComboBox.combobox-entry .entry:hover, GtkComboBox.combobox-entry .the-button-in-the-combobox:hover, .primary-toolbar .linked.stack-switcher > .button:hover,
-  .header-bar .linked.stack-switcher > .button:hover,
-  .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover, .linked > GtkComboBox > .the-button-in-the-combobox:hover:dir(ltr) {
-    box-shadow: inset 1px 0 rgba(43, 46, 57, 0.5), inset -1px 0 rgba(43, 46, 57, 0.5); }
-  .inline-toolbar GtkToolButton > .button.flat:active, .inline-toolbar GtkToolButton > .sidebar-button.button:active, .osd .button:active, .inline-toolbar .button:active, .linked > .button:active,
-  GtkComboBox.combobox-entry .entry:active, GtkComboBox.combobox-entry .the-button-in-the-combobox:active, .primary-toolbar .linked.stack-switcher > .button:active,
-  .header-bar .linked.stack-switcher > .button:active,
-  .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, .linked > GtkComboBox > .the-button-in-the-combobox:active:dir(ltr), .inline-toolbar GtkToolButton > .button.flat:checked, .inline-toolbar GtkToolButton > .sidebar-button.button:checked, .osd .button:checked, .inline-toolbar .button:checked, .linked > .button:checked,
-  GtkComboBox.combobox-entry .entry:checked, GtkComboBox.combobox-entry .the-button-in-the-combobox:checked, .primary-toolbar .linked.stack-switcher > .button:checked,
-  .header-bar .linked.stack-switcher > .button:checked,
-  .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked, .linked > GtkComboBox > .the-button-in-the-combobox:checked:dir(ltr) {
-    box-shadow: none; }
-  .inline-toolbar GtkToolButton > .button.flat:dir(rtl), .inline-toolbar GtkToolButton > .sidebar-button.button:dir(rtl), .inline-toolbar.toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar.toolbar GtkToolButton:dir(rtl) > .sidebar-button.button, .inline-toolbar GtkToolButton:dir(rtl) > .sidebar-button.button, .osd .button:dir(rtl):hover, .osd .button:dir(rtl):active, .osd .button:dir(rtl):checked, .osd .button:dir(rtl):insensitive, .inline-toolbar .button:dir(rtl), .linked > .button:dir(rtl),
-  GtkComboBox.combobox-entry .entry:dir(rtl), GtkComboBox.combobox-entry .the-button-in-the-combobox:dir(rtl), .primary-toolbar .linked.stack-switcher > .button:dir(rtl),
-  .header-bar .linked.stack-switcher > .button:dir(rtl),
-  .primary-toolbar .linked.path-bar > .button:dir(rtl), .header-bar .linked.path-bar > .button:dir(rtl), NemoWindow .primary-toolbar NemoPathBar.linked > .button:dir(rtl), .linked > GtkComboBox > .the-button-in-the-combobox:dir(rtl) {
-    border-radius: 0; }
 
-.osd .button:first-child:hover, .osd .button:first-child:active, .osd .button:first-child:checked, .osd .button:first-child:insensitive, .inline-toolbar .button:first-child, .linked > .button:first-child,
-.inline-toolbar.toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar.toolbar GtkToolButton:first-child > .sidebar-button.button, .inline-toolbar GtkToolButton:first-child > .sidebar-button.button, GtkComboBox.combobox-entry .entry:first-child, GtkComboBox.combobox-entry .the-button-in-the-combobox:first-child, .linked > GtkComboBox:first-child > .the-button-in-the-combobox, .primary-toolbar .linked.stack-switcher > .button:first-child,
-.header-bar .linked.stack-switcher > .button:first-child,
-.primary-toolbar .linked.path-bar > .button:first-child, .header-bar .linked.path-bar > .button:first-child, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child {
-  border-radius: 3px 0 0 3px;
-  border-left-style: solid; }
-  .osd .button:first-child:hover, .inline-toolbar .button:first-child:hover, .linked > .button:first-child:hover,
-  .inline-toolbar GtkToolButton:first-child > .button.flat:hover, .inline-toolbar GtkToolButton:first-child > .sidebar-button.button:hover, GtkComboBox.combobox-entry .entry:first-child:hover, GtkComboBox.combobox-entry .the-button-in-the-combobox:first-child:hover, .linked > GtkComboBox:first-child > .the-button-in-the-combobox:hover, .primary-toolbar .linked.stack-switcher > .button:first-child:hover,
-  .header-bar .linked.stack-switcher > .button:first-child:hover,
-  .primary-toolbar .linked.path-bar > .button:first-child:hover, .header-bar .linked.path-bar > .button:first-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:hover {
-    box-shadow: inset -1px 0 rgba(43, 46, 57, 0.5); }
-  .osd .button:first-child:active, .inline-toolbar .button:first-child:active, .linked > .button:first-child:active,
-  .inline-toolbar GtkToolButton:first-child > .button.flat:active, .inline-toolbar GtkToolButton:first-child > .sidebar-button.button:active, GtkComboBox.combobox-entry .entry:first-child:active, GtkComboBox.combobox-entry .the-button-in-the-combobox:first-child:active, .linked > GtkComboBox:first-child > .the-button-in-the-combobox:active, .primary-toolbar .linked.stack-switcher > .button:first-child:active,
-  .header-bar .linked.stack-switcher > .button:first-child:active,
-  .primary-toolbar .linked.path-bar > .button:first-child:active, .header-bar .linked.path-bar > .button:first-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:active, .osd .button:first-child:checked, .inline-toolbar .button:first-child:checked, .linked > .button:first-child:checked,
-  .inline-toolbar GtkToolButton:first-child > .button.flat:checked, .inline-toolbar GtkToolButton:first-child > .sidebar-button.button:checked, GtkComboBox.combobox-entry .entry:first-child:checked, GtkComboBox.combobox-entry .the-button-in-the-combobox:first-child:checked, .linked > GtkComboBox:first-child > .the-button-in-the-combobox:checked, .primary-toolbar .linked.stack-switcher > .button:first-child:checked,
-  .header-bar .linked.stack-switcher > .button:first-child:checked,
-  .primary-toolbar .linked.path-bar > .button:first-child:checked, .header-bar .linked.path-bar > .button:first-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:checked {
-    box-shadow: none; }
+.osd .button:first-child:hover, .osd .button:first-child:active, .osd .button:first-child:checked, .osd .button:first-child:insensitive, .inline-toolbar .button:first-child, .linked:not(.vertical) > .button:first-child,
+.inline-toolbar.toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar.toolbar GtkToolButton:first-child > .sidebar-button.button, .inline-toolbar GtkToolButton:first-child > .sidebar-button.button, .linked:not(.vertical):not(.pathbar) > .entry:first-child, .linked > GtkComboBox:first-child > .the-button-in-the-combobox,
+.linked > GtkComboBoxText:first-child > .the-button-in-the-combobox, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:first-child,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:first-child,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:first-child,
+.header-bar .linked:not(.vertical).path-bar > .button:first-child,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:first-child {
+  border-top-left-radius: 3px;
+  border-bottom-left-radius: 3px; }
 
-.osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .inline-toolbar .button:last-child, .linked > .button:last-child,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar.toolbar GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar GtkToolButton:last-child > .sidebar-button.button, GtkComboBox.combobox-entry .entry:last-child, GtkComboBox.combobox-entry .the-button-in-the-combobox:last-child, .linked > GtkComboBox:last-child > .the-button-in-the-combobox, .primary-toolbar .linked.stack-switcher > .button:last-child,
-.header-bar .linked.stack-switcher > .button:last-child,
-.primary-toolbar .linked.path-bar > .button:last-child, .header-bar .linked.path-bar > .button:last-child, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child {
-  border-radius: 0 3px 3px 0;
+.osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .inline-toolbar .button:last-child, .linked:not(.vertical) > .button:last-child,
+.inline-toolbar.toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar.toolbar GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar GtkToolButton:last-child > .sidebar-button.button, .linked:not(.vertical):not(.pathbar) > .entry:last-child, .linked > GtkComboBox:last-child > .the-button-in-the-combobox,
+.linked > GtkComboBoxText:last-child > .the-button-in-the-combobox, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:last-child,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:last-child,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:last-child,
+.header-bar .linked:not(.vertical).path-bar > .button:last-child,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:last-child {
+  border-top-right-radius: 3px;
+  border-bottom-right-radius: 3px;
   border-right-style: solid; }
-  .osd .button:last-child:hover, .inline-toolbar .button:last-child:hover, .linked > .button:last-child:hover,
-  .inline-toolbar GtkToolButton:last-child > .button.flat:hover, .inline-toolbar GtkToolButton:last-child > .sidebar-button.button:hover, GtkComboBox.combobox-entry .entry:last-child:hover, GtkComboBox.combobox-entry .the-button-in-the-combobox:last-child:hover, .linked > GtkComboBox:last-child > .the-button-in-the-combobox:hover, .primary-toolbar .linked.stack-switcher > .button:last-child:hover,
-  .header-bar .linked.stack-switcher > .button:last-child:hover,
-  .primary-toolbar .linked.path-bar > .button:last-child:hover, .header-bar .linked.path-bar > .button:last-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:hover {
-    box-shadow: inset 1px 0 rgba(43, 46, 57, 0.5); }
-  .osd .button:last-child:active, .inline-toolbar .button:last-child:active, .linked > .button:last-child:active,
-  .inline-toolbar GtkToolButton:last-child > .button.flat:active, .inline-toolbar GtkToolButton:last-child > .sidebar-button.button:active, GtkComboBox.combobox-entry .entry:last-child:active, GtkComboBox.combobox-entry .the-button-in-the-combobox:last-child:active, .linked > GtkComboBox:last-child > .the-button-in-the-combobox:active, .primary-toolbar .linked.stack-switcher > .button:last-child:active,
-  .header-bar .linked.stack-switcher > .button:last-child:active,
-  .primary-toolbar .linked.path-bar > .button:last-child:active, .header-bar .linked.path-bar > .button:last-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:active, .osd .button:last-child:checked, .inline-toolbar .button:last-child:checked, .linked > .button:last-child:checked,
-  .inline-toolbar GtkToolButton:last-child > .button.flat:checked, .inline-toolbar GtkToolButton:last-child > .sidebar-button.button:checked, GtkComboBox.combobox-entry .entry:last-child:checked, GtkComboBox.combobox-entry .the-button-in-the-combobox:last-child:checked, .linked > GtkComboBox:last-child > .the-button-in-the-combobox:checked, .primary-toolbar .linked.stack-switcher > .button:last-child:checked,
-  .header-bar .linked.stack-switcher > .button:last-child:checked,
-  .primary-toolbar .linked.path-bar > .button:last-child:checked, .header-bar .linked.path-bar > .button:last-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:checked {
-    box-shadow: none; }
-  .osd .button:last-child:dir(rtl):hover, .osd .button:last-child:dir(rtl):active, .osd .button:last-child:dir(rtl):checked, .osd .button:last-child:dir(rtl):insensitive, .inline-toolbar .button:last-child:dir(rtl), .linked > .button:last-child:dir(rtl),
-  .inline-toolbar GtkToolButton:last-child > .button.flat:dir(rtl), .inline-toolbar GtkToolButton:last-child > .sidebar-button.button:dir(rtl), .inline-toolbar.toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar.toolbar GtkToolButton:last-child:dir(rtl) > .sidebar-button.button, .inline-toolbar GtkToolButton:last-child:dir(rtl) > .sidebar-button.button, GtkComboBox.combobox-entry .entry:last-child:dir(rtl), GtkComboBox.combobox-entry .the-button-in-the-combobox:last-child:dir(rtl), .linked > GtkComboBox:last-child > .the-button-in-the-combobox:dir(rtl), .primary-toolbar .linked.stack-switcher > .button:last-child:dir(rtl),
-  .header-bar .linked.stack-switcher > .button:last-child:dir(rtl),
-  .primary-toolbar .linked.path-bar > .button:last-child:dir(rtl), .header-bar .linked.path-bar > .button:last-child:dir(rtl), NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:dir(rtl) {
-    border-bottom-left-radius: 0; }
 
-.osd .button:only-child:hover, .osd .button:only-child:active, .osd .button:only-child:checked, .osd .button:only-child:insensitive, .inline-toolbar .button:only-child, .linked > .button:only-child,
-.inline-toolbar.toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar.toolbar GtkToolButton:only-child > .sidebar-button.button, .inline-toolbar GtkToolButton:only-child > .sidebar-button.button, GtkComboBox.combobox-entry .entry:only-child, GtkComboBox.combobox-entry .the-button-in-the-combobox:only-child, .linked > GtkComboBox:only-child > .the-button-in-the-combobox, .primary-toolbar .linked.stack-switcher > .button:only-child,
-.header-bar .linked.stack-switcher > .button:only-child,
-.primary-toolbar .linked.path-bar > .button:only-child, .header-bar .linked.path-bar > .button:only-child, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child {
+.osd .button:only-child:hover, .osd .button:only-child:active, .osd .button:only-child:checked, .osd .button:only-child:insensitive, .inline-toolbar .button:only-child, .linked:not(.vertical) > .button:only-child,
+.inline-toolbar.toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar.toolbar GtkToolButton:only-child > .sidebar-button.button, .inline-toolbar GtkToolButton:only-child > .sidebar-button.button, .linked:not(.vertical):not(.pathbar) > .entry:only-child, .linked > GtkComboBox:only-child > .the-button-in-the-combobox,
+.linked > GtkComboBoxText:only-child > .the-button-in-the-combobox, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:only-child,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:only-child,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:only-child,
+.header-bar .linked:not(.vertical).path-bar > .button:only-child,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:only-child {
   border-radius: 3px;
   border-style: solid; }
-  .osd .button:only-child:hover, .inline-toolbar .button:only-child:hover, .linked > .button:only-child:hover,
-  .inline-toolbar GtkToolButton:only-child > .button.flat:hover, .inline-toolbar GtkToolButton:only-child > .sidebar-button.button:hover, GtkComboBox.combobox-entry .entry:only-child:hover, GtkComboBox.combobox-entry .the-button-in-the-combobox:only-child:hover, .linked > GtkComboBox:only-child > .the-button-in-the-combobox:hover, .primary-toolbar .linked.stack-switcher > .button:only-child:hover,
-  .header-bar .linked.stack-switcher > .button:only-child:hover,
-  .primary-toolbar .linked.path-bar > .button:only-child:hover, .header-bar .linked.path-bar > .button:only-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:hover {
-    box-shadow: none; }
-  .osd .button:only-child:active, .inline-toolbar .button:only-child:active, .linked > .button:only-child:active,
-  .inline-toolbar GtkToolButton:only-child > .button.flat:active, .inline-toolbar GtkToolButton:only-child > .sidebar-button.button:active, GtkComboBox.combobox-entry .entry:only-child:active, GtkComboBox.combobox-entry .the-button-in-the-combobox:only-child:active, .linked > GtkComboBox:only-child > .the-button-in-the-combobox:active, .primary-toolbar .linked.stack-switcher > .button:only-child:active,
-  .header-bar .linked.stack-switcher > .button:only-child:active,
-  .primary-toolbar .linked.path-bar > .button:only-child:active, .header-bar .linked.path-bar > .button:only-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:active, .osd .button:only-child:checked, .inline-toolbar .button:only-child:checked, .linked > .button:only-child:checked,
-  .inline-toolbar GtkToolButton:only-child > .button.flat:checked, .inline-toolbar GtkToolButton:only-child > .sidebar-button.button:checked, GtkComboBox.combobox-entry .entry:only-child:checked, GtkComboBox.combobox-entry .the-button-in-the-combobox:only-child:checked, .linked > GtkComboBox:only-child > .the-button-in-the-combobox:checked, .primary-toolbar .linked.stack-switcher > .button:only-child:checked,
-  .header-bar .linked.stack-switcher > .button:only-child:checked,
-  .primary-toolbar .linked.path-bar > .button:only-child:checked, .header-bar .linked.path-bar > .button:only-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:checked {
-    box-shadow: none; }
 
-.linked.vertical > .entry, .linked.vertical > .entry:focus, .linked.vertical > .entry:insensitive, .linked.vertical > .button,
+.linked.vertical > .button,
 .linked.vertical > .button:hover,
 .linked.vertical > .button:active,
-.linked.vertical > .button:checked, .linked.vertical > GtkComboBoxText > .the-button-in-the-combobox,
+.linked.vertical > .button:checked, .linked.vertical > .entry, .linked.vertical > GtkComboBoxText > .the-button-in-the-combobox,
 .linked.vertical > GtkComboBox > .the-button-in-the-combobox {
-  border-style: solid;
-  border-bottom-style: none;
-  border-top-style: none;
-  border-radius: 0; }
-  .linked.vertical > .entry:hover, .linked.vertical > .button:hover,
-  .linked.vertical > GtkComboBoxText > .the-button-in-the-combobox:hover,
-  .linked.vertical > GtkComboBox > .the-button-in-the-combobox:hover {
-    box-shadow: inset 0 -1px rgba(43, 46, 57, 0.5), inset 0 1px rgba(43, 46, 57, 0.5); }
-  .linked.vertical > .entry:active, .linked.vertical > .button:active,
-  .linked.vertical > GtkComboBoxText > .the-button-in-the-combobox:active,
-  .linked.vertical > GtkComboBox > .the-button-in-the-combobox:active, .linked.vertical > .entry:checked, .linked.vertical > .button:checked,
-  .linked.vertical > GtkComboBoxText > .the-button-in-the-combobox:checked,
-  .linked.vertical > GtkComboBox > .the-button-in-the-combobox:checked {
-    box-shadow: none; }
+  border-radius: 0;
+  border-bottom-style: none; }
 
-.linked.vertical > .entry:first-child, .linked.vertical > .button:first-child,
-.linked.vertical > GtkComboBoxText:first-child > .the-button-in-the-combobox,
+.linked.vertical > .button:first-child,
+.linked.vertical > .entry:first-child, .linked.vertical > GtkComboBoxText:first-child > .the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:first-child > .the-button-in-the-combobox {
-  border-radius: 3px 3px 0 0;
-  border-top-style: solid; }
-  .linked.vertical > .entry:first-child:hover, .linked.vertical > .button:first-child:hover,
-  .linked.vertical > GtkComboBoxText:first-child > .the-button-in-the-combobox:hover,
-  .linked.vertical > GtkComboBox:first-child > .the-button-in-the-combobox:hover {
-    box-shadow: inset 0 -1px rgba(43, 46, 57, 0.5); }
-  .linked.vertical > .entry:first-child:active, .linked.vertical > .button:first-child:active,
-  .linked.vertical > GtkComboBoxText:first-child > .the-button-in-the-combobox:active,
-  .linked.vertical > GtkComboBox:first-child > .the-button-in-the-combobox:active, .linked.vertical > .entry:first-child:checked, .linked.vertical > .button:first-child:checked,
-  .linked.vertical > GtkComboBoxText:first-child > .the-button-in-the-combobox:checked,
-  .linked.vertical > GtkComboBox:first-child > .the-button-in-the-combobox:checked {
-    box-shadow: none; }
+  border-top-left-radius: 3px;
+  border-top-right-radius: 3px; }
 
-.linked.vertical > .entry:last-child, .linked.vertical > .button:last-child,
-.linked.vertical > GtkComboBoxText:last-child > .the-button-in-the-combobox,
+.linked.vertical > .button:last-child,
+.linked.vertical > .entry:last-child, .linked.vertical > GtkComboBoxText:last-child > .the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:last-child > .the-button-in-the-combobox {
-  border-radius: 0 0 3px 3px;
+  border-bottom-left-radius: 3px;
+  border-bottom-right-radius: 3px;
   border-bottom-style: solid; }
-  .linked.vertical > .entry:last-child:hover, .linked.vertical > .button:last-child:hover,
-  .linked.vertical > GtkComboBoxText:last-child > .the-button-in-the-combobox:hover,
-  .linked.vertical > GtkComboBox:last-child > .the-button-in-the-combobox:hover {
-    box-shadow: inset 0 1px rgba(43, 46, 57, 0.5); }
-  .linked.vertical > .entry:last-child:active, .linked.vertical > .button:last-child:active,
-  .linked.vertical > GtkComboBoxText:last-child > .the-button-in-the-combobox:active,
-  .linked.vertical > GtkComboBox:last-child > .the-button-in-the-combobox:active, .linked.vertical > .entry:last-child:checked, .linked.vertical > .button:last-child:checked,
-  .linked.vertical > GtkComboBoxText:last-child > .the-button-in-the-combobox:checked,
-  .linked.vertical > GtkComboBox:last-child > .the-button-in-the-combobox:checked {
-    box-shadow: none; }
 
-.linked.vertical > .entry:only-child, .linked.vertical > .button:only-child,
-.linked.vertical > GtkComboBoxText:only-child > .the-button-in-the-combobox,
+.linked.vertical > .button:only-child,
+.linked.vertical > .entry:only-child, .linked.vertical > GtkComboBoxText:only-child > .the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:only-child > .the-button-in-the-combobox {
   border-radius: 3px;
   border-style: solid; }
-  .linked.vertical > .entry:only-child:hover, .linked.vertical > .button:only-child:hover,
-  .linked.vertical > GtkComboBoxText:only-child > .the-button-in-the-combobox:hover,
-  .linked.vertical > GtkComboBox:only-child > .the-button-in-the-combobox:hover {
-    box-shadow: none; }
-  .linked.vertical > .entry:only-child:active, .linked.vertical > .button:only-child:active,
-  .linked.vertical > GtkComboBoxText:only-child > .the-button-in-the-combobox:active,
-  .linked.vertical > GtkComboBox:only-child > .the-button-in-the-combobox:active, .linked.vertical > .entry:only-child:checked, .linked.vertical > .button:only-child:checked,
-  .linked.vertical > GtkComboBoxText:only-child > .the-button-in-the-combobox:checked,
-  .linked.vertical > GtkComboBox:only-child > .the-button-in-the-combobox:checked {
-    box-shadow: none; }
+
+.linked:not(.vertical) > .button,
+.linked:not(.vertical) > .button:hover,
+.linked:not(.vertical) > .button:active,
+.linked:not(.vertical) > .button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button,
+.primary-toolbar .linked:not(.vertical).path-bar > .button,
+.header-bar .linked:not(.vertical).path-bar > .button,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:hover,
+.header-bar .linked:not(.vertical).path-bar > .button:hover,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:active,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:active,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:active,
+.header-bar .linked:not(.vertical).path-bar > .button:active,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:checked,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:checked,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:checked,
+.header-bar .linked:not(.vertical).path-bar > .button:checked,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:insensitive,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:insensitive,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:insensitive, .header-bar .linked:not(.vertical).path-bar > .button:insensitive, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:active,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:checked,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:insensitive {
+  border-left-style: none; }
+  .linked:not(.vertical) > .button:first-child,
+  .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:first-child,
+  .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:first-child,
+  .primary-toolbar .linked:not(.vertical).path-bar > .button:first-child,
+  .header-bar .linked:not(.vertical).path-bar > .button:first-child,
+  NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:first-child {
+    border-left-style: solid; }
+
+.linked.vertical > .button,
+.linked.vertical > .button:hover,
+.linked.vertical > .button:active,
+.linked.vertical > .button:checked {
+  border-top-style: none; }
+  .linked.vertical > .button:first-child {
+    border-top-style: solid; }
 
 .menuitem.button.flat, .menuitem.sidebar-button.button, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .app-notification .button.flat,
 .app-notification .sidebar-button.button,
@@ -780,7 +805,7 @@ GtkSearchEntry.entry {
     .spinbutton.vertical .button:first-child:active, .spinbutton.vertical:dir(rtl) .button:first-child:active {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: transparent;
+      border-color: #2b2e39;
       background-color: #5294E2; }
     .spinbutton.vertical .button:first-child:hover, .spinbutton.vertical:dir(rtl) .button:first-child:hover {
       color: #D3DAE3;
@@ -801,7 +826,7 @@ GtkSearchEntry.entry {
     .spinbutton.vertical .button:last-child:active, .spinbutton.vertical:dir(rtl) .button:last-child:active {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: transparent;
+      border-color: #2b2e39;
       background-color: #5294E2; }
     .spinbutton.vertical .button:last-child:hover, .spinbutton.vertical:dir(rtl) .button:last-child:hover {
       color: #D3DAE3;
@@ -845,21 +870,19 @@ GtkComboBox {
   GtkComboBox .separator.vertical, GtkComboBox .sidebar .vertical.view.separator, .sidebar GtkComboBox .vertical.view.separator {
     -GtkWidget-wide-separators: true; }
   GtkComboBox.combobox-entry .entry:dir(ltr) {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
     border-right-style: none; }
-    GtkComboBox.combobox-entry .entry:dir(ltr):focus {
-      box-shadow: 1px 0 #5294E2; }
   GtkComboBox.combobox-entry .entry:dir(rtl) {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
     border-left-style: none; }
-    GtkComboBox.combobox-entry .entry:dir(rtl):focus {
-      box-shadow: -1px 0 #5294E2; }
-  GtkComboBox.combobox-entry .the-button-in-the-combobox:dir(ltr) {
-    box-shadow: inset 1px 0 #2b2e39; }
-    GtkComboBox.combobox-entry .the-button-in-the-combobox:dir(ltr):insensitive {
-      box-shadow: inset 1px 0 rgba(43, 46, 57, 0.55); }
-  GtkComboBox.combobox-entry .the-button-in-the-combobox:dir(rtl) {
-    box-shadow: inset -1px 0 #2b2e39; }
-    GtkComboBox.combobox-entry .the-button-in-the-combobox:dir(rtl):insensitive {
-      box-shadow: inset -1px 0 rgba(43, 46, 57, 0.55); }
+  GtkComboBox.combobox-entry .button:dir(ltr) {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0; }
+  GtkComboBox.combobox-entry .button:dir(rtl) {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0; }
 
 /************
  * Toolbars *
@@ -1092,77 +1115,83 @@ GtkComboBox {
     border-color: rgba(82, 148, 226, 0.65);
     background-color: rgba(82, 148, 226, 0.65); }
 
-.primary-toolbar .linked > .button, .header-bar .linked > .button {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button,
+.header-bar .linked:not(.vertical):not(.path-bar) > .button,
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover,
+.header-bar .linked:not(.vertical):not(.path-bar) > .button:hover,
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:active,
+.header-bar .linked:not(.vertical):not(.path-bar) > .button:active,
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:checked,
+.header-bar .linked:not(.vertical):not(.path-bar) > .button:checked,
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:insensitive, .header-bar .linked:not(.vertical):not(.path-bar) > .button:insensitive {
   border-radius: 3px;
   border-style: solid; }
 
-.primary-toolbar .linked > .button:hover, .header-bar .linked > .button:hover {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child),
+.header-bar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child),
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active),
+.header-bar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active),
+.primary-toolbar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child),
+.header-bar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child),
+.primary-toolbar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active), .header-bar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) {
   box-shadow: none; }
 
-.primary-toolbar .linked.stack-switcher > .button,
-.header-bar .linked.stack-switcher > .button,
-.primary-toolbar .linked.path-bar > .button, .header-bar .linked.path-bar > .button {
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button,
+.primary-toolbar .linked:not(.vertical).path-bar > .button, .header-bar .linked:not(.vertical).path-bar > .button {
   color: rgba(207, 218, 231, 0.8);
   outline-color: rgba(207, 218, 231, 0.1);
   border-color: rgba(21, 23, 28, 0.4);
   background-color: rgba(95, 105, 127, 0.4); }
-  .primary-toolbar .linked.stack-switcher > .button:hover,
-  .header-bar .linked.stack-switcher > .button:hover,
-  .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover {
+  .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover,
+  .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover,
+  .primary-toolbar .linked:not(.vertical).path-bar > .button:hover, .header-bar .linked:not(.vertical).path-bar > .button:hover {
     background-color: rgba(134, 144, 165, 0.4); }
-  .primary-toolbar .linked.stack-switcher > .button:active,
-  .header-bar .linked.stack-switcher > .button:active,
-  .primary-toolbar .linked.stack-switcher > .button:checked,
-  .header-bar .linked.stack-switcher > .button:checked,
-  .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked {
+  .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:active,
+  .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:active,
+  .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:checked,
+  .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:checked,
+  .primary-toolbar .linked:not(.vertical).path-bar > .button:active, .header-bar .linked:not(.vertical).path-bar > .button:active, .primary-toolbar .linked:not(.vertical).path-bar > .button:checked, .header-bar .linked:not(.vertical).path-bar > .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: transparent;
     background-color: #5294E2; }
-  .primary-toolbar .linked.stack-switcher > .button:insensitive,
-  .header-bar .linked.stack-switcher > .button:insensitive,
-  .primary-toolbar .linked.path-bar > .button:insensitive, .header-bar .linked.path-bar > .button:insensitive {
+  .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:insensitive,
+  .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:insensitive,
+  .primary-toolbar .linked:not(.vertical).path-bar > .button:insensitive, .header-bar .linked:not(.vertical).path-bar > .button:insensitive {
     color: rgba(207, 218, 231, 0.4); }
-  .primary-toolbar .linked.stack-switcher > .button:hover,
-  .header-bar .linked.stack-switcher > .button:hover,
-  .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover {
-    box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4), inset -1px 0 rgba(21, 23, 28, 0.4); }
-  .primary-toolbar .linked.stack-switcher > .button:active,
-  .header-bar .linked.stack-switcher > .button:active,
-  .primary-toolbar .linked.stack-switcher > .button:checked,
-  .header-bar .linked.stack-switcher > .button:checked,
-  .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked {
-    box-shadow: none; }
-  .primary-toolbar .linked.stack-switcher > .button:first-child:hover,
-  .header-bar .linked.stack-switcher > .button:first-child:hover,
-  .primary-toolbar .linked.path-bar > .button:first-child:hover, .header-bar .linked.path-bar > .button:first-child:hover {
-    box-shadow: inset -1px 0 rgba(21, 23, 28, 0.4); }
-  .primary-toolbar .linked.stack-switcher > .button:first-child:active,
-  .header-bar .linked.stack-switcher > .button:first-child:active,
-  .primary-toolbar .linked.stack-switcher > .button:first-child:checked,
-  .header-bar .linked.stack-switcher > .button:first-child:checked,
-  .primary-toolbar .linked.path-bar > .button:first-child:active, .header-bar .linked.path-bar > .button:first-child:active, .primary-toolbar .linked.path-bar > .button:first-child:checked, .header-bar .linked.path-bar > .button:first-child:checked {
-    box-shadow: none; }
-  .primary-toolbar .linked.stack-switcher > .button:last-child:hover,
-  .header-bar .linked.stack-switcher > .button:last-child:hover,
-  .primary-toolbar .linked.path-bar > .button:last-child:hover, .header-bar .linked.path-bar > .button:last-child:hover {
-    box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); }
-  .primary-toolbar .linked.stack-switcher > .button:last-child:active,
-  .header-bar .linked.stack-switcher > .button:last-child:active,
-  .primary-toolbar .linked.stack-switcher > .button:last-child:checked,
-  .header-bar .linked.stack-switcher > .button:last-child:checked,
-  .primary-toolbar .linked.path-bar > .button:last-child:active, .header-bar .linked.path-bar > .button:last-child:active, .primary-toolbar .linked.path-bar > .button:last-child:checked, .header-bar .linked.path-bar > .button:last-child:checked {
-    box-shadow: none; }
-  .primary-toolbar .linked.stack-switcher > .button:only-child:hover,
-  .header-bar .linked.stack-switcher > .button:only-child:hover,
-  .primary-toolbar .linked.path-bar > .button:only-child:hover, .header-bar .linked.path-bar > .button:only-child:hover {
-    box-shadow: none; }
-  .primary-toolbar .linked.stack-switcher > .button:only-child:active,
-  .header-bar .linked.stack-switcher > .button:only-child:active,
-  .primary-toolbar .linked.stack-switcher > .button:only-child:checked,
-  .header-bar .linked.stack-switcher > .button:only-child:checked,
-  .primary-toolbar .linked.path-bar > .button:only-child:active, .header-bar .linked.path-bar > .button:only-child:active, .primary-toolbar .linked.path-bar > .button:only-child:checked, .header-bar .linked.path-bar > .button:only-child:checked {
-    box-shadow: none; }
+
+.primary-toolbar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):hover,
+.header-bar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):hover,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover:not(:checked):not(:active):not(:only-child):hover, .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover:not(:checked):not(:active):not(:only-child):hover {
+  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4), inset -1px 0 rgba(21, 23, 28, 0.4); }
+
+.primary-toolbar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):first-child:hover,
+.header-bar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):first-child:hover,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
+  box-shadow: inset -1px 0 rgba(21, 23, 28, 0.4); }
+
+.primary-toolbar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):last-child:hover,
+.header-bar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):last-child:hover,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
+  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); }
+
+.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry {
+  border-left-color: rgba(21, 23, 28, 0); }
+
+.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:not(:last-child),
+.header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:not(:last-child),
+.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:last-child, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:last-child {
+  border-left-color: rgba(21, 23, 28, 0.4); }
+
+.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .entry,
+.header-bar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .entry,
+.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .button,
+.header-bar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .button,
+.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox,
+.header-bar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox,
+.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox, .header-bar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox {
+  border-left-color: rgba(21, 23, 28, 0.4); }
 
 .primary-toolbar .button.suggested-action, .header-bar .button.suggested-action {
   background-clip: border-box;
@@ -1275,21 +1304,15 @@ GtkComboBox {
     color: rgba(207, 218, 231, 0.35);
     background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.25)); }
 
-.primary-toolbar GtkComboBox.combobox-entry .entry:dir(ltr):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(ltr):focus {
-  box-shadow: none; }
-
-.primary-toolbar GtkComboBox.combobox-entry .entry:dir(rtl):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(rtl):focus {
-  box-shadow: none; }
-
-.primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr), .header-bar GtkComboBox.combobox-entry .button:dir(ltr) {
-  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); }
-  .primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(ltr):insensitive {
-    box-shadow: inset 1px 0 rgba(21, 23, 28, 0); }
+.primary-toolbar GtkComboBox.combobox-entry .entry:dir(ltr), .header-bar GtkComboBox.combobox-entry .entry:dir(ltr) {
+  border-right-style: none; }
+  .primary-toolbar GtkComboBox.combobox-entry .entry:dir(ltr):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(ltr):focus {
+    box-shadow: none; }
 
-.primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl), .header-bar GtkComboBox.combobox-entry .button:dir(rtl) {
-  box-shadow: inset -1px 0 rgba(21, 23, 28, 0.4); }
-  .primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(rtl):insensitive {
-    box-shadow: inset -1px 0 rgba(21, 23, 28, 0); }
+.primary-toolbar GtkComboBox.combobox-entry .entry:dir(rtl), .header-bar GtkComboBox.combobox-entry .entry:dir(rtl) {
+  border-left-style: none; }
+  .primary-toolbar GtkComboBox.combobox-entry .entry:dir(rtl):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(rtl):focus {
+    box-shadow: none; }
 
 .primary-toolbar GtkSwitch:backdrop, .header-bar GtkSwitch:backdrop {
   opacity: 0.75; }
@@ -2604,8 +2627,7 @@ GtkVolumeButton.button {
 .view:selected:focus,
 .view:selected:hover, .label:selected,
 .label:selected:focus,
-.label:selected:hover, .grid-child:selected, .entry:selected,
-.entry:selected:focus, .menuitem.button.flat:active, .menuitem.sidebar-button.button:active, .menuitem.button.flat:selected, .menuitem.sidebar-button.button:selected, .list-row:selected, .sidebar:selected, .sidebar .view:selected, GtkPlacesSidebar.sidebar .list-row.activatable:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected,
+.label:selected:hover, .grid-child:selected, .menuitem.button.flat:active, .menuitem.sidebar-button.button:active, .menuitem.button.flat:selected, .menuitem.sidebar-button.button:selected, .list-row:selected, .sidebar:selected, .sidebar .view:selected, GtkPlacesSidebar.sidebar .list-row.activatable:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected,
 GtkEntry.gb-command-bar-entry.entry.flat:selected:focus,
 GtkFileChooserDialog GtkPlacesSidebar.sidebar .list-row.activatable:selected,
 GtkFileChooserDialog GtkPlacesSidebar.sidebar .list-row.activatable:selected:hover,
@@ -2826,36 +2848,29 @@ NemoWindow .sidebar .frame {
 NemoWindow GtkSeparator.separator.horizontal, NemoWindow .sidebar GtkSeparator.horizontal.view.separator, .sidebar NemoWindow GtkSeparator.horizontal.view.separator {
   color: #2b2e39; }
 
-NemoWindow .primary-toolbar NemoPathBar.linked > .button {
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button {
   color: rgba(207, 218, 231, 0.8);
   outline-color: rgba(207, 218, 231, 0.1);
   border-color: rgba(21, 23, 28, 0.4);
   background-color: rgba(95, 105, 127, 0.4); }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover {
+  NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover {
     background-color: rgba(134, 144, 165, 0.4); }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked {
+  NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: transparent;
     background-color: #5294E2; }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:insensitive {
+  NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:insensitive {
     color: rgba(207, 218, 231, 0.4); }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover {
-    box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4), inset -1px 0 rgba(21, 23, 28, 0.4); }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked {
-    box-shadow: none; }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:hover {
-    box-shadow: inset -1px 0 rgba(21, 23, 28, 0.4); }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:checked {
-    box-shadow: none; }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:hover {
-    box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:checked {
-    box-shadow: none; }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:hover {
-    box-shadow: none; }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:checked {
-    box-shadow: none; }
+
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child):hover {
+  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4), inset -1px 0 rgba(21, 23, 28, 0.4); }
+
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
+  box-shadow: inset -1px 0 rgba(21, 23, 28, 0.4); }
+
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
+  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); }
 
 .gedit-headerbar-paned {
   color: #262a33; }
@@ -3361,7 +3376,7 @@ UnityPanelWidget,
   box-shadow: none; }
   UnityPanelWidget:backdrop,
   .unity-panel:backdrop {
-    color: #abb6c5; }
+    color: #bdc6d1; }
 
 .unity-panel.menubar.menuitem:hover,
 .unity-panel.menubar .menuitem *:hover {
@@ -3574,7 +3589,7 @@ GtkListBox .h4 {
   #content_frame .button:active, #content_frame .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: transparent;
+    border-color: #2b2e39;
     background-color: #5294E2; }
   #content_frame .button:insensitive {
     color: rgba(211, 218, 227, 0.45);
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 f2ac11f..fe0f76d 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
@@ -170,6 +170,10 @@ GtkTextView {
     border-color: rgba(207, 214, 230, 0.55);
     background-color: rgba(255, 255, 255, 0.55);
     background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.55)); }
+  .entry:selected,
+  .entry:selected:focus {
+    background-color: #5294E2;
+    color: #ffffff; }
   .entry.progressbar {
     margin: 2px 12px;
     border-radius: 0;
@@ -179,17 +183,6 @@ GtkTextView {
     background-image: none;
     background-color: transparent;
     box-shadow: none; }
-  .linked > .entry:first-child {
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0; }
-    .linked > .entry:first-child:dir(rtl) {
-      border-right-style: none; }
-  .linked > .entry:last-child {
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0;
-    border-left-style: none; }
-    .linked > .entry:last-child:dir(rtl) {
-      border-left-style: solid; }
   .entry.error {
     color: white;
     border-color: #FC4138;
@@ -216,28 +209,6 @@ GtkTextView {
       color: #5c616c; }
     .entry.image:active {
       color: #5294E2; }
-  .linked.vertical > .entry {
-    border-bottom-color: #f4f5f6;
-    box-shadow: none; }
-    .linked.vertical > .entry:focus {
-      border-color: #5294E2;
-      box-shadow: 0 -1px 0 0 #5294E2; }
-    .linked.vertical > .entry:insensitive {
-      border-bottom-color: #f4f5f6; }
-    .linked.vertical > .entry:first-child {
-      border-bottom-color: #f4f5f6; }
-      .linked.vertical > .entry:first-child:focus {
-        border-bottom-color: #5294E2;
-        box-shadow: none; }
-      .linked.vertical > .entry:first-child:insensitive {
-        border-bottom-color: #f4f5f6; }
-    .linked.vertical > .entry:last-child {
-      border-bottom-color: rgba(0, 0, 0, 0.14); }
-      .linked.vertical > .entry:last-child:focus {
-        border-bottom-color: #5294E2;
-        box-shadow: 0 -1px 0 0 #5294E2; }
-      .linked.vertical > .entry:last-child:insensitive {
-        border-bottom-color: rgba(0, 0, 0, 0.14); }
   .osd .entry {
     color: #BAC3CF;
     border-color: rgba(26, 28, 34, 0.4);
@@ -298,7 +269,7 @@ GtkSearchEntry.entry {
     background-clip: border-box;
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: transparent;
+    border-color: #5294E2;
     background-color: #5294E2;
     transition-duration: 50ms; }
   .button:active {
@@ -528,7 +499,7 @@ GtkSearchEntry.entry {
   .inline-toolbar GtkToolButton > .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: transparent;
+    border-color: #5294E2;
     background-color: #5294E2; }
   .inline-toolbar GtkToolButton > .button:insensitive {
     color: rgba(92, 97, 108, 0.55);
@@ -546,166 +517,219 @@ GtkSearchEntry.entry {
     .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel {
       color: inherit; }
 
-.inline-toolbar.toolbar GtkToolButton > .button.flat, .inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.toolbar GtkToolButton > .sidebar-button.button, .inline-toolbar GtkToolButton > .sidebar-button.button, .osd .button:hover, .osd .button:active, .osd .button:checked, .osd .button:insensitive, .inline-toolbar .button, .inline-toolbar .button:backdrop, .linked > .button,
-.linked > .button:hover,
-.linked > .button:active,
-.linked > .button:checked, GtkComboBox.combobox-entry .entry, GtkComboBox.combobox-entry .the-button-in-the-combobox, .primary-toolbar .linked.stack-switcher > .button,
-.header-bar .linked.stack-switcher > .button,
-.primary-toolbar .linked.path-bar > .button, .header-bar .linked.path-bar > .button, NemoWindow .primary-toolbar NemoPathBar.linked > .button, .linked > GtkComboBox > .the-button-in-the-combobox:dir(ltr) {
+.linked:not(.vertical):not(.pathbar) > .entry + .entry {
+  border-left-color: rgba(207, 214, 230, 0.3); }
+
+.linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:not(:last-child),
+.linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:last-child {
+  border-left-color: #5294E2; }
+
+.linked:not(.vertical):not(.pathbar) > .entry + .button,
+.linked:not(.vertical):not(.pathbar) > .entry + .button:hover,
+.linked:not(.vertical):not(.pathbar) > .entry + .button:active,
+.linked:not(.vertical):not(.pathbar) > .entry + .button:checked,
+.linked:not(.vertical):not(.pathbar) > .entry + .button:insensitive {
+  border-left-style: solid; }
+
+.linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .entry,
+.linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .button,
+.linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox,
+.linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox {
+  border-left-color: #5294E2; }
+
+.linked:not(.vertical):not(.pathbar) > .button:hover:not(:checked):not(:active):not(:only-child),
+.linked:not(.vertical):not(.pathbar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) {
+  box-shadow: -1px 0 #cfd6e6; }
+
+.linked:not(.vertical):not(.pathbar) > .button:first-child:hover:not(:checked):not(:active) {
+  box-shadow: none; }
+
+.linked:not(.vertical):not(.pathbar) > .button:checked + .button:not(:checked):not(:active):hover {
+  box-shadow: none; }
+
+.linked:not(.vertical):not(.pathbar) > .button:checked + .entry {
+  border-left-color: #5294E2; }
+
+.linked:not(.vertical):not(.pathbar) > .entry + .button:not(:checked):not(:active):hover {
+  box-shadow: none; }
+
+.linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):hover {
+  box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4), inset -1px 0 rgba(207, 214, 230, 0.4); }
+
+.linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
+  box-shadow: inset -1px 0 rgba(207, 214, 230, 0.4); }
+
+.linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
+  box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4); }
+
+.linked.vertical > .entry + .entry {
+  border-top-color: rgba(207, 214, 230, 0.3); }
+
+.linked.vertical > .entry + .entry:focus:not(:last-child),
+.linked.vertical > .entry + .entry:focus:last-child {
+  border-top-color: #5294E2; }
+
+.linked.vertical > .entry + .button,
+.linked.vertical > .entry + .button:hover,
+.linked.vertical > .entry + .button:active,
+.linked.vertical > .entry + .button:checked,
+.linked.vertical > .entry + .button:insensitive {
+  border-top-style: solid; }
+
+.linked.vertical > .entry:focus:not(:only-child) + .entry,
+.linked.vertical > .entry:focus:not(:only-child) + .button,
+.linked.vertical > .entry:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox,
+.linked.vertical > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox {
+  border-top-color: #5294E2; }
+
+.linked.vertical > .button:hover:not(:checked):not(:active):not(:only-child),
+.linked.vertical > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) {
+  box-shadow: 0 -1px #cfd6e6; }
+
+.linked.vertical > .button:first-child:hover:not(:checked):not(:active) {
+  box-shadow: none; }
+
+.linked.vertical > .button:checked + .button:not(:checked):not(:active):hover {
+  box-shadow: none; }
+
+.linked.vertical > .button:checked + .entry {
+  border-top-color: #5294E2; }
+
+.linked.vertical > .entry + .button:not(:checked):not(:active):hover {
+  box-shadow: none; }
+
+.inline-toolbar.toolbar GtkToolButton > .button.flat, .inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.toolbar GtkToolButton > .sidebar-button.button, .inline-toolbar GtkToolButton > .sidebar-button.button, .osd .button:hover, .osd .button:active, .osd .button:checked, .osd .button:insensitive, .inline-toolbar .button, .inline-toolbar .button:backdrop, .linked:not(.vertical) > .button,
+.linked:not(.vertical) > .button:hover,
+.linked:not(.vertical) > .button:active,
+.linked:not(.vertical) > .button:checked, .linked:not(.vertical):not(.pathbar) > .entry, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button,
+.primary-toolbar .linked:not(.vertical).path-bar > .button,
+.header-bar .linked:not(.vertical).path-bar > .button,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:hover,
+.header-bar .linked:not(.vertical).path-bar > .button:hover,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:active,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:active,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:active,
+.header-bar .linked:not(.vertical).path-bar > .button:active,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:checked,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:checked,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:checked,
+.header-bar .linked:not(.vertical).path-bar > .button:checked,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:insensitive,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:insensitive,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:insensitive, .header-bar .linked:not(.vertical).path-bar > .button:insensitive, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:active,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:checked,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:insensitive, .linked > GtkComboBox > .the-button-in-the-combobox:dir(ltr),
+.linked > GtkComboBox > .the-button-in-the-combobox:dir(rtl),
+.linked > GtkComboBoxText > .the-button-in-the-combobox:dir(ltr),
+.linked > GtkComboBoxText > .the-button-in-the-combobox:dir(rtl) {
   border-radius: 0;
-  border-left-style: none;
   border-right-style: none; }
-  .inline-toolbar GtkToolButton > .button.flat:hover, .inline-toolbar GtkToolButton > .sidebar-button.button:hover, .osd .button:hover, .inline-toolbar .button:hover, .linked > .button:hover,
-  GtkComboBox.combobox-entry .entry:hover, GtkComboBox.combobox-entry .the-button-in-the-combobox:hover, .primary-toolbar .linked.stack-switcher > .button:hover,
-  .header-bar .linked.stack-switcher > .button:hover,
-  .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover, .linked > GtkComboBox > .the-button-in-the-combobox:hover:dir(ltr) {
-    box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4), inset -1px 0 rgba(207, 214, 230, 0.4); }
-  .inline-toolbar GtkToolButton > .button.flat:active, .inline-toolbar GtkToolButton > .sidebar-button.button:active, .osd .button:active, .inline-toolbar .button:active, .linked > .button:active,
-  GtkComboBox.combobox-entry .entry:active, GtkComboBox.combobox-entry .the-button-in-the-combobox:active, .primary-toolbar .linked.stack-switcher > .button:active,
-  .header-bar .linked.stack-switcher > .button:active,
-  .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, .linked > GtkComboBox > .the-button-in-the-combobox:active:dir(ltr), .inline-toolbar GtkToolButton > .button.flat:checked, .inline-toolbar GtkToolButton > .sidebar-button.button:checked, .osd .button:checked, .inline-toolbar .button:checked, .linked > .button:checked,
-  GtkComboBox.combobox-entry .entry:checked, GtkComboBox.combobox-entry .the-button-in-the-combobox:checked, .primary-toolbar .linked.stack-switcher > .button:checked,
-  .header-bar .linked.stack-switcher > .button:checked,
-  .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked, .linked > GtkComboBox > .the-button-in-the-combobox:checked:dir(ltr) {
-    box-shadow: none; }
-  .inline-toolbar GtkToolButton > .button.flat:dir(rtl), .inline-toolbar GtkToolButton > .sidebar-button.button:dir(rtl), .inline-toolbar.toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar.toolbar GtkToolButton:dir(rtl) > .sidebar-button.button, .inline-toolbar GtkToolButton:dir(rtl) > .sidebar-button.button, .osd .button:dir(rtl):hover, .osd .button:dir(rtl):active, .osd .button:dir(rtl):checked, .osd .button:dir(rtl):insensitive, .inline-toolbar .button:dir(rtl), .linked > .button:dir(rtl),
-  GtkComboBox.combobox-entry .entry:dir(rtl), GtkComboBox.combobox-entry .the-button-in-the-combobox:dir(rtl), .primary-toolbar .linked.stack-switcher > .button:dir(rtl),
-  .header-bar .linked.stack-switcher > .button:dir(rtl),
-  .primary-toolbar .linked.path-bar > .button:dir(rtl), .header-bar .linked.path-bar > .button:dir(rtl), NemoWindow .primary-toolbar NemoPathBar.linked > .button:dir(rtl), .linked > GtkComboBox > .the-button-in-the-combobox:dir(rtl) {
-    border-radius: 0; }
 
-.osd .button:first-child:hover, .osd .button:first-child:active, .osd .button:first-child:checked, .osd .button:first-child:insensitive, .inline-toolbar .button:first-child, .linked > .button:first-child,
-.inline-toolbar.toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar.toolbar GtkToolButton:first-child > .sidebar-button.button, .inline-toolbar GtkToolButton:first-child > .sidebar-button.button, GtkComboBox.combobox-entry .entry:first-child, GtkComboBox.combobox-entry .the-button-in-the-combobox:first-child, .linked > GtkComboBox:first-child > .the-button-in-the-combobox, .primary-toolbar .linked.stack-switcher > .button:first-child,
-.header-bar .linked.stack-switcher > .button:first-child,
-.primary-toolbar .linked.path-bar > .button:first-child, .header-bar .linked.path-bar > .button:first-child, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child {
-  border-radius: 3px 0 0 3px;
-  border-left-style: solid; }
-  .osd .button:first-child:hover, .inline-toolbar .button:first-child:hover, .linked > .button:first-child:hover,
-  .inline-toolbar GtkToolButton:first-child > .button.flat:hover, .inline-toolbar GtkToolButton:first-child > .sidebar-button.button:hover, GtkComboBox.combobox-entry .entry:first-child:hover, GtkComboBox.combobox-entry .the-button-in-the-combobox:first-child:hover, .linked > GtkComboBox:first-child > .the-button-in-the-combobox:hover, .primary-toolbar .linked.stack-switcher > .button:first-child:hover,
-  .header-bar .linked.stack-switcher > .button:first-child:hover,
-  .primary-toolbar .linked.path-bar > .button:first-child:hover, .header-bar .linked.path-bar > .button:first-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:hover {
-    box-shadow: inset -1px 0 rgba(207, 214, 230, 0.4); }
-  .osd .button:first-child:active, .inline-toolbar .button:first-child:active, .linked > .button:first-child:active,
-  .inline-toolbar GtkToolButton:first-child > .button.flat:active, .inline-toolbar GtkToolButton:first-child > .sidebar-button.button:active, GtkComboBox.combobox-entry .entry:first-child:active, GtkComboBox.combobox-entry .the-button-in-the-combobox:first-child:active, .linked > GtkComboBox:first-child > .the-button-in-the-combobox:active, .primary-toolbar .linked.stack-switcher > .button:first-child:active,
-  .header-bar .linked.stack-switcher > .button:first-child:active,
-  .primary-toolbar .linked.path-bar > .button:first-child:active, .header-bar .linked.path-bar > .button:first-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:active, .osd .button:first-child:checked, .inline-toolbar .button:first-child:checked, .linked > .button:first-child:checked,
-  .inline-toolbar GtkToolButton:first-child > .button.flat:checked, .inline-toolbar GtkToolButton:first-child > .sidebar-button.button:checked, GtkComboBox.combobox-entry .entry:first-child:checked, GtkComboBox.combobox-entry .the-button-in-the-combobox:first-child:checked, .linked > GtkComboBox:first-child > .the-button-in-the-combobox:checked, .primary-toolbar .linked.stack-switcher > .button:first-child:checked,
-  .header-bar .linked.stack-switcher > .button:first-child:checked,
-  .primary-toolbar .linked.path-bar > .button:first-child:checked, .header-bar .linked.path-bar > .button:first-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:checked {
-    box-shadow: none; }
+.osd .button:first-child:hover, .osd .button:first-child:active, .osd .button:first-child:checked, .osd .button:first-child:insensitive, .inline-toolbar .button:first-child, .linked:not(.vertical) > .button:first-child,
+.inline-toolbar.toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar.toolbar GtkToolButton:first-child > .sidebar-button.button, .inline-toolbar GtkToolButton:first-child > .sidebar-button.button, .linked:not(.vertical):not(.pathbar) > .entry:first-child, .linked > GtkComboBox:first-child > .the-button-in-the-combobox,
+.linked > GtkComboBoxText:first-child > .the-button-in-the-combobox, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:first-child,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:first-child,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:first-child,
+.header-bar .linked:not(.vertical).path-bar > .button:first-child,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:first-child {
+  border-top-left-radius: 3px;
+  border-bottom-left-radius: 3px; }
 
-.osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .inline-toolbar .button:last-child, .linked > .button:last-child,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar.toolbar GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar GtkToolButton:last-child > .sidebar-button.button, GtkComboBox.combobox-entry .entry:last-child, GtkComboBox.combobox-entry .the-button-in-the-combobox:last-child, .linked > GtkComboBox:last-child > .the-button-in-the-combobox, .primary-toolbar .linked.stack-switcher > .button:last-child,
-.header-bar .linked.stack-switcher > .button:last-child,
-.primary-toolbar .linked.path-bar > .button:last-child, .header-bar .linked.path-bar > .button:last-child, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child {
-  border-radius: 0 3px 3px 0;
+.osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .inline-toolbar .button:last-child, .linked:not(.vertical) > .button:last-child,
+.inline-toolbar.toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar.toolbar GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar GtkToolButton:last-child > .sidebar-button.button, .linked:not(.vertical):not(.pathbar) > .entry:last-child, .linked > GtkComboBox:last-child > .the-button-in-the-combobox,
+.linked > GtkComboBoxText:last-child > .the-button-in-the-combobox, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:last-child,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:last-child,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:last-child,
+.header-bar .linked:not(.vertical).path-bar > .button:last-child,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:last-child {
+  border-top-right-radius: 3px;
+  border-bottom-right-radius: 3px;
   border-right-style: solid; }
-  .osd .button:last-child:hover, .inline-toolbar .button:last-child:hover, .linked > .button:last-child:hover,
-  .inline-toolbar GtkToolButton:last-child > .button.flat:hover, .inline-toolbar GtkToolButton:last-child > .sidebar-button.button:hover, GtkComboBox.combobox-entry .entry:last-child:hover, GtkComboBox.combobox-entry .the-button-in-the-combobox:last-child:hover, .linked > GtkComboBox:last-child > .the-button-in-the-combobox:hover, .primary-toolbar .linked.stack-switcher > .button:last-child:hover,
-  .header-bar .linked.stack-switcher > .button:last-child:hover,
-  .primary-toolbar .linked.path-bar > .button:last-child:hover, .header-bar .linked.path-bar > .button:last-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:hover {
-    box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4); }
-  .osd .button:last-child:active, .inline-toolbar .button:last-child:active, .linked > .button:last-child:active,
-  .inline-toolbar GtkToolButton:last-child > .button.flat:active, .inline-toolbar GtkToolButton:last-child > .sidebar-button.button:active, GtkComboBox.combobox-entry .entry:last-child:active, GtkComboBox.combobox-entry .the-button-in-the-combobox:last-child:active, .linked > GtkComboBox:last-child > .the-button-in-the-combobox:active, .primary-toolbar .linked.stack-switcher > .button:last-child:active,
-  .header-bar .linked.stack-switcher > .button:last-child:active,
-  .primary-toolbar .linked.path-bar > .button:last-child:active, .header-bar .linked.path-bar > .button:last-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:active, .osd .button:last-child:checked, .inline-toolbar .button:last-child:checked, .linked > .button:last-child:checked,
-  .inline-toolbar GtkToolButton:last-child > .button.flat:checked, .inline-toolbar GtkToolButton:last-child > .sidebar-button.button:checked, GtkComboBox.combobox-entry .entry:last-child:checked, GtkComboBox.combobox-entry .the-button-in-the-combobox:last-child:checked, .linked > GtkComboBox:last-child > .the-button-in-the-combobox:checked, .primary-toolbar .linked.stack-switcher > .button:last-child:checked,
-  .header-bar .linked.stack-switcher > .button:last-child:checked,
-  .primary-toolbar .linked.path-bar > .button:last-child:checked, .header-bar .linked.path-bar > .button:last-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:checked {
-    box-shadow: none; }
-  .osd .button:last-child:dir(rtl):hover, .osd .button:last-child:dir(rtl):active, .osd .button:last-child:dir(rtl):checked, .osd .button:last-child:dir(rtl):insensitive, .inline-toolbar .button:last-child:dir(rtl), .linked > .button:last-child:dir(rtl),
-  .inline-toolbar GtkToolButton:last-child > .button.flat:dir(rtl), .inline-toolbar GtkToolButton:last-child > .sidebar-button.button:dir(rtl), .inline-toolbar.toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar.toolbar GtkToolButton:last-child:dir(rtl) > .sidebar-button.button, .inline-toolbar GtkToolButton:last-child:dir(rtl) > .sidebar-button.button, GtkComboBox.combobox-entry .entry:last-child:dir(rtl), GtkComboBox.combobox-entry .the-button-in-the-combobox:last-child:dir(rtl), .linked > GtkComboBox:last-child > .the-button-in-the-combobox:dir(rtl), .primary-toolbar .linked.stack-switcher > .button:last-child:dir(rtl),
-  .header-bar .linked.stack-switcher > .button:last-child:dir(rtl),
-  .primary-toolbar .linked.path-bar > .button:last-child:dir(rtl), .header-bar .linked.path-bar > .button:last-child:dir(rtl), NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:dir(rtl) {
-    border-bottom-left-radius: 0; }
 
-.osd .button:only-child:hover, .osd .button:only-child:active, .osd .button:only-child:checked, .osd .button:only-child:insensitive, .inline-toolbar .button:only-child, .linked > .button:only-child,
-.inline-toolbar.toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar.toolbar GtkToolButton:only-child > .sidebar-button.button, .inline-toolbar GtkToolButton:only-child > .sidebar-button.button, GtkComboBox.combobox-entry .entry:only-child, GtkComboBox.combobox-entry .the-button-in-the-combobox:only-child, .linked > GtkComboBox:only-child > .the-button-in-the-combobox, .primary-toolbar .linked.stack-switcher > .button:only-child,
-.header-bar .linked.stack-switcher > .button:only-child,
-.primary-toolbar .linked.path-bar > .button:only-child, .header-bar .linked.path-bar > .button:only-child, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child {
+.osd .button:only-child:hover, .osd .button:only-child:active, .osd .button:only-child:checked, .osd .button:only-child:insensitive, .inline-toolbar .button:only-child, .linked:not(.vertical) > .button:only-child,
+.inline-toolbar.toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar.toolbar GtkToolButton:only-child > .sidebar-button.button, .inline-toolbar GtkToolButton:only-child > .sidebar-button.button, .linked:not(.vertical):not(.pathbar) > .entry:only-child, .linked > GtkComboBox:only-child > .the-button-in-the-combobox,
+.linked > GtkComboBoxText:only-child > .the-button-in-the-combobox, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:only-child,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:only-child,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:only-child,
+.header-bar .linked:not(.vertical).path-bar > .button:only-child,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:only-child {
   border-radius: 3px;
   border-style: solid; }
-  .osd .button:only-child:hover, .inline-toolbar .button:only-child:hover, .linked > .button:only-child:hover,
-  .inline-toolbar GtkToolButton:only-child > .button.flat:hover, .inline-toolbar GtkToolButton:only-child > .sidebar-button.button:hover, GtkComboBox.combobox-entry .entry:only-child:hover, GtkComboBox.combobox-entry .the-button-in-the-combobox:only-child:hover, .linked > GtkComboBox:only-child > .the-button-in-the-combobox:hover, .primary-toolbar .linked.stack-switcher > .button:only-child:hover,
-  .header-bar .linked.stack-switcher > .button:only-child:hover,
-  .primary-toolbar .linked.path-bar > .button:only-child:hover, .header-bar .linked.path-bar > .button:only-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:hover {
-    box-shadow: none; }
-  .osd .button:only-child:active, .inline-toolbar .button:only-child:active, .linked > .button:only-child:active,
-  .inline-toolbar GtkToolButton:only-child > .button.flat:active, .inline-toolbar GtkToolButton:only-child > .sidebar-button.button:active, GtkComboBox.combobox-entry .entry:only-child:active, GtkComboBox.combobox-entry .the-button-in-the-combobox:only-child:active, .linked > GtkComboBox:only-child > .the-button-in-the-combobox:active, .primary-toolbar .linked.stack-switcher > .button:only-child:active,
-  .header-bar .linked.stack-switcher > .button:only-child:active,
-  .primary-toolbar .linked.path-bar > .button:only-child:active, .header-bar .linked.path-bar > .button:only-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:active, .osd .button:only-child:checked, .inline-toolbar .button:only-child:checked, .linked > .button:only-child:checked,
-  .inline-toolbar GtkToolButton:only-child > .button.flat:checked, .inline-toolbar GtkToolButton:only-child > .sidebar-button.button:checked, GtkComboBox.combobox-entry .entry:only-child:checked, GtkComboBox.combobox-entry .the-button-in-the-combobox:only-child:checked, .linked > GtkComboBox:only-child > .the-button-in-the-combobox:checked, .primary-toolbar .linked.stack-switcher > .button:only-child:checked,
-  .header-bar .linked.stack-switcher > .button:only-child:checked,
-  .primary-toolbar .linked.path-bar > .button:only-child:checked, .header-bar .linked.path-bar > .button:only-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:checked {
-    box-shadow: none; }
 
-.linked.vertical > .entry, .linked.vertical > .entry:focus, .linked.vertical > .entry:insensitive, .linked.vertical > .button,
+.linked.vertical > .button,
 .linked.vertical > .button:hover,
 .linked.vertical > .button:active,
-.linked.vertical > .button:checked, .linked.vertical > GtkComboBoxText > .the-button-in-the-combobox,
+.linked.vertical > .button:checked, .linked.vertical > .entry, .linked.vertical > GtkComboBoxText > .the-button-in-the-combobox,
 .linked.vertical > GtkComboBox > .the-button-in-the-combobox {
-  border-style: solid;
-  border-bottom-style: none;
-  border-top-style: none;
-  border-radius: 0; }
-  .linked.vertical > .entry:hover, .linked.vertical > .button:hover,
-  .linked.vertical > GtkComboBoxText > .the-button-in-the-combobox:hover,
-  .linked.vertical > GtkComboBox > .the-button-in-the-combobox:hover {
-    box-shadow: inset 0 -1px rgba(207, 214, 230, 0.4), inset 0 1px rgba(207, 214, 230, 0.4); }
-  .linked.vertical > .entry:active, .linked.vertical > .button:active,
-  .linked.vertical > GtkComboBoxText > .the-button-in-the-combobox:active,
-  .linked.vertical > GtkComboBox > .the-button-in-the-combobox:active, .linked.vertical > .entry:checked, .linked.vertical > .button:checked,
-  .linked.vertical > GtkComboBoxText > .the-button-in-the-combobox:checked,
-  .linked.vertical > GtkComboBox > .the-button-in-the-combobox:checked {
-    box-shadow: none; }
+  border-radius: 0;
+  border-bottom-style: none; }
 
-.linked.vertical > .entry:first-child, .linked.vertical > .button:first-child,
-.linked.vertical > GtkComboBoxText:first-child > .the-button-in-the-combobox,
+.linked.vertical > .button:first-child,
+.linked.vertical > .entry:first-child, .linked.vertical > GtkComboBoxText:first-child > .the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:first-child > .the-button-in-the-combobox {
-  border-radius: 3px 3px 0 0;
-  border-top-style: solid; }
-  .linked.vertical > .entry:first-child:hover, .linked.vertical > .button:first-child:hover,
-  .linked.vertical > GtkComboBoxText:first-child > .the-button-in-the-combobox:hover,
-  .linked.vertical > GtkComboBox:first-child > .the-button-in-the-combobox:hover {
-    box-shadow: inset 0 -1px rgba(207, 214, 230, 0.4); }
-  .linked.vertical > .entry:first-child:active, .linked.vertical > .button:first-child:active,
-  .linked.vertical > GtkComboBoxText:first-child > .the-button-in-the-combobox:active,
-  .linked.vertical > GtkComboBox:first-child > .the-button-in-the-combobox:active, .linked.vertical > .entry:first-child:checked, .linked.vertical > .button:first-child:checked,
-  .linked.vertical > GtkComboBoxText:first-child > .the-button-in-the-combobox:checked,
-  .linked.vertical > GtkComboBox:first-child > .the-button-in-the-combobox:checked {
-    box-shadow: none; }
+  border-top-left-radius: 3px;
+  border-top-right-radius: 3px; }
 
-.linked.vertical > .entry:last-child, .linked.vertical > .button:last-child,
-.linked.vertical > GtkComboBoxText:last-child > .the-button-in-the-combobox,
+.linked.vertical > .button:last-child,
+.linked.vertical > .entry:last-child, .linked.vertical > GtkComboBoxText:last-child > .the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:last-child > .the-button-in-the-combobox {
-  border-radius: 0 0 3px 3px;
+  border-bottom-left-radius: 3px;
+  border-bottom-right-radius: 3px;
   border-bottom-style: solid; }
-  .linked.vertical > .entry:last-child:hover, .linked.vertical > .button:last-child:hover,
-  .linked.vertical > GtkComboBoxText:last-child > .the-button-in-the-combobox:hover,
-  .linked.vertical > GtkComboBox:last-child > .the-button-in-the-combobox:hover {
-    box-shadow: inset 0 1px rgba(207, 214, 230, 0.4); }
-  .linked.vertical > .entry:last-child:active, .linked.vertical > .button:last-child:active,
-  .linked.vertical > GtkComboBoxText:last-child > .the-button-in-the-combobox:active,
-  .linked.vertical > GtkComboBox:last-child > .the-button-in-the-combobox:active, .linked.vertical > .entry:last-child:checked, .linked.vertical > .button:last-child:checked,
-  .linked.vertical > GtkComboBoxText:last-child > .the-button-in-the-combobox:checked,
-  .linked.vertical > GtkComboBox:last-child > .the-button-in-the-combobox:checked {
-    box-shadow: none; }
 
-.linked.vertical > .entry:only-child, .linked.vertical > .button:only-child,
-.linked.vertical > GtkComboBoxText:only-child > .the-button-in-the-combobox,
+.linked.vertical > .button:only-child,
+.linked.vertical > .entry:only-child, .linked.vertical > GtkComboBoxText:only-child > .the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:only-child > .the-button-in-the-combobox {
   border-radius: 3px;
   border-style: solid; }
-  .linked.vertical > .entry:only-child:hover, .linked.vertical > .button:only-child:hover,
-  .linked.vertical > GtkComboBoxText:only-child > .the-button-in-the-combobox:hover,
-  .linked.vertical > GtkComboBox:only-child > .the-button-in-the-combobox:hover {
-    box-shadow: none; }
-  .linked.vertical > .entry:only-child:active, .linked.vertical > .button:only-child:active,
-  .linked.vertical > GtkComboBoxText:only-child > .the-button-in-the-combobox:active,
-  .linked.vertical > GtkComboBox:only-child > .the-button-in-the-combobox:active, .linked.vertical > .entry:only-child:checked, .linked.vertical > .button:only-child:checked,
-  .linked.vertical > GtkComboBoxText:only-child > .the-button-in-the-combobox:checked,
-  .linked.vertical > GtkComboBox:only-child > .the-button-in-the-combobox:checked {
-    box-shadow: none; }
+
+.linked:not(.vertical) > .button,
+.linked:not(.vertical) > .button:hover,
+.linked:not(.vertical) > .button:active,
+.linked:not(.vertical) > .button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button,
+.primary-toolbar .linked:not(.vertical).path-bar > .button,
+.header-bar .linked:not(.vertical).path-bar > .button,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:hover,
+.header-bar .linked:not(.vertical).path-bar > .button:hover,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:active,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:active,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:active,
+.header-bar .linked:not(.vertical).path-bar > .button:active,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:checked,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:checked,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:checked,
+.header-bar .linked:not(.vertical).path-bar > .button:checked,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:insensitive,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:insensitive,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:insensitive, .header-bar .linked:not(.vertical).path-bar > .button:insensitive, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:active,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:checked,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:insensitive {
+  border-left-style: none; }
+  .linked:not(.vertical) > .button:first-child,
+  .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:first-child,
+  .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:first-child,
+  .primary-toolbar .linked:not(.vertical).path-bar > .button:first-child,
+  .header-bar .linked:not(.vertical).path-bar > .button:first-child,
+  NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:first-child {
+    border-left-style: solid; }
+
+.linked.vertical > .button,
+.linked.vertical > .button:hover,
+.linked.vertical > .button:active,
+.linked.vertical > .button:checked {
+  border-top-style: none; }
+  .linked.vertical > .button:first-child {
+    border-top-style: solid; }
 
 .menuitem.button.flat, .menuitem.sidebar-button.button, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .app-notification .button.flat,
 .app-notification .sidebar-button.button,
@@ -780,7 +804,7 @@ GtkSearchEntry.entry {
     .spinbutton.vertical .button:first-child:active, .spinbutton.vertical:dir(rtl) .button:first-child:active {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: transparent;
+      border-color: #5294E2;
       background-color: #5294E2; }
     .spinbutton.vertical .button:first-child:hover, .spinbutton.vertical:dir(rtl) .button:first-child:hover {
       color: #5c616c;
@@ -801,7 +825,7 @@ GtkSearchEntry.entry {
     .spinbutton.vertical .button:last-child:active, .spinbutton.vertical:dir(rtl) .button:last-child:active {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
-      border-color: transparent;
+      border-color: #5294E2;
       background-color: #5294E2; }
     .spinbutton.vertical .button:last-child:hover, .spinbutton.vertical:dir(rtl) .button:last-child:hover {
       color: #5c616c;
@@ -845,21 +869,23 @@ GtkComboBox {
   GtkComboBox .separator.vertical, GtkComboBox .sidebar .vertical.view.separator, .sidebar GtkComboBox .vertical.view.separator {
     -GtkWidget-wide-separators: true; }
   GtkComboBox.combobox-entry .entry:dir(ltr) {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
     border-right-style: none; }
     GtkComboBox.combobox-entry .entry:dir(ltr):focus {
       box-shadow: 1px 0 #5294E2; }
   GtkComboBox.combobox-entry .entry:dir(rtl) {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
     border-left-style: none; }
     GtkComboBox.combobox-entry .entry:dir(rtl):focus {
       box-shadow: -1px 0 #5294E2; }
-  GtkComboBox.combobox-entry .the-button-in-the-combobox:dir(ltr) {
-    box-shadow: inset 1px 0 #cfd6e6; }
-    GtkComboBox.combobox-entry .the-button-in-the-combobox:dir(ltr):insensitive {
-      box-shadow: inset 1px 0 rgba(207, 214, 230, 0.55); }
-  GtkComboBox.combobox-entry .the-button-in-the-combobox:dir(rtl) {
-    box-shadow: inset -1px 0 #cfd6e6; }
-    GtkComboBox.combobox-entry .the-button-in-the-combobox:dir(rtl):insensitive {
-      box-shadow: inset -1px 0 rgba(207, 214, 230, 0.55); }
+  GtkComboBox.combobox-entry .button:dir(ltr) {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0; }
+  GtkComboBox.combobox-entry .button:dir(rtl) {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0; }
 
 /************
  * Toolbars *
@@ -1092,77 +1118,83 @@ GtkComboBox {
     border-color: rgba(82, 148, 226, 0.65);
     background-color: rgba(82, 148, 226, 0.65); }
 
-.primary-toolbar .linked > .button, .header-bar .linked > .button {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button,
+.header-bar .linked:not(.vertical):not(.path-bar) > .button,
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover,
+.header-bar .linked:not(.vertical):not(.path-bar) > .button:hover,
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:active,
+.header-bar .linked:not(.vertical):not(.path-bar) > .button:active,
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:checked,
+.header-bar .linked:not(.vertical):not(.path-bar) > .button:checked,
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:insensitive, .header-bar .linked:not(.vertical):not(.path-bar) > .button:insensitive {
   border-radius: 3px;
   border-style: solid; }
 
-.primary-toolbar .linked > .button:hover, .header-bar .linked > .button:hover {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child),
+.header-bar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child),
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active),
+.header-bar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active),
+.primary-toolbar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child),
+.header-bar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child),
+.primary-toolbar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active), .header-bar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) {
   box-shadow: none; }
 
-.primary-toolbar .linked.stack-switcher > .button,
-.header-bar .linked.stack-switcher > .button,
-.primary-toolbar .linked.path-bar > .button, .header-bar .linked.path-bar > .button {
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button,
+.primary-toolbar .linked:not(.vertical).path-bar > .button, .header-bar .linked:not(.vertical).path-bar > .button {
   color: rgba(207, 218, 231, 0.8);
   outline-color: rgba(207, 218, 231, 0.1);
   border-color: rgba(21, 23, 28, 0.4);
   background-color: rgba(95, 105, 127, 0.4); }
-  .primary-toolbar .linked.stack-switcher > .button:hover,
-  .header-bar .linked.stack-switcher > .button:hover,
-  .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover {
+  .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover,
+  .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover,
+  .primary-toolbar .linked:not(.vertical).path-bar > .button:hover, .header-bar .linked:not(.vertical).path-bar > .button:hover {
     background-color: rgba(134, 144, 165, 0.4); }
-  .primary-toolbar .linked.stack-switcher > .button:active,
-  .header-bar .linked.stack-switcher > .button:active,
-  .primary-toolbar .linked.stack-switcher > .button:checked,
-  .header-bar .linked.stack-switcher > .button:checked,
-  .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked {
+  .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:active,
+  .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:active,
+  .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:checked,
+  .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:checked,
+  .primary-toolbar .linked:not(.vertical).path-bar > .button:active, .header-bar .linked:not(.vertical).path-bar > .button:active, .primary-toolbar .linked:not(.vertical).path-bar > .button:checked, .header-bar .linked:not(.vertical).path-bar > .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: transparent;
     background-color: #5294E2; }
-  .primary-toolbar .linked.stack-switcher > .button:insensitive,
-  .header-bar .linked.stack-switcher > .button:insensitive,
-  .primary-toolbar .linked.path-bar > .button:insensitive, .header-bar .linked.path-bar > .button:insensitive {
+  .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:insensitive,
+  .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:insensitive,
+  .primary-toolbar .linked:not(.vertical).path-bar > .button:insensitive, .header-bar .linked:not(.vertical).path-bar > .button:insensitive {
     color: rgba(207, 218, 231, 0.4); }
-  .primary-toolbar .linked.stack-switcher > .button:hover,
-  .header-bar .linked.stack-switcher > .button:hover,
-  .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover {
-    box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4), inset -1px 0 rgba(21, 23, 28, 0.4); }
-  .primary-toolbar .linked.stack-switcher > .button:active,
-  .header-bar .linked.stack-switcher > .button:active,
-  .primary-toolbar .linked.stack-switcher > .button:checked,
-  .header-bar .linked.stack-switcher > .button:checked,
-  .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked {
-    box-shadow: none; }
-  .primary-toolbar .linked.stack-switcher > .button:first-child:hover,
-  .header-bar .linked.stack-switcher > .button:first-child:hover,
-  .primary-toolbar .linked.path-bar > .button:first-child:hover, .header-bar .linked.path-bar > .button:first-child:hover {
-    box-shadow: inset -1px 0 rgba(21, 23, 28, 0.4); }
-  .primary-toolbar .linked.stack-switcher > .button:first-child:active,
-  .header-bar .linked.stack-switcher > .button:first-child:active,
-  .primary-toolbar .linked.stack-switcher > .button:first-child:checked,
-  .header-bar .linked.stack-switcher > .button:first-child:checked,
-  .primary-toolbar .linked.path-bar > .button:first-child:active, .header-bar .linked.path-bar > .button:first-child:active, .primary-toolbar .linked.path-bar > .button:first-child:checked, .header-bar .linked.path-bar > .button:first-child:checked {
-    box-shadow: none; }
-  .primary-toolbar .linked.stack-switcher > .button:last-child:hover,
-  .header-bar .linked.stack-switcher > .button:last-child:hover,
-  .primary-toolbar .linked.path-bar > .button:last-child:hover, .header-bar .linked.path-bar > .button:last-child:hover {
-    box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); }
-  .primary-toolbar .linked.stack-switcher > .button:last-child:active,
-  .header-bar .linked.stack-switcher > .button:last-child:active,
-  .primary-toolbar .linked.stack-switcher > .button:last-child:checked,
-  .header-bar .linked.stack-switcher > .button:last-child:checked,
-  .primary-toolbar .linked.path-bar > .button:last-child:active, .header-bar .linked.path-bar > .button:last-child:active, .primary-toolbar .linked.path-bar > .button:last-child:checked, .header-bar .linked.path-bar > .button:last-child:checked {
-    box-shadow: none; }
-  .primary-toolbar .linked.stack-switcher > .button:only-child:hover,
-  .header-bar .linked.stack-switcher > .button:only-child:hover,
-  .primary-toolbar .linked.path-bar > .button:only-child:hover, .header-bar .linked.path-bar > .button:only-child:hover {
-    box-shadow: none; }
-  .primary-toolbar .linked.stack-switcher > .button:only-child:active,
-  .header-bar .linked.stack-switcher > .button:only-child:active,
-  .primary-toolbar .linked.stack-switcher > .button:only-child:checked,
-  .header-bar .linked.stack-switcher > .button:only-child:checked,
-  .primary-toolbar .linked.path-bar > .button:only-child:active, .header-bar .linked.path-bar > .button:only-child:active, .primary-toolbar .linked.path-bar > .button:only-child:checked, .header-bar .linked.path-bar > .button:only-child:checked {
-    box-shadow: none; }
+
+.primary-toolbar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):hover,
+.header-bar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):hover,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover:not(:checked):not(:active):not(:only-child):hover, .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover:not(:checked):not(:active):not(:only-child):hover {
+  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4), inset -1px 0 rgba(21, 23, 28, 0.4); }
+
+.primary-toolbar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):first-child:hover,
+.header-bar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):first-child:hover,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
+  box-shadow: inset -1px 0 rgba(21, 23, 28, 0.4); }
+
+.primary-toolbar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):last-child:hover,
+.header-bar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):last-child:hover,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
+  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); }
+
+.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry {
+  border-left-color: rgba(21, 23, 28, 0); }
+
+.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:not(:last-child),
+.header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:not(:last-child),
+.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:last-child, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:last-child {
+  border-left-color: rgba(21, 23, 28, 0.4); }
+
+.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .entry,
+.header-bar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .entry,
+.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .button,
+.header-bar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .button,
+.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox,
+.header-bar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox,
+.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox, .header-bar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox {
+  border-left-color: rgba(21, 23, 28, 0.4); }
 
 .primary-toolbar .button.suggested-action, .header-bar .button.suggested-action {
   background-clip: border-box;
@@ -1275,21 +1307,15 @@ GtkComboBox {
     color: rgba(207, 218, 231, 0.35);
     background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.25)); }
 
-.primary-toolbar GtkComboBox.combobox-entry .entry:dir(ltr):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(ltr):focus {
-  box-shadow: none; }
-
-.primary-toolbar GtkComboBox.combobox-entry .entry:dir(rtl):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(rtl):focus {
-  box-shadow: none; }
-
-.primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr), .header-bar GtkComboBox.combobox-entry .button:dir(ltr) {
-  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); }
-  .primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(ltr):insensitive {
-    box-shadow: inset 1px 0 rgba(21, 23, 28, 0); }
+.primary-toolbar GtkComboBox.combobox-entry .entry:dir(ltr), .header-bar GtkComboBox.combobox-entry .entry:dir(ltr) {
+  border-right-style: none; }
+  .primary-toolbar GtkComboBox.combobox-entry .entry:dir(ltr):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(ltr):focus {
+    box-shadow: none; }
 
-.primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl), .header-bar GtkComboBox.combobox-entry .button:dir(rtl) {
-  box-shadow: inset -1px 0 rgba(21, 23, 28, 0.4); }
-  .primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(rtl):insensitive {
-    box-shadow: inset -1px 0 rgba(21, 23, 28, 0); }
+.primary-toolbar GtkComboBox.combobox-entry .entry:dir(rtl), .header-bar GtkComboBox.combobox-entry .entry:dir(rtl) {
+  border-left-style: none; }
+  .primary-toolbar GtkComboBox.combobox-entry .entry:dir(rtl):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(rtl):focus {
+    box-shadow: none; }
 
 .primary-toolbar GtkSwitch:backdrop, .header-bar GtkSwitch:backdrop {
   opacity: 0.75; }
@@ -2604,8 +2630,7 @@ GtkVolumeButton.button {
 .view:selected:focus,
 .view:selected:hover, .label:selected,
 .label:selected:focus,
-.label:selected:hover, .grid-child:selected, .entry:selected,
-.entry:selected:focus, .menuitem.button.flat:active, .menuitem.sidebar-button.button:active, .menuitem.button.flat:selected, .menuitem.sidebar-button.button:selected, .list-row:selected, .sidebar:selected, .sidebar .view:selected, GtkPlacesSidebar.sidebar .list-row.activatable:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected,
+.label:selected:hover, .grid-child:selected, .menuitem.button.flat:active, .menuitem.sidebar-button.button:active, .menuitem.button.flat:selected, .menuitem.sidebar-button.button:selected, .list-row:selected, .sidebar:selected, .sidebar .view:selected, GtkPlacesSidebar.sidebar .list-row.activatable:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected,
 GtkEntry.gb-command-bar-entry.entry.flat:selected:focus,
 GtkFileChooserDialog GtkPlacesSidebar.sidebar .list-row.activatable:selected,
 GtkFileChooserDialog GtkPlacesSidebar.sidebar .list-row.activatable:selected:hover,
@@ -2826,36 +2851,29 @@ NemoWindow .sidebar .frame {
 NemoWindow GtkSeparator.separator.horizontal, NemoWindow .sidebar GtkSeparator.horizontal.view.separator, .sidebar NemoWindow GtkSeparator.horizontal.view.separator {
   color: #dbdfe3; }
 
-NemoWindow .primary-toolbar NemoPathBar.linked > .button {
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button {
   color: rgba(207, 218, 231, 0.8);
   outline-color: rgba(207, 218, 231, 0.1);
   border-color: rgba(21, 23, 28, 0.4);
   background-color: rgba(95, 105, 127, 0.4); }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover {
+  NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover {
     background-color: rgba(134, 144, 165, 0.4); }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked {
+  NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: transparent;
     background-color: #5294E2; }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:insensitive {
+  NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:insensitive {
     color: rgba(207, 218, 231, 0.4); }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover {
-    box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4), inset -1px 0 rgba(21, 23, 28, 0.4); }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked {
-    box-shadow: none; }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:hover {
-    box-shadow: inset -1px 0 rgba(21, 23, 28, 0.4); }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:checked {
-    box-shadow: none; }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:hover {
-    box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:checked {
-    box-shadow: none; }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:hover {
-    box-shadow: none; }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:checked {
-    box-shadow: none; }
+
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child):hover {
+  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4), inset -1px 0 rgba(21, 23, 28, 0.4); }
+
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
+  box-shadow: inset -1px 0 rgba(21, 23, 28, 0.4); }
+
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
+  box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); }
 
 .gedit-headerbar-paned {
   color: #262a33; }
@@ -3361,7 +3379,7 @@ UnityPanelWidget,
   box-shadow: none; }
   UnityPanelWidget:backdrop,
   .unity-panel:backdrop {
-    color: #abb6c5; }
+    color: #bdc6d1; }
 
 .unity-panel.menubar.menuitem:hover,
 .unity-panel.menubar .menuitem *:hover {
@@ -3574,7 +3592,7 @@ GtkListBox .h4 {
   #content_frame .button:active, #content_frame .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: transparent;
+    border-color: #5294E2;
     background-color: #5294E2; }
   #content_frame .button:insensitive {
     color: rgba(92, 97, 108, 0.55);
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 2afcf3d..05db064 100644
--- a/common/gtk-3.0/3.18/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.18/gtk-contained-solid.css
@@ -170,6 +170,10 @@ GtkTextView {
     border-color: rgba(207, 214, 230, 0.55);
     background-color: rgba(255, 255, 255, 0.55);
     background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.55)); }
+  .entry:selected,
+  .entry:selected:focus {
+    background-color: #5294E2;
+    color: #ffffff; }
   .entry.progressbar {
     margin: 2px 12px;
     border-radius: 0;
@@ -179,17 +183,6 @@ GtkTextView {
     background-image: none;
     background-color: transparent;
     box-shadow: none; }
-  .linked > .entry:first-child {
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0; }
-    .linked > .entry:first-child:dir(rtl) {
-      border-right-style: none; }
-  .linked > .entry:last-child {
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0;
-    border-left-style: none; }
-    .linked > .entry:last-child:dir(rtl) {
-      border-left-style: solid; }
   .entry.error {
     color: white;
     border-color: #FC4138;
@@ -216,28 +209,6 @@ GtkTextView {
       color: #5c616c; }
     .entry.image:active {
       color: #5294E2; }
-  .linked.vertical > .entry {
-    border-bottom-color: #f4f5f6;
-    box-shadow: none; }
-    .linked.vertical > .entry:focus {
-      border-color: #5294E2;
-      box-shadow: 0 -1px 0 0 #5294E2; }
-    .linked.vertical > .entry:insensitive {
-      border-bottom-color: #f4f5f6; }
-    .linked.vertical > .entry:first-child {
-      border-bottom-color: #f4f5f6; }
-      .linked.vertical > .entry:first-child:focus {
-        border-bottom-color: #5294E2;
-        box-shadow: none; }
-      .linked.vertical > .entry:first-child:insensitive {
-        border-bottom-color: #f4f5f6; }
-    .linked.vertical > .entry:last-child {
-      border-bottom-color: rgba(0, 0, 0, 0.14); }
-      .linked.vertical > .entry:last-child:focus {
-        border-bottom-color: #5294E2;
-        box-shadow: 0 -1px 0 0 #5294E2; }
-      .linked.vertical > .entry:last-child:insensitive {
-        border-bottom-color: rgba(0, 0, 0, 0.14); }
   .osd .entry {
     color: #BAC3CF;
     border-color: rgba(26, 28, 34, 0.4);
@@ -546,166 +517,219 @@ GtkSearchEntry.entry {
     .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel {
       color: inherit; }
 
-.inline-toolbar.toolbar GtkToolButton > .button.flat, .inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.toolbar GtkToolButton > .sidebar-button.button, .inline-toolbar GtkToolButton > .sidebar-button.button, .osd .button:hover, .osd .button:active, .osd .button:checked, .osd .button:insensitive, .inline-toolbar .button, .inline-toolbar .button:backdrop, .linked > .button,
-.linked > .button:hover,
-.linked > .button:active,
-.linked > .button:checked, GtkComboBox.combobox-entry .entry, GtkComboBox.combobox-entry .the-button-in-the-combobox, .primary-toolbar .linked.stack-switcher > .button,
-.header-bar .linked.stack-switcher > .button,
-.primary-toolbar .linked.path-bar > .button, .header-bar .linked.path-bar > .button, NemoWindow .primary-toolbar NemoPathBar.linked > .button, .linked > GtkComboBox > .the-button-in-the-combobox:dir(ltr) {
+.linked:not(.vertical):not(.pathbar) > .entry + .entry {
+  border-left-color: rgba(207, 214, 230, 0.3); }
+
+.linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:not(:last-child),
+.linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:last-child {
+  border-left-color: #5294E2; }
+
+.linked:not(.vertical):not(.pathbar) > .entry + .button,
+.linked:not(.vertical):not(.pathbar) > .entry + .button:hover,
+.linked:not(.vertical):not(.pathbar) > .entry + .button:active,
+.linked:not(.vertical):not(.pathbar) > .entry + .button:checked,
+.linked:not(.vertical):not(.pathbar) > .entry + .button:insensitive {
+  border-left-style: solid; }
+
+.linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .entry,
+.linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .button,
+.linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox,
+.linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox {
+  border-left-color: #5294E2; }
+
+.linked:not(.vertical):not(.pathbar) > .button:hover:not(:checked):not(:active):not(:only-child),
+.linked:not(.vertical):not(.pathbar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) {
+  box-shadow: -1px 0 #cfd6e6; }
+
+.linked:not(.vertical):not(.pathbar) > .button:first-child:hover:not(:checked):not(:active) {
+  box-shadow: none; }
+
+.linked:not(.vertical):not(.pathbar) > .button:checked + .button:not(:checked):not(:active):hover {
+  box-shadow: none; }
+
+.linked:not(.vertical):not(.pathbar) > .button:checked + .entry {
+  border-left-color: #5294E2; }
+
+.linked:not(.vertical):not(.pathbar) > .entry + .button:not(:checked):not(:active):hover {
+  box-shadow: none; }
+
+.linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):hover {
+  box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4), inset -1px 0 rgba(207, 214, 230, 0.4); }
+
+.linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
+  box-shadow: inset -1px 0 rgba(207, 214, 230, 0.4); }
+
+.linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
+  box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4); }
+
+.linked.vertical > .entry + .entry {
+  border-top-color: rgba(207, 214, 230, 0.3); }
+
+.linked.vertical > .entry + .entry:focus:not(:last-child),
+.linked.vertical > .entry + .entry:focus:last-child {
+  border-top-color: #5294E2; }
+
+.linked.vertical > .entry + .button,
+.linked.vertical > .entry + .button:hover,
+.linked.vertical > .entry + .button:active,
+.linked.vertical > .entry + .button:checked,
+.linked.vertical > .entry + .button:insensitive {
+  border-top-style: solid; }
+
+.linked.vertical > .entry:focus:not(:only-child) + .entry,
+.linked.vertical > .entry:focus:not(:only-child) + .button,
+.linked.vertical > .entry:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox,
+.linked.vertical > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox {
+  border-top-color: #5294E2; }
+
+.linked.vertical > .button:hover:not(:checked):not(:active):not(:only-child),
+.linked.vertical > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) {
+  box-shadow: 0 -1px #cfd6e6; }
+
+.linked.vertical > .button:first-child:hover:not(:checked):not(:active) {
+  box-shadow: none; }
+
+.linked.vertical > .button:checked + .button:not(:checked):not(:active):hover {
+  box-shadow: none; }
+
+.linked.vertical > .button:checked + .entry {
+  border-top-color: #5294E2; }
+
+.linked.vertical > .entry + .button:not(:checked):not(:active):hover {
+  box-shadow: none; }
+
+.inline-toolbar.toolbar GtkToolButton > .button.flat, .inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.toolbar GtkToolButton > .sidebar-button.button, .inline-toolbar GtkToolButton > .sidebar-button.button, .osd .button:hover, .osd .button:active, .osd .button:checked, .osd .button:insensitive, .inline-toolbar .button, .inline-toolbar .button:backdrop, .linked:not(.vertical) > .button,
+.linked:not(.vertical) > .button:hover,
+.linked:not(.vertical) > .button:active,
+.linked:not(.vertical) > .button:checked, .linked:not(.vertical):not(.pathbar) > .entry, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button,
+.primary-toolbar .linked:not(.vertical).path-bar > .button,
+.header-bar .linked:not(.vertical).path-bar > .button,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:hover,
+.header-bar .linked:not(.vertical).path-bar > .button:hover,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:active,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:active,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:active,
+.header-bar .linked:not(.vertical).path-bar > .button:active,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:checked,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:checked,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:checked,
+.header-bar .linked:not(.vertical).path-bar > .button:checked,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:insensitive,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:insensitive,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:insensitive, .header-bar .linked:not(.vertical).path-bar > .button:insensitive, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:active,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:checked,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:insensitive, .linked > GtkComboBox > .the-button-in-the-combobox:dir(ltr),
+.linked > GtkComboBox > .the-button-in-the-combobox:dir(rtl),
+.linked > GtkComboBoxText > .the-button-in-the-combobox:dir(ltr),
+.linked > GtkComboBoxText > .the-button-in-the-combobox:dir(rtl) {
   border-radius: 0;
-  border-left-style: none;
   border-right-style: none; }
-  .inline-toolbar GtkToolButton > .button.flat:hover, .inline-toolbar GtkToolButton > .sidebar-button.button:hover, .osd .button:hover, .inline-toolbar .button:hover, .linked > .button:hover,
-  GtkComboBox.combobox-entry .entry:hover, GtkComboBox.combobox-entry .the-button-in-the-combobox:hover, .primary-toolbar .linked.stack-switcher > .button:hover,
-  .header-bar .linked.stack-switcher > .button:hover,
-  .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover, .linked > GtkComboBox > .the-button-in-the-combobox:hover:dir(ltr) {
-    box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4), inset -1px 0 rgba(207, 214, 230, 0.4); }
-  .inline-toolbar GtkToolButton > .button.flat:active, .inline-toolbar GtkToolButton > .sidebar-button.button:active, .osd .button:active, .inline-toolbar .button:active, .linked > .button:active,
-  GtkComboBox.combobox-entry .entry:active, GtkComboBox.combobox-entry .the-button-in-the-combobox:active, .primary-toolbar .linked.stack-switcher > .button:active,
-  .header-bar .linked.stack-switcher > .button:active,
-  .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, .linked > GtkComboBox > .the-button-in-the-combobox:active:dir(ltr), .inline-toolbar GtkToolButton > .button.flat:checked, .inline-toolbar GtkToolButton > .sidebar-button.button:checked, .osd .button:checked, .inline-toolbar .button:checked, .linked > .button:checked,
-  GtkComboBox.combobox-entry .entry:checked, GtkComboBox.combobox-entry .the-button-in-the-combobox:checked, .primary-toolbar .linked.stack-switcher > .button:checked,
-  .header-bar .linked.stack-switcher > .button:checked,
-  .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked, .linked > GtkComboBox > .the-button-in-the-combobox:checked:dir(ltr) {
-    box-shadow: none; }
-  .inline-toolbar GtkToolButton > .button.flat:dir(rtl), .inline-toolbar GtkToolButton > .sidebar-button.button:dir(rtl), .inline-toolbar.toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar.toolbar GtkToolButton:dir(rtl) > .sidebar-button.button, .inline-toolbar GtkToolButton:dir(rtl) > .sidebar-button.button, .osd .button:dir(rtl):hover, .osd .button:dir(rtl):active, .osd .button:dir(rtl):checked, .osd .button:dir(rtl):insensitive, .inline-toolbar .button:dir(rtl), .linked > .button:dir(rtl),
-  GtkComboBox.combobox-entry .entry:dir(rtl), GtkComboBox.combobox-entry .the-button-in-the-combobox:dir(rtl), .primary-toolbar .linked.stack-switcher > .button:dir(rtl),
-  .header-bar .linked.stack-switcher > .button:dir(rtl),
-  .primary-toolbar .linked.path-bar > .button:dir(rtl), .header-bar .linked.path-bar > .button:dir(rtl), NemoWindow .primary-toolbar NemoPathBar.linked > .button:dir(rtl), .linked > GtkComboBox > .the-button-in-the-combobox:dir(rtl) {
-    border-radius: 0; }
 
-.osd .button:first-child:hover, .osd .button:first-child:active, .osd .button:first-child:checked, .osd .button:first-child:insensitive, .inline-toolbar .button:first-child, .linked > .button:first-child,
-.inline-toolbar.toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar.toolbar GtkToolButton:first-child > .sidebar-button.button, .inline-toolbar GtkToolButton:first-child > .sidebar-button.button, GtkComboBox.combobox-entry .entry:first-child, GtkComboBox.combobox-entry .the-button-in-the-combobox:first-child, .linked > GtkComboBox:first-child > .the-button-in-the-combobox, .primary-toolbar .linked.stack-switcher > .button:first-child,
-.header-bar .linked.stack-switcher > .button:first-child,
-.primary-toolbar .linked.path-bar > .button:first-child, .header-bar .linked.path-bar > .button:first-child, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child {
-  border-radius: 3px 0 0 3px;
-  border-left-style: solid; }
-  .osd .button:first-child:hover, .inline-toolbar .button:first-child:hover, .linked > .button:first-child:hover,
-  .inline-toolbar GtkToolButton:first-child > .button.flat:hover, .inline-toolbar GtkToolButton:first-child > .sidebar-button.button:hover, GtkComboBox.combobox-entry .entry:first-child:hover, GtkComboBox.combobox-entry .the-button-in-the-combobox:first-child:hover, .linked > GtkComboBox:first-child > .the-button-in-the-combobox:hover, .primary-toolbar .linked.stack-switcher > .button:first-child:hover,
-  .header-bar .linked.stack-switcher > .button:first-child:hover,
-  .primary-toolbar .linked.path-bar > .button:first-child:hover, .header-bar .linked.path-bar > .button:first-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:hover {
-    box-shadow: inset -1px 0 rgba(207, 214, 230, 0.4); }
-  .osd .button:first-child:active, .inline-toolbar .button:first-child:active, .linked > .button:first-child:active,
-  .inline-toolbar GtkToolButton:first-child > .button.flat:active, .inline-toolbar GtkToolButton:first-child > .sidebar-button.button:active, GtkComboBox.combobox-entry .entry:first-child:active, GtkComboBox.combobox-entry .the-button-in-the-combobox:first-child:active, .linked > GtkComboBox:first-child > .the-button-in-the-combobox:active, .primary-toolbar .linked.stack-switcher > .button:first-child:active,
-  .header-bar .linked.stack-switcher > .button:first-child:active,
-  .primary-toolbar .linked.path-bar > .button:first-child:active, .header-bar .linked.path-bar > .button:first-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:active, .osd .button:first-child:checked, .inline-toolbar .button:first-child:checked, .linked > .button:first-child:checked,
-  .inline-toolbar GtkToolButton:first-child > .button.flat:checked, .inline-toolbar GtkToolButton:first-child > .sidebar-button.button:checked, GtkComboBox.combobox-entry .entry:first-child:checked, GtkComboBox.combobox-entry .the-button-in-the-combobox:first-child:checked, .linked > GtkComboBox:first-child > .the-button-in-the-combobox:checked, .primary-toolbar .linked.stack-switcher > .button:first-child:checked,
-  .header-bar .linked.stack-switcher > .button:first-child:checked,
-  .primary-toolbar .linked.path-bar > .button:first-child:checked, .header-bar .linked.path-bar > .button:first-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:checked {
-    box-shadow: none; }
+.osd .button:first-child:hover, .osd .button:first-child:active, .osd .button:first-child:checked, .osd .button:first-child:insensitive, .inline-toolbar .button:first-child, .linked:not(.vertical) > .button:first-child,
+.inline-toolbar.toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar.toolbar GtkToolButton:first-child > .sidebar-button.button, .inline-toolbar GtkToolButton:first-child > .sidebar-button.button, .linked:not(.vertical):not(.pathbar) > .entry:first-child, .linked > GtkComboBox:first-child > .the-button-in-the-combobox,
+.linked > GtkComboBoxText:first-child > .the-button-in-the-combobox, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:first-child,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:first-child,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:first-child,
+.header-bar .linked:not(.vertical).path-bar > .button:first-child,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:first-child {
+  border-top-left-radius: 3px;
+  border-bottom-left-radius: 3px; }
 
-.osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .inline-toolbar .button:last-child, .linked > .button:last-child,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar.toolbar GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar GtkToolButton:last-child > .sidebar-button.button, GtkComboBox.combobox-entry .entry:last-child, GtkComboBox.combobox-entry .the-button-in-the-combobox:last-child, .linked > GtkComboBox:last-child > .the-button-in-the-combobox, .primary-toolbar .linked.stack-switcher > .button:last-child,
-.header-bar .linked.stack-switcher > .button:last-child,
-.primary-toolbar .linked.path-bar > .button:last-child, .header-bar .linked.path-bar > .button:last-child, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child {
-  border-radius: 0 3px 3px 0;
+.osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .inline-toolbar .button:last-child, .linked:not(.vertical) > .button:last-child,
+.inline-toolbar.toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar.toolbar GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar GtkToolButton:last-child > .sidebar-button.button, .linked:not(.vertical):not(.pathbar) > .entry:last-child, .linked > GtkComboBox:last-child > .the-button-in-the-combobox,
+.linked > GtkComboBoxText:last-child > .the-button-in-the-combobox, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:last-child,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:last-child,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:last-child,
+.header-bar .linked:not(.vertical).path-bar > .button:last-child,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:last-child {
+  border-top-right-radius: 3px;
+  border-bottom-right-radius: 3px;
   border-right-style: solid; }
-  .osd .button:last-child:hover, .inline-toolbar .button:last-child:hover, .linked > .button:last-child:hover,
-  .inline-toolbar GtkToolButton:last-child > .button.flat:hover, .inline-toolbar GtkToolButton:last-child > .sidebar-button.button:hover, GtkComboBox.combobox-entry .entry:last-child:hover, GtkComboBox.combobox-entry .the-button-in-the-combobox:last-child:hover, .linked > GtkComboBox:last-child > .the-button-in-the-combobox:hover, .primary-toolbar .linked.stack-switcher > .button:last-child:hover,
-  .header-bar .linked.stack-switcher > .button:last-child:hover,
-  .primary-toolbar .linked.path-bar > .button:last-child:hover, .header-bar .linked.path-bar > .button:last-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:hover {
-    box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4); }
-  .osd .button:last-child:active, .inline-toolbar .button:last-child:active, .linked > .button:last-child:active,
-  .inline-toolbar GtkToolButton:last-child > .button.flat:active, .inline-toolbar GtkToolButton:last-child > .sidebar-button.button:active, GtkComboBox.combobox-entry .entry:last-child:active, GtkComboBox.combobox-entry .the-button-in-the-combobox:last-child:active, .linked > GtkComboBox:last-child > .the-button-in-the-combobox:active, .primary-toolbar .linked.stack-switcher > .button:last-child:active,
-  .header-bar .linked.stack-switcher > .button:last-child:active,
-  .primary-toolbar .linked.path-bar > .button:last-child:active, .header-bar .linked.path-bar > .button:last-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:active, .osd .button:last-child:checked, .inline-toolbar .button:last-child:checked, .linked > .button:last-child:checked,
-  .inline-toolbar GtkToolButton:last-child > .button.flat:checked, .inline-toolbar GtkToolButton:last-child > .sidebar-button.button:checked, GtkComboBox.combobox-entry .entry:last-child:checked, GtkComboBox.combobox-entry .the-button-in-the-combobox:last-child:checked, .linked > GtkComboBox:last-child > .the-button-in-the-combobox:checked, .primary-toolbar .linked.stack-switcher > .button:last-child:checked,
-  .header-bar .linked.stack-switcher > .button:last-child:checked,
-  .primary-toolbar .linked.path-bar > .button:last-child:checked, .header-bar .linked.path-bar > .button:last-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:checked {
-    box-shadow: none; }
-  .osd .button:last-child:dir(rtl):hover, .osd .button:last-child:dir(rtl):active, .osd .button:last-child:dir(rtl):checked, .osd .button:last-child:dir(rtl):insensitive, .inline-toolbar .button:last-child:dir(rtl), .linked > .button:last-child:dir(rtl),
-  .inline-toolbar GtkToolButton:last-child > .button.flat:dir(rtl), .inline-toolbar GtkToolButton:last-child > .sidebar-button.button:dir(rtl), .inline-toolbar.toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar.toolbar GtkToolButton:last-child:dir(rtl) > .sidebar-button.button, .inline-toolbar GtkToolButton:last-child:dir(rtl) > .sidebar-button.button, GtkComboBox.combobox-entry .entry:last-child:dir(rtl), GtkComboBox.combobox-entry .the-button-in-the-combobox:last-child:dir(rtl), .linked > GtkComboBox:last-child > .the-button-in-the-combobox:dir(rtl), .primary-toolbar .linked.stack-switcher > .button:last-child:dir(rtl),
-  .header-bar .linked.stack-switcher > .button:last-child:dir(rtl),
-  .primary-toolbar .linked.path-bar > .button:last-child:dir(rtl), .header-bar .linked.path-bar > .button:last-child:dir(rtl), NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:dir(rtl) {
-    border-bottom-left-radius: 0; }
 
-.osd .button:only-child:hover, .osd .button:only-child:active, .osd .button:only-child:checked, .osd .button:only-child:insensitive, .inline-toolbar .button:only-child, .linked > .button:only-child,
-.inline-toolbar.toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar.toolbar GtkToolButton:only-child > .sidebar-button.button, .inline-toolbar GtkToolButton:only-child > .sidebar-button.button, GtkComboBox.combobox-entry .entry:only-child, GtkComboBox.combobox-entry .the-button-in-the-combobox:only-child, .linked > GtkComboBox:only-child > .the-button-in-the-combobox, .primary-toolbar .linked.stack-switcher > .button:only-child,
-.header-bar .linked.stack-switcher > .button:only-child,
-.primary-toolbar .linked.path-bar > .button:only-child, .header-bar .linked.path-bar > .button:only-child, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child {
+.osd .button:only-child:hover, .osd .button:only-child:active, .osd .button:only-child:checked, .osd .button:only-child:insensitive, .inline-toolbar .button:only-child, .linked:not(.vertical) > .button:only-child,
+.inline-toolbar.toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar.toolbar GtkToolButton:only-child > .sidebar-button.button, .inline-toolbar GtkToolButton:only-child > .sidebar-button.button, .linked:not(.vertical):not(.pathbar) > .entry:only-child, .linked > GtkComboBox:only-child > .the-button-in-the-combobox,
+.linked > GtkComboBoxText:only-child > .the-button-in-the-combobox, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:only-child,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:only-child,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:only-child,
+.header-bar .linked:not(.vertical).path-bar > .button:only-child,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:only-child {
   border-radius: 3px;
   border-style: solid; }
-  .osd .button:only-child:hover, .inline-toolbar .button:only-child:hover, .linked > .button:only-child:hover,
-  .inline-toolbar GtkToolButton:only-child > .button.flat:hover, .inline-toolbar GtkToolButton:only-child > .sidebar-button.button:hover, GtkComboBox.combobox-entry .entry:only-child:hover, GtkComboBox.combobox-entry .the-button-in-the-combobox:only-child:hover, .linked > GtkComboBox:only-child > .the-button-in-the-combobox:hover, .primary-toolbar .linked.stack-switcher > .button:only-child:hover,
-  .header-bar .linked.stack-switcher > .button:only-child:hover,
-  .primary-toolbar .linked.path-bar > .button:only-child:hover, .header-bar .linked.path-bar > .button:only-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:hover {
-    box-shadow: none; }
-  .osd .button:only-child:active, .inline-toolbar .button:only-child:active, .linked > .button:only-child:active,
-  .inline-toolbar GtkToolButton:only-child > .button.flat:active, .inline-toolbar GtkToolButton:only-child > .sidebar-button.button:active, GtkComboBox.combobox-entry .entry:only-child:active, GtkComboBox.combobox-entry .the-button-in-the-combobox:only-child:active, .linked > GtkComboBox:only-child > .the-button-in-the-combobox:active, .primary-toolbar .linked.stack-switcher > .button:only-child:active,
-  .header-bar .linked.stack-switcher > .button:only-child:active,
-  .primary-toolbar .linked.path-bar > .button:only-child:active, .header-bar .linked.path-bar > .button:only-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:active, .osd .button:only-child:checked, .inline-toolbar .button:only-child:checked, .linked > .button:only-child:checked,
-  .inline-toolbar GtkToolButton:only-child > .button.flat:checked, .inline-toolbar GtkToolButton:only-child > .sidebar-button.button:checked, GtkComboBox.combobox-entry .entry:only-child:checked, GtkComboBox.combobox-entry .the-button-in-the-combobox:only-child:checked, .linked > GtkComboBox:only-child > .the-button-in-the-combobox:checked, .primary-toolbar .linked.stack-switcher > .button:only-child:checked,
-  .header-bar .linked.stack-switcher > .button:only-child:checked,
-  .primary-toolbar .linked.path-bar > .button:only-child:checked, .header-bar .linked.path-bar > .button:only-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:checked {
-    box-shadow: none; }
 
-.linked.vertical > .entry, .linked.vertical > .entry:focus, .linked.vertical > .entry:insensitive, .linked.vertical > .button,
+.linked.vertical > .button,
 .linked.vertical > .button:hover,
 .linked.vertical > .button:active,
-.linked.vertical > .button:checked, .linked.vertical > GtkComboBoxText > .the-button-in-the-combobox,
+.linked.vertical > .button:checked, .linked.vertical > .entry, .linked.vertical > GtkComboBoxText > .the-button-in-the-combobox,
 .linked.vertical > GtkComboBox > .the-button-in-the-combobox {
-  border-style: solid;
-  border-bottom-style: none;
-  border-top-style: none;
-  border-radius: 0; }
-  .linked.vertical > .entry:hover, .linked.vertical > .button:hover,
-  .linked.vertical > GtkComboBoxText > .the-button-in-the-combobox:hover,
-  .linked.vertical > GtkComboBox > .the-button-in-the-combobox:hover {
-    box-shadow: inset 0 -1px rgba(207, 214, 230, 0.4), inset 0 1px rgba(207, 214, 230, 0.4); }
-  .linked.vertical > .entry:active, .linked.vertical > .button:active,
-  .linked.vertical > GtkComboBoxText > .the-button-in-the-combobox:active,
-  .linked.vertical > GtkComboBox > .the-button-in-the-combobox:active, .linked.vertical > .entry:checked, .linked.vertical > .button:checked,
-  .linked.vertical > GtkComboBoxText > .the-button-in-the-combobox:checked,
-  .linked.vertical > GtkComboBox > .the-button-in-the-combobox:checked {
-    box-shadow: none; }
+  border-radius: 0;
+  border-bottom-style: none; }
 
-.linked.vertical > .entry:first-child, .linked.vertical > .button:first-child,
-.linked.vertical > GtkComboBoxText:first-child > .the-button-in-the-combobox,
+.linked.vertical > .button:first-child,
+.linked.vertical > .entry:first-child, .linked.vertical > GtkComboBoxText:first-child > .the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:first-child > .the-button-in-the-combobox {
-  border-radius: 3px 3px 0 0;
-  border-top-style: solid; }
-  .linked.vertical > .entry:first-child:hover, .linked.vertical > .button:first-child:hover,
-  .linked.vertical > GtkComboBoxText:first-child > .the-button-in-the-combobox:hover,
-  .linked.vertical > GtkComboBox:first-child > .the-button-in-the-combobox:hover {
-    box-shadow: inset 0 -1px rgba(207, 214, 230, 0.4); }
-  .linked.vertical > .entry:first-child:active, .linked.vertical > .button:first-child:active,
-  .linked.vertical > GtkComboBoxText:first-child > .the-button-in-the-combobox:active,
-  .linked.vertical > GtkComboBox:first-child > .the-button-in-the-combobox:active, .linked.vertical > .entry:first-child:checked, .linked.vertical > .button:first-child:checked,
-  .linked.vertical > GtkComboBoxText:first-child > .the-button-in-the-combobox:checked,
-  .linked.vertical > GtkComboBox:first-child > .the-button-in-the-combobox:checked {
-    box-shadow: none; }
+  border-top-left-radius: 3px;
+  border-top-right-radius: 3px; }
 
-.linked.vertical > .entry:last-child, .linked.vertical > .button:last-child,
-.linked.vertical > GtkComboBoxText:last-child > .the-button-in-the-combobox,
+.linked.vertical > .button:last-child,
+.linked.vertical > .entry:last-child, .linked.vertical > GtkComboBoxText:last-child > .the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:last-child > .the-button-in-the-combobox {
-  border-radius: 0 0 3px 3px;
+  border-bottom-left-radius: 3px;
+  border-bottom-right-radius: 3px;
   border-bottom-style: solid; }
-  .linked.vertical > .entry:last-child:hover, .linked.vertical > .button:last-child:hover,
-  .linked.vertical > GtkComboBoxText:last-child > .the-button-in-the-combobox:hover,
-  .linked.vertical > GtkComboBox:last-child > .the-button-in-the-combobox:hover {
-    box-shadow: inset 0 1px rgba(207, 214, 230, 0.4); }
-  .linked.vertical > .entry:last-child:active, .linked.vertical > .button:last-child:active,
-  .linked.vertical > GtkComboBoxText:last-child > .the-button-in-the-combobox:active,
-  .linked.vertical > GtkComboBox:last-child > .the-button-in-the-combobox:active, .linked.vertical > .entry:last-child:checked, .linked.vertical > .button:last-child:checked,
-  .linked.vertical > GtkComboBoxText:last-child > .the-button-in-the-combobox:checked,
-  .linked.vertical > GtkComboBox:last-child > .the-button-in-the-combobox:checked {
-    box-shadow: none; }
 
-.linked.vertical > .entry:only-child, .linked.vertical > .button:only-child,
-.linked.vertical > GtkComboBoxText:only-child > .the-button-in-the-combobox,
+.linked.vertical > .button:only-child,
+.linked.vertical > .entry:only-child, .linked.vertical > GtkComboBoxText:only-child > .the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:only-child > .the-button-in-the-combobox {
   border-radius: 3px;
   border-style: solid; }
-  .linked.vertical > .entry:only-child:hover, .linked.vertical > .button:only-child:hover,
-  .linked.vertical > GtkComboBoxText:only-child > .the-button-in-the-combobox:hover,
-  .linked.vertical > GtkComboBox:only-child > .the-button-in-the-combobox:hover {
-    box-shadow: none; }
-  .linked.vertical > .entry:only-child:active, .linked.vertical > .button:only-child:active,
-  .linked.vertical > GtkComboBoxText:only-child > .the-button-in-the-combobox:active,
-  .linked.vertical > GtkComboBox:only-child > .the-button-in-the-combobox:active, .linked.vertical > .entry:only-child:checked, .linked.vertical > .button:only-child:checked,
-  .linked.vertical > GtkComboBoxText:only-child > .the-button-in-the-combobox:checked,
-  .linked.vertical > GtkComboBox:only-child > .the-button-in-the-combobox:checked {
-    box-shadow: none; }
+
+.linked:not(.vertical) > .button,
+.linked:not(.vertical) > .button:hover,
+.linked:not(.vertical) > .button:active,
+.linked:not(.vertical) > .button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button,
+.primary-toolbar .linked:not(.vertical).path-bar > .button,
+.header-bar .linked:not(.vertical).path-bar > .button,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:hover,
+.header-bar .linked:not(.vertical).path-bar > .button:hover,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:active,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:active,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:active,
+.header-bar .linked:not(.vertical).path-bar > .button:active,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:checked,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:checked,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:checked,
+.header-bar .linked:not(.vertical).path-bar > .button:checked,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:insensitive,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:insensitive,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:insensitive, .header-bar .linked:not(.vertical).path-bar > .button:insensitive, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:active,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:checked,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:insensitive {
+  border-left-style: none; }
+  .linked:not(.vertical) > .button:first-child,
+  .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:first-child,
+  .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:first-child,
+  .primary-toolbar .linked:not(.vertical).path-bar > .button:first-child,
+  .header-bar .linked:not(.vertical).path-bar > .button:first-child,
+  NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:first-child {
+    border-left-style: solid; }
+
+.linked.vertical > .button,
+.linked.vertical > .button:hover,
+.linked.vertical > .button:active,
+.linked.vertical > .button:checked {
+  border-top-style: none; }
+  .linked.vertical > .button:first-child {
+    border-top-style: solid; }
 
 .menuitem.button.flat, .menuitem.sidebar-button.button, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .app-notification .button.flat,
 .app-notification .sidebar-button.button,
@@ -845,21 +869,23 @@ GtkComboBox {
   GtkComboBox .separator.vertical, GtkComboBox .sidebar .vertical.view.separator, .sidebar GtkComboBox .vertical.view.separator {
     -GtkWidget-wide-separators: true; }
   GtkComboBox.combobox-entry .entry:dir(ltr) {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
     border-right-style: none; }
     GtkComboBox.combobox-entry .entry:dir(ltr):focus {
       box-shadow: 1px 0 #5294E2; }
   GtkComboBox.combobox-entry .entry:dir(rtl) {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
     border-left-style: none; }
     GtkComboBox.combobox-entry .entry:dir(rtl):focus {
       box-shadow: -1px 0 #5294E2; }
-  GtkComboBox.combobox-entry .the-button-in-the-combobox:dir(ltr) {
-    box-shadow: inset 1px 0 #cfd6e6; }
-    GtkComboBox.combobox-entry .the-button-in-the-combobox:dir(ltr):insensitive {
-      box-shadow: inset 1px 0 rgba(207, 214, 230, 0.55); }
-  GtkComboBox.combobox-entry .the-button-in-the-combobox:dir(rtl) {
-    box-shadow: inset -1px 0 #cfd6e6; }
-    GtkComboBox.combobox-entry .the-button-in-the-combobox:dir(rtl):insensitive {
-      box-shadow: inset -1px 0 rgba(207, 214, 230, 0.55); }
+  GtkComboBox.combobox-entry .button:dir(ltr) {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0; }
+  GtkComboBox.combobox-entry .button:dir(rtl) {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0; }
 
 /************
  * Toolbars *
@@ -1092,77 +1118,83 @@ GtkComboBox {
     border-color: rgba(82, 148, 226, 0.65);
     background-color: rgba(82, 148, 226, 0.65); }
 
-.primary-toolbar .linked > .button, .header-bar .linked > .button {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button,
+.header-bar .linked:not(.vertical):not(.path-bar) > .button,
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover,
+.header-bar .linked:not(.vertical):not(.path-bar) > .button:hover,
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:active,
+.header-bar .linked:not(.vertical):not(.path-bar) > .button:active,
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:checked,
+.header-bar .linked:not(.vertical):not(.path-bar) > .button:checked,
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:insensitive, .header-bar .linked:not(.vertical):not(.path-bar) > .button:insensitive {
   border-radius: 3px;
   border-style: solid; }
 
-.primary-toolbar .linked > .button:hover, .header-bar .linked > .button:hover {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child),
+.header-bar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child),
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active),
+.header-bar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active),
+.primary-toolbar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child),
+.header-bar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child),
+.primary-toolbar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active), .header-bar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) {
   box-shadow: none; }
 
-.primary-toolbar .linked.stack-switcher > .button,
-.header-bar .linked.stack-switcher > .button,
-.primary-toolbar .linked.path-bar > .button, .header-bar .linked.path-bar > .button {
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button,
+.primary-toolbar .linked:not(.vertical).path-bar > .button, .header-bar .linked:not(.vertical).path-bar > .button {
   color: rgba(82, 93, 118, 0.8);
   outline-color: rgba(82, 93, 118, 0.1);
   border-color: rgba(82, 93, 118, 0.1);
   background-color: rgba(251, 251, 252, 0.9); }
-  .primary-toolbar .linked.stack-switcher > .button:hover,
-  .header-bar .linked.stack-switcher > .button:hover,
-  .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover {
+  .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover,
+  .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover,
+  .primary-toolbar .linked:not(.vertical).path-bar > .button:hover, .header-bar .linked:not(.vertical).path-bar > .button:hover {
     background-color: rgba(255, 255, 255, 0.9); }
-  .primary-toolbar .linked.stack-switcher > .button:active,
-  .header-bar .linked.stack-switcher > .button:active,
-  .primary-toolbar .linked.stack-switcher > .button:checked,
-  .header-bar .linked.stack-switcher > .button:checked,
-  .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked {
+  .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:active,
+  .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:active,
+  .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:checked,
+  .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:checked,
+  .primary-toolbar .linked:not(.vertical).path-bar > .button:active, .header-bar .linked:not(.vertical).path-bar > .button:active, .primary-toolbar .linked:not(.vertical).path-bar > .button:checked, .header-bar .linked:not(.vertical).path-bar > .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #5294E2;
     background-color: #5294E2; }
-  .primary-toolbar .linked.stack-switcher > .button:insensitive,
-  .header-bar .linked.stack-switcher > .button:insensitive,
-  .primary-toolbar .linked.path-bar > .button:insensitive, .header-bar .linked.path-bar > .button:insensitive {
+  .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:insensitive,
+  .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:insensitive,
+  .primary-toolbar .linked:not(.vertical).path-bar > .button:insensitive, .header-bar .linked:not(.vertical).path-bar > .button:insensitive {
     color: rgba(82, 93, 118, 0.4); }
-  .primary-toolbar .linked.stack-switcher > .button:hover,
-  .header-bar .linked.stack-switcher > .button:hover,
-  .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover {
-    box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1), inset -1px 0 rgba(82, 93, 118, 0.1); }
-  .primary-toolbar .linked.stack-switcher > .button:active,
-  .header-bar .linked.stack-switcher > .button:active,
-  .primary-toolbar .linked.stack-switcher > .button:checked,
-  .header-bar .linked.stack-switcher > .button:checked,
-  .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked {
-    box-shadow: none; }
-  .primary-toolbar .linked.stack-switcher > .button:first-child:hover,
-  .header-bar .linked.stack-switcher > .button:first-child:hover,
-  .primary-toolbar .linked.path-bar > .button:first-child:hover, .header-bar .linked.path-bar > .button:first-child:hover {
-    box-shadow: inset -1px 0 rgba(82, 93, 118, 0.1); }
-  .primary-toolbar .linked.stack-switcher > .button:first-child:active,
-  .header-bar .linked.stack-switcher > .button:first-child:active,
-  .primary-toolbar .linked.stack-switcher > .button:first-child:checked,
-  .header-bar .linked.stack-switcher > .button:first-child:checked,
-  .primary-toolbar .linked.path-bar > .button:first-child:active, .header-bar .linked.path-bar > .button:first-child:active, .primary-toolbar .linked.path-bar > .button:first-child:checked, .header-bar .linked.path-bar > .button:first-child:checked {
-    box-shadow: none; }
-  .primary-toolbar .linked.stack-switcher > .button:last-child:hover,
-  .header-bar .linked.stack-switcher > .button:last-child:hover,
-  .primary-toolbar .linked.path-bar > .button:last-child:hover, .header-bar .linked.path-bar > .button:last-child:hover {
-    box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); }
-  .primary-toolbar .linked.stack-switcher > .button:last-child:active,
-  .header-bar .linked.stack-switcher > .button:last-child:active,
-  .primary-toolbar .linked.stack-switcher > .button:last-child:checked,
-  .header-bar .linked.stack-switcher > .button:last-child:checked,
-  .primary-toolbar .linked.path-bar > .button:last-child:active, .header-bar .linked.path-bar > .button:last-child:active, .primary-toolbar .linked.path-bar > .button:last-child:checked, .header-bar .linked.path-bar > .button:last-child:checked {
-    box-shadow: none; }
-  .primary-toolbar .linked.stack-switcher > .button:only-child:hover,
-  .header-bar .linked.stack-switcher > .button:only-child:hover,
-  .primary-toolbar .linked.path-bar > .button:only-child:hover, .header-bar .linked.path-bar > .button:only-child:hover {
-    box-shadow: none; }
-  .primary-toolbar .linked.stack-switcher > .button:only-child:active,
-  .header-bar .linked.stack-switcher > .button:only-child:active,
-  .primary-toolbar .linked.stack-switcher > .button:only-child:checked,
-  .header-bar .linked.stack-switcher > .button:only-child:checked,
-  .primary-toolbar .linked.path-bar > .button:only-child:active, .header-bar .linked.path-bar > .button:only-child:active, .primary-toolbar .linked.path-bar > .button:only-child:checked, .header-bar .linked.path-bar > .button:only-child:checked {
-    box-shadow: none; }
+
+.primary-toolbar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):hover,
+.header-bar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):hover,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover:not(:checked):not(:active):not(:only-child):hover, .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover:not(:checked):not(:active):not(:only-child):hover {
+  box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1), inset -1px 0 rgba(82, 93, 118, 0.1); }
+
+.primary-toolbar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):first-child:hover,
+.header-bar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):first-child:hover,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
+  box-shadow: inset -1px 0 rgba(82, 93, 118, 0.1); }
+
+.primary-toolbar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):last-child:hover,
+.header-bar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):last-child:hover,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
+  box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); }
+
+.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry {
+  border-left-color: rgba(82, 93, 118, 0); }
+
+.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:not(:last-child),
+.header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:not(:last-child),
+.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:last-child, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:last-child {
+  border-left-color: #5294E2; }
+
+.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .entry,
+.header-bar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .entry,
+.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .button,
+.header-bar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .button,
+.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox,
+.header-bar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox,
+.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox, .header-bar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox {
+  border-left-color: #5294E2; }
 
 .primary-toolbar .button.suggested-action, .header-bar .button.suggested-action {
   background-clip: border-box;
@@ -1275,21 +1307,19 @@ GtkComboBox {
     color: rgba(82, 93, 118, 0.35);
     background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.75)); }
 
-.primary-toolbar GtkComboBox.combobox-entry .entry:dir(ltr):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(ltr):focus {
-  box-shadow: none; }
-
-.primary-toolbar GtkComboBox.combobox-entry .entry:dir(rtl):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(rtl):focus {
-  box-shadow: none; }
-
-.primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr), .header-bar GtkComboBox.combobox-entry .button:dir(ltr) {
-  box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); }
-  .primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(ltr):insensitive {
-    box-shadow: inset 1px 0 rgba(82, 93, 118, 0); }
+.primary-toolbar GtkComboBox.combobox-entry .entry:dir(ltr), .header-bar GtkComboBox.combobox-entry .entry:dir(ltr) {
+  border-right-style: none; }
+  .primary-toolbar GtkComboBox.combobox-entry .entry:dir(ltr):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(ltr):focus {
+    box-shadow: none; }
+  .primary-toolbar GtkComboBox.combobox-entry .entry:dir(ltr):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(ltr):focus {
+    box-shadow: 1px 0 #5294E2; }
 
-.primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl), .header-bar GtkComboBox.combobox-entry .button:dir(rtl) {
-  box-shadow: inset -1px 0 rgba(82, 93, 118, 0.1); }
-  .primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(rtl):insensitive {
-    box-shadow: inset -1px 0 rgba(82, 93, 118, 0); }
+.primary-toolbar GtkComboBox.combobox-entry .entry:dir(rtl), .header-bar GtkComboBox.combobox-entry .entry:dir(rtl) {
+  border-left-style: none; }
+  .primary-toolbar GtkComboBox.combobox-entry .entry:dir(rtl):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(rtl):focus {
+    box-shadow: none; }
+  .primary-toolbar GtkComboBox.combobox-entry .entry:dir(rtl):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(rtl):focus {
+    box-shadow: -1px 0 #5294E2; }
 
 .primary-toolbar GtkSwitch:backdrop, .header-bar GtkSwitch:backdrop {
   opacity: 0.75; }
@@ -2604,8 +2634,7 @@ GtkVolumeButton.button {
 .view:selected:focus,
 .view:selected:hover, .label:selected,
 .label:selected:focus,
-.label:selected:hover, .grid-child:selected, .entry:selected,
-.entry:selected:focus, .menuitem.button.flat:active, .menuitem.sidebar-button.button:active, .menuitem.button.flat:selected, .menuitem.sidebar-button.button:selected, .list-row:selected, .sidebar:selected, .sidebar .view:selected, GtkPlacesSidebar.sidebar .list-row.activatable:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected,
+.label:selected:hover, .grid-child:selected, .menuitem.button.flat:active, .menuitem.sidebar-button.button:active, .menuitem.button.flat:selected, .menuitem.sidebar-button.button:selected, .list-row:selected, .sidebar:selected, .sidebar .view:selected, GtkPlacesSidebar.sidebar .list-row.activatable:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected,
 GtkEntry.gb-command-bar-entry.entry.flat:selected:focus,
 GtkFileChooserDialog GtkPlacesSidebar.sidebar .list-row.activatable:selected,
 GtkFileChooserDialog GtkPlacesSidebar.sidebar .list-row.activatable:selected:hover,
@@ -2826,36 +2855,29 @@ NemoWindow .sidebar .frame {
 NemoWindow GtkSeparator.separator.horizontal, NemoWindow .sidebar GtkSeparator.horizontal.view.separator, .sidebar NemoWindow GtkSeparator.horizontal.view.separator {
   color: #dbdfe3; }
 
-NemoWindow .primary-toolbar NemoPathBar.linked > .button {
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button {
   color: rgba(82, 93, 118, 0.8);
   outline-color: rgba(82, 93, 118, 0.1);
   border-color: rgba(82, 93, 118, 0.1);
   background-color: rgba(251, 251, 252, 0.9); }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover {
+  NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover {
     background-color: rgba(255, 255, 255, 0.9); }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked {
+  NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #5294E2;
     background-color: #5294E2; }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:insensitive {
+  NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:insensitive {
     color: rgba(82, 93, 118, 0.4); }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover {
-    box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1), inset -1px 0 rgba(82, 93, 118, 0.1); }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked {
-    box-shadow: none; }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:hover {
-    box-shadow: inset -1px 0 rgba(82, 93, 118, 0.1); }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:checked {
-    box-shadow: none; }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:hover {
-    box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:checked {
-    box-shadow: none; }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:hover {
-    box-shadow: none; }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:checked {
-    box-shadow: none; }
+
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child):hover {
+  box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1), inset -1px 0 rgba(82, 93, 118, 0.1); }
+
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
+  box-shadow: inset -1px 0 rgba(82, 93, 118, 0.1); }
+
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
+  box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); }
 
 .gedit-headerbar-paned {
   color: #d4d5db; }
@@ -3361,7 +3383,7 @@ UnityPanelWidget,
   box-shadow: none; }
   UnityPanelWidget:backdrop,
   .unity-panel:backdrop {
-    color: #abb6c5; }
+    color: #bdc6d1; }
 
 .unity-panel.menubar.menuitem:hover,
 .unity-panel.menubar .menuitem *:hover {
diff --git a/common/gtk-3.0/3.18/gtk-contained.css b/common/gtk-3.0/3.18/gtk-contained.css
index 5e0bfc8..76f262f 100644
--- a/common/gtk-3.0/3.18/gtk-contained.css
+++ b/common/gtk-3.0/3.18/gtk-contained.css
@@ -170,6 +170,10 @@ GtkTextView {
     border-color: rgba(207, 214, 230, 0.55);
     background-color: rgba(255, 255, 255, 0.55);
     background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.55)); }
+  .entry:selected,
+  .entry:selected:focus {
+    background-color: #5294E2;
+    color: #ffffff; }
   .entry.progressbar {
     margin: 2px 12px;
     border-radius: 0;
@@ -179,17 +183,6 @@ GtkTextView {
     background-image: none;
     background-color: transparent;
     box-shadow: none; }
-  .linked > .entry:first-child {
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0; }
-    .linked > .entry:first-child:dir(rtl) {
-      border-right-style: none; }
-  .linked > .entry:last-child {
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0;
-    border-left-style: none; }
-    .linked > .entry:last-child:dir(rtl) {
-      border-left-style: solid; }
   .entry.error {
     color: white;
     border-color: #FC4138;
@@ -216,28 +209,6 @@ GtkTextView {
       color: #5c616c; }
     .entry.image:active {
       color: #5294E2; }
-  .linked.vertical > .entry {
-    border-bottom-color: #f4f5f6;
-    box-shadow: none; }
-    .linked.vertical > .entry:focus {
-      border-color: #5294E2;
-      box-shadow: 0 -1px 0 0 #5294E2; }
-    .linked.vertical > .entry:insensitive {
-      border-bottom-color: #f4f5f6; }
-    .linked.vertical > .entry:first-child {
-      border-bottom-color: #f4f5f6; }
-      .linked.vertical > .entry:first-child:focus {
-        border-bottom-color: #5294E2;
-        box-shadow: none; }
-      .linked.vertical > .entry:first-child:insensitive {
-        border-bottom-color: #f4f5f6; }
-    .linked.vertical > .entry:last-child {
-      border-bottom-color: rgba(0, 0, 0, 0.14); }
-      .linked.vertical > .entry:last-child:focus {
-        border-bottom-color: #5294E2;
-        box-shadow: 0 -1px 0 0 #5294E2; }
-      .linked.vertical > .entry:last-child:insensitive {
-        border-bottom-color: rgba(0, 0, 0, 0.14); }
   .osd .entry {
     color: #BAC3CF;
     border-color: rgba(26, 28, 34, 0.35);
@@ -546,166 +517,219 @@ GtkSearchEntry.entry {
     .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel {
       color: inherit; }
 
-.inline-toolbar.toolbar GtkToolButton > .button.flat, .inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.toolbar GtkToolButton > .sidebar-button.button, .inline-toolbar GtkToolButton > .sidebar-button.button, .osd .button:hover, .osd .button:active, .osd .button:checked, .osd .button:insensitive, .inline-toolbar .button, .inline-toolbar .button:backdrop, .linked > .button,
-.linked > .button:hover,
-.linked > .button:active,
-.linked > .button:checked, GtkComboBox.combobox-entry .entry, GtkComboBox.combobox-entry .the-button-in-the-combobox, .primary-toolbar .linked.stack-switcher > .button,
-.header-bar .linked.stack-switcher > .button,
-.primary-toolbar .linked.path-bar > .button, .header-bar .linked.path-bar > .button, NemoWindow .primary-toolbar NemoPathBar.linked > .button, .linked > GtkComboBox > .the-button-in-the-combobox:dir(ltr) {
+.linked:not(.vertical):not(.pathbar) > .entry + .entry {
+  border-left-color: rgba(207, 214, 230, 0.3); }
+
+.linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:not(:last-child),
+.linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:last-child {
+  border-left-color: #5294E2; }
+
+.linked:not(.vertical):not(.pathbar) > .entry + .button,
+.linked:not(.vertical):not(.pathbar) > .entry + .button:hover,
+.linked:not(.vertical):not(.pathbar) > .entry + .button:active,
+.linked:not(.vertical):not(.pathbar) > .entry + .button:checked,
+.linked:not(.vertical):not(.pathbar) > .entry + .button:insensitive {
+  border-left-style: solid; }
+
+.linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .entry,
+.linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .button,
+.linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox,
+.linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox {
+  border-left-color: #5294E2; }
+
+.linked:not(.vertical):not(.pathbar) > .button:hover:not(:checked):not(:active):not(:only-child),
+.linked:not(.vertical):not(.pathbar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) {
+  box-shadow: -1px 0 #cfd6e6; }
+
+.linked:not(.vertical):not(.pathbar) > .button:first-child:hover:not(:checked):not(:active) {
+  box-shadow: none; }
+
+.linked:not(.vertical):not(.pathbar) > .button:checked + .button:not(:checked):not(:active):hover {
+  box-shadow: none; }
+
+.linked:not(.vertical):not(.pathbar) > .button:checked + .entry {
+  border-left-color: #5294E2; }
+
+.linked:not(.vertical):not(.pathbar) > .entry + .button:not(:checked):not(:active):hover {
+  box-shadow: none; }
+
+.linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):hover {
+  box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4), inset -1px 0 rgba(207, 214, 230, 0.4); }
+
+.linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
+  box-shadow: inset -1px 0 rgba(207, 214, 230, 0.4); }
+
+.linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
+  box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4); }
+
+.linked.vertical > .entry + .entry {
+  border-top-color: rgba(207, 214, 230, 0.3); }
+
+.linked.vertical > .entry + .entry:focus:not(:last-child),
+.linked.vertical > .entry + .entry:focus:last-child {
+  border-top-color: #5294E2; }
+
+.linked.vertical > .entry + .button,
+.linked.vertical > .entry + .button:hover,
+.linked.vertical > .entry + .button:active,
+.linked.vertical > .entry + .button:checked,
+.linked.vertical > .entry + .button:insensitive {
+  border-top-style: solid; }
+
+.linked.vertical > .entry:focus:not(:only-child) + .entry,
+.linked.vertical > .entry:focus:not(:only-child) + .button,
+.linked.vertical > .entry:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox,
+.linked.vertical > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox {
+  border-top-color: #5294E2; }
+
+.linked.vertical > .button:hover:not(:checked):not(:active):not(:only-child),
+.linked.vertical > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) {
+  box-shadow: 0 -1px #cfd6e6; }
+
+.linked.vertical > .button:first-child:hover:not(:checked):not(:active) {
+  box-shadow: none; }
+
+.linked.vertical > .button:checked + .button:not(:checked):not(:active):hover {
+  box-shadow: none; }
+
+.linked.vertical > .button:checked + .entry {
+  border-top-color: #5294E2; }
+
+.linked.vertical > .entry + .button:not(:checked):not(:active):hover {
+  box-shadow: none; }
+
+.inline-toolbar.toolbar GtkToolButton > .button.flat, .inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.toolbar GtkToolButton > .sidebar-button.button, .inline-toolbar GtkToolButton > .sidebar-button.button, .osd .button:hover, .osd .button:active, .osd .button:checked, .osd .button:insensitive, .inline-toolbar .button, .inline-toolbar .button:backdrop, .linked:not(.vertical) > .button,
+.linked:not(.vertical) > .button:hover,
+.linked:not(.vertical) > .button:active,
+.linked:not(.vertical) > .button:checked, .linked:not(.vertical):not(.pathbar) > .entry, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button,
+.primary-toolbar .linked:not(.vertical).path-bar > .button,
+.header-bar .linked:not(.vertical).path-bar > .button,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:hover,
+.header-bar .linked:not(.vertical).path-bar > .button:hover,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:active,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:active,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:active,
+.header-bar .linked:not(.vertical).path-bar > .button:active,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:checked,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:checked,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:checked,
+.header-bar .linked:not(.vertical).path-bar > .button:checked,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:insensitive,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:insensitive,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:insensitive, .header-bar .linked:not(.vertical).path-bar > .button:insensitive, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:active,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:checked,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:insensitive, .linked > GtkComboBox > .the-button-in-the-combobox:dir(ltr),
+.linked > GtkComboBox > .the-button-in-the-combobox:dir(rtl),
+.linked > GtkComboBoxText > .the-button-in-the-combobox:dir(ltr),
+.linked > GtkComboBoxText > .the-button-in-the-combobox:dir(rtl) {
   border-radius: 0;
-  border-left-style: none;
   border-right-style: none; }
-  .inline-toolbar GtkToolButton > .button.flat:hover, .inline-toolbar GtkToolButton > .sidebar-button.button:hover, .osd .button:hover, .inline-toolbar .button:hover, .linked > .button:hover,
-  GtkComboBox.combobox-entry .entry:hover, GtkComboBox.combobox-entry .the-button-in-the-combobox:hover, .primary-toolbar .linked.stack-switcher > .button:hover,
-  .header-bar .linked.stack-switcher > .button:hover,
-  .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover, .linked > GtkComboBox > .the-button-in-the-combobox:hover:dir(ltr) {
-    box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4), inset -1px 0 rgba(207, 214, 230, 0.4); }
-  .inline-toolbar GtkToolButton > .button.flat:active, .inline-toolbar GtkToolButton > .sidebar-button.button:active, .osd .button:active, .inline-toolbar .button:active, .linked > .button:active,
-  GtkComboBox.combobox-entry .entry:active, GtkComboBox.combobox-entry .the-button-in-the-combobox:active, .primary-toolbar .linked.stack-switcher > .button:active,
-  .header-bar .linked.stack-switcher > .button:active,
-  .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, .linked > GtkComboBox > .the-button-in-the-combobox:active:dir(ltr), .inline-toolbar GtkToolButton > .button.flat:checked, .inline-toolbar GtkToolButton > .sidebar-button.button:checked, .osd .button:checked, .inline-toolbar .button:checked, .linked > .button:checked,
-  GtkComboBox.combobox-entry .entry:checked, GtkComboBox.combobox-entry .the-button-in-the-combobox:checked, .primary-toolbar .linked.stack-switcher > .button:checked,
-  .header-bar .linked.stack-switcher > .button:checked,
-  .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked, .linked > GtkComboBox > .the-button-in-the-combobox:checked:dir(ltr) {
-    box-shadow: none; }
-  .inline-toolbar GtkToolButton > .button.flat:dir(rtl), .inline-toolbar GtkToolButton > .sidebar-button.button:dir(rtl), .inline-toolbar.toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:dir(rtl) > .button.flat, .inline-toolbar.toolbar GtkToolButton:dir(rtl) > .sidebar-button.button, .inline-toolbar GtkToolButton:dir(rtl) > .sidebar-button.button, .osd .button:dir(rtl):hover, .osd .button:dir(rtl):active, .osd .button:dir(rtl):checked, .osd .button:dir(rtl):insensitive, .inline-toolbar .button:dir(rtl), .linked > .button:dir(rtl),
-  GtkComboBox.combobox-entry .entry:dir(rtl), GtkComboBox.combobox-entry .the-button-in-the-combobox:dir(rtl), .primary-toolbar .linked.stack-switcher > .button:dir(rtl),
-  .header-bar .linked.stack-switcher > .button:dir(rtl),
-  .primary-toolbar .linked.path-bar > .button:dir(rtl), .header-bar .linked.path-bar > .button:dir(rtl), NemoWindow .primary-toolbar NemoPathBar.linked > .button:dir(rtl), .linked > GtkComboBox > .the-button-in-the-combobox:dir(rtl) {
-    border-radius: 0; }
 
-.osd .button:first-child:hover, .osd .button:first-child:active, .osd .button:first-child:checked, .osd .button:first-child:insensitive, .inline-toolbar .button:first-child, .linked > .button:first-child,
-.inline-toolbar.toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar.toolbar GtkToolButton:first-child > .sidebar-button.button, .inline-toolbar GtkToolButton:first-child > .sidebar-button.button, GtkComboBox.combobox-entry .entry:first-child, GtkComboBox.combobox-entry .the-button-in-the-combobox:first-child, .linked > GtkComboBox:first-child > .the-button-in-the-combobox, .primary-toolbar .linked.stack-switcher > .button:first-child,
-.header-bar .linked.stack-switcher > .button:first-child,
-.primary-toolbar .linked.path-bar > .button:first-child, .header-bar .linked.path-bar > .button:first-child, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child {
-  border-radius: 3px 0 0 3px;
-  border-left-style: solid; }
-  .osd .button:first-child:hover, .inline-toolbar .button:first-child:hover, .linked > .button:first-child:hover,
-  .inline-toolbar GtkToolButton:first-child > .button.flat:hover, .inline-toolbar GtkToolButton:first-child > .sidebar-button.button:hover, GtkComboBox.combobox-entry .entry:first-child:hover, GtkComboBox.combobox-entry .the-button-in-the-combobox:first-child:hover, .linked > GtkComboBox:first-child > .the-button-in-the-combobox:hover, .primary-toolbar .linked.stack-switcher > .button:first-child:hover,
-  .header-bar .linked.stack-switcher > .button:first-child:hover,
-  .primary-toolbar .linked.path-bar > .button:first-child:hover, .header-bar .linked.path-bar > .button:first-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:hover {
-    box-shadow: inset -1px 0 rgba(207, 214, 230, 0.4); }
-  .osd .button:first-child:active, .inline-toolbar .button:first-child:active, .linked > .button:first-child:active,
-  .inline-toolbar GtkToolButton:first-child > .button.flat:active, .inline-toolbar GtkToolButton:first-child > .sidebar-button.button:active, GtkComboBox.combobox-entry .entry:first-child:active, GtkComboBox.combobox-entry .the-button-in-the-combobox:first-child:active, .linked > GtkComboBox:first-child > .the-button-in-the-combobox:active, .primary-toolbar .linked.stack-switcher > .button:first-child:active,
-  .header-bar .linked.stack-switcher > .button:first-child:active,
-  .primary-toolbar .linked.path-bar > .button:first-child:active, .header-bar .linked.path-bar > .button:first-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:active, .osd .button:first-child:checked, .inline-toolbar .button:first-child:checked, .linked > .button:first-child:checked,
-  .inline-toolbar GtkToolButton:first-child > .button.flat:checked, .inline-toolbar GtkToolButton:first-child > .sidebar-button.button:checked, GtkComboBox.combobox-entry .entry:first-child:checked, GtkComboBox.combobox-entry .the-button-in-the-combobox:first-child:checked, .linked > GtkComboBox:first-child > .the-button-in-the-combobox:checked, .primary-toolbar .linked.stack-switcher > .button:first-child:checked,
-  .header-bar .linked.stack-switcher > .button:first-child:checked,
-  .primary-toolbar .linked.path-bar > .button:first-child:checked, .header-bar .linked.path-bar > .button:first-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:checked {
-    box-shadow: none; }
+.osd .button:first-child:hover, .osd .button:first-child:active, .osd .button:first-child:checked, .osd .button:first-child:insensitive, .inline-toolbar .button:first-child, .linked:not(.vertical) > .button:first-child,
+.inline-toolbar.toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar GtkToolButton:first-child > .button.flat, .inline-toolbar.toolbar GtkToolButton:first-child > .sidebar-button.button, .inline-toolbar GtkToolButton:first-child > .sidebar-button.button, .linked:not(.vertical):not(.pathbar) > .entry:first-child, .linked > GtkComboBox:first-child > .the-button-in-the-combobox,
+.linked > GtkComboBoxText:first-child > .the-button-in-the-combobox, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:first-child,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:first-child,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:first-child,
+.header-bar .linked:not(.vertical).path-bar > .button:first-child,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:first-child {
+  border-top-left-radius: 3px;
+  border-bottom-left-radius: 3px; }
 
-.osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .inline-toolbar .button:last-child, .linked > .button:last-child,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar.toolbar GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar GtkToolButton:last-child > .sidebar-button.button, GtkComboBox.combobox-entry .entry:last-child, GtkComboBox.combobox-entry .the-button-in-the-combobox:last-child, .linked > GtkComboBox:last-child > .the-button-in-the-combobox, .primary-toolbar .linked.stack-switcher > .button:last-child,
-.header-bar .linked.stack-switcher > .button:last-child,
-.primary-toolbar .linked.path-bar > .button:last-child, .header-bar .linked.path-bar > .button:last-child, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child {
-  border-radius: 0 3px 3px 0;
+.osd .button:last-child:hover, .osd .button:last-child:active, .osd .button:last-child:checked, .osd .button:last-child:insensitive, .inline-toolbar .button:last-child, .linked:not(.vertical) > .button:last-child,
+.inline-toolbar.toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar GtkToolButton:last-child > .button.flat, .inline-toolbar.toolbar GtkToolButton:last-child > .sidebar-button.button, .inline-toolbar GtkToolButton:last-child > .sidebar-button.button, .linked:not(.vertical):not(.pathbar) > .entry:last-child, .linked > GtkComboBox:last-child > .the-button-in-the-combobox,
+.linked > GtkComboBoxText:last-child > .the-button-in-the-combobox, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:last-child,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:last-child,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:last-child,
+.header-bar .linked:not(.vertical).path-bar > .button:last-child,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:last-child {
+  border-top-right-radius: 3px;
+  border-bottom-right-radius: 3px;
   border-right-style: solid; }
-  .osd .button:last-child:hover, .inline-toolbar .button:last-child:hover, .linked > .button:last-child:hover,
-  .inline-toolbar GtkToolButton:last-child > .button.flat:hover, .inline-toolbar GtkToolButton:last-child > .sidebar-button.button:hover, GtkComboBox.combobox-entry .entry:last-child:hover, GtkComboBox.combobox-entry .the-button-in-the-combobox:last-child:hover, .linked > GtkComboBox:last-child > .the-button-in-the-combobox:hover, .primary-toolbar .linked.stack-switcher > .button:last-child:hover,
-  .header-bar .linked.stack-switcher > .button:last-child:hover,
-  .primary-toolbar .linked.path-bar > .button:last-child:hover, .header-bar .linked.path-bar > .button:last-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:hover {
-    box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4); }
-  .osd .button:last-child:active, .inline-toolbar .button:last-child:active, .linked > .button:last-child:active,
-  .inline-toolbar GtkToolButton:last-child > .button.flat:active, .inline-toolbar GtkToolButton:last-child > .sidebar-button.button:active, GtkComboBox.combobox-entry .entry:last-child:active, GtkComboBox.combobox-entry .the-button-in-the-combobox:last-child:active, .linked > GtkComboBox:last-child > .the-button-in-the-combobox:active, .primary-toolbar .linked.stack-switcher > .button:last-child:active,
-  .header-bar .linked.stack-switcher > .button:last-child:active,
-  .primary-toolbar .linked.path-bar > .button:last-child:active, .header-bar .linked.path-bar > .button:last-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:active, .osd .button:last-child:checked, .inline-toolbar .button:last-child:checked, .linked > .button:last-child:checked,
-  .inline-toolbar GtkToolButton:last-child > .button.flat:checked, .inline-toolbar GtkToolButton:last-child > .sidebar-button.button:checked, GtkComboBox.combobox-entry .entry:last-child:checked, GtkComboBox.combobox-entry .the-button-in-the-combobox:last-child:checked, .linked > GtkComboBox:last-child > .the-button-in-the-combobox:checked, .primary-toolbar .linked.stack-switcher > .button:last-child:checked,
-  .header-bar .linked.stack-switcher > .button:last-child:checked,
-  .primary-toolbar .linked.path-bar > .button:last-child:checked, .header-bar .linked.path-bar > .button:last-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:checked {
-    box-shadow: none; }
-  .osd .button:last-child:dir(rtl):hover, .osd .button:last-child:dir(rtl):active, .osd .button:last-child:dir(rtl):checked, .osd .button:last-child:dir(rtl):insensitive, .inline-toolbar .button:last-child:dir(rtl), .linked > .button:last-child:dir(rtl),
-  .inline-toolbar GtkToolButton:last-child > .button.flat:dir(rtl), .inline-toolbar GtkToolButton:last-child > .sidebar-button.button:dir(rtl), .inline-toolbar.toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar GtkToolButton:last-child:dir(rtl) > .button.flat, .inline-toolbar.toolbar GtkToolButton:last-child:dir(rtl) > .sidebar-button.button, .inline-toolbar GtkToolButton:last-child:dir(rtl) > .sidebar-button.button, GtkComboBox.combobox-entry .entry:last-child:dir(rtl), GtkComboBox.combobox-entry .the-button-in-the-combobox:last-child:dir(rtl), .linked > GtkComboBox:last-child > .the-button-in-the-combobox:dir(rtl), .primary-toolbar .linked.stack-switcher > .button:last-child:dir(rtl),
-  .header-bar .linked.stack-switcher > .button:last-child:dir(rtl),
-  .primary-toolbar .linked.path-bar > .button:last-child:dir(rtl), .header-bar .linked.path-bar > .button:last-child:dir(rtl), NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:dir(rtl) {
-    border-bottom-left-radius: 0; }
 
-.osd .button:only-child:hover, .osd .button:only-child:active, .osd .button:only-child:checked, .osd .button:only-child:insensitive, .inline-toolbar .button:only-child, .linked > .button:only-child,
-.inline-toolbar.toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar.toolbar GtkToolButton:only-child > .sidebar-button.button, .inline-toolbar GtkToolButton:only-child > .sidebar-button.button, GtkComboBox.combobox-entry .entry:only-child, GtkComboBox.combobox-entry .the-button-in-the-combobox:only-child, .linked > GtkComboBox:only-child > .the-button-in-the-combobox, .primary-toolbar .linked.stack-switcher > .button:only-child,
-.header-bar .linked.stack-switcher > .button:only-child,
-.primary-toolbar .linked.path-bar > .button:only-child, .header-bar .linked.path-bar > .button:only-child, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child {
+.osd .button:only-child:hover, .osd .button:only-child:active, .osd .button:only-child:checked, .osd .button:only-child:insensitive, .inline-toolbar .button:only-child, .linked:not(.vertical) > .button:only-child,
+.inline-toolbar.toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar GtkToolButton:only-child > .button.flat, .inline-toolbar.toolbar GtkToolButton:only-child > .sidebar-button.button, .inline-toolbar GtkToolButton:only-child > .sidebar-button.button, .linked:not(.vertical):not(.pathbar) > .entry:only-child, .linked > GtkComboBox:only-child > .the-button-in-the-combobox,
+.linked > GtkComboBoxText:only-child > .the-button-in-the-combobox, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:only-child,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:only-child,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:only-child,
+.header-bar .linked:not(.vertical).path-bar > .button:only-child,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:only-child {
   border-radius: 3px;
   border-style: solid; }
-  .osd .button:only-child:hover, .inline-toolbar .button:only-child:hover, .linked > .button:only-child:hover,
-  .inline-toolbar GtkToolButton:only-child > .button.flat:hover, .inline-toolbar GtkToolButton:only-child > .sidebar-button.button:hover, GtkComboBox.combobox-entry .entry:only-child:hover, GtkComboBox.combobox-entry .the-button-in-the-combobox:only-child:hover, .linked > GtkComboBox:only-child > .the-button-in-the-combobox:hover, .primary-toolbar .linked.stack-switcher > .button:only-child:hover,
-  .header-bar .linked.stack-switcher > .button:only-child:hover,
-  .primary-toolbar .linked.path-bar > .button:only-child:hover, .header-bar .linked.path-bar > .button:only-child:hover, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:hover {
-    box-shadow: none; }
-  .osd .button:only-child:active, .inline-toolbar .button:only-child:active, .linked > .button:only-child:active,
-  .inline-toolbar GtkToolButton:only-child > .button.flat:active, .inline-toolbar GtkToolButton:only-child > .sidebar-button.button:active, GtkComboBox.combobox-entry .entry:only-child:active, GtkComboBox.combobox-entry .the-button-in-the-combobox:only-child:active, .linked > GtkComboBox:only-child > .the-button-in-the-combobox:active, .primary-toolbar .linked.stack-switcher > .button:only-child:active,
-  .header-bar .linked.stack-switcher > .button:only-child:active,
-  .primary-toolbar .linked.path-bar > .button:only-child:active, .header-bar .linked.path-bar > .button:only-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:active, .osd .button:only-child:checked, .inline-toolbar .button:only-child:checked, .linked > .button:only-child:checked,
-  .inline-toolbar GtkToolButton:only-child > .button.flat:checked, .inline-toolbar GtkToolButton:only-child > .sidebar-button.button:checked, GtkComboBox.combobox-entry .entry:only-child:checked, GtkComboBox.combobox-entry .the-button-in-the-combobox:only-child:checked, .linked > GtkComboBox:only-child > .the-button-in-the-combobox:checked, .primary-toolbar .linked.stack-switcher > .button:only-child:checked,
-  .header-bar .linked.stack-switcher > .button:only-child:checked,
-  .primary-toolbar .linked.path-bar > .button:only-child:checked, .header-bar .linked.path-bar > .button:only-child:checked, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:checked {
-    box-shadow: none; }
 
-.linked.vertical > .entry, .linked.vertical > .entry:focus, .linked.vertical > .entry:insensitive, .linked.vertical > .button,
+.linked.vertical > .button,
 .linked.vertical > .button:hover,
 .linked.vertical > .button:active,
-.linked.vertical > .button:checked, .linked.vertical > GtkComboBoxText > .the-button-in-the-combobox,
+.linked.vertical > .button:checked, .linked.vertical > .entry, .linked.vertical > GtkComboBoxText > .the-button-in-the-combobox,
 .linked.vertical > GtkComboBox > .the-button-in-the-combobox {
-  border-style: solid;
-  border-bottom-style: none;
-  border-top-style: none;
-  border-radius: 0; }
-  .linked.vertical > .entry:hover, .linked.vertical > .button:hover,
-  .linked.vertical > GtkComboBoxText > .the-button-in-the-combobox:hover,
-  .linked.vertical > GtkComboBox > .the-button-in-the-combobox:hover {
-    box-shadow: inset 0 -1px rgba(207, 214, 230, 0.4), inset 0 1px rgba(207, 214, 230, 0.4); }
-  .linked.vertical > .entry:active, .linked.vertical > .button:active,
-  .linked.vertical > GtkComboBoxText > .the-button-in-the-combobox:active,
-  .linked.vertical > GtkComboBox > .the-button-in-the-combobox:active, .linked.vertical > .entry:checked, .linked.vertical > .button:checked,
-  .linked.vertical > GtkComboBoxText > .the-button-in-the-combobox:checked,
-  .linked.vertical > GtkComboBox > .the-button-in-the-combobox:checked {
-    box-shadow: none; }
+  border-radius: 0;
+  border-bottom-style: none; }
 
-.linked.vertical > .entry:first-child, .linked.vertical > .button:first-child,
-.linked.vertical > GtkComboBoxText:first-child > .the-button-in-the-combobox,
+.linked.vertical > .button:first-child,
+.linked.vertical > .entry:first-child, .linked.vertical > GtkComboBoxText:first-child > .the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:first-child > .the-button-in-the-combobox {
-  border-radius: 3px 3px 0 0;
-  border-top-style: solid; }
-  .linked.vertical > .entry:first-child:hover, .linked.vertical > .button:first-child:hover,
-  .linked.vertical > GtkComboBoxText:first-child > .the-button-in-the-combobox:hover,
-  .linked.vertical > GtkComboBox:first-child > .the-button-in-the-combobox:hover {
-    box-shadow: inset 0 -1px rgba(207, 214, 230, 0.4); }
-  .linked.vertical > .entry:first-child:active, .linked.vertical > .button:first-child:active,
-  .linked.vertical > GtkComboBoxText:first-child > .the-button-in-the-combobox:active,
-  .linked.vertical > GtkComboBox:first-child > .the-button-in-the-combobox:active, .linked.vertical > .entry:first-child:checked, .linked.vertical > .button:first-child:checked,
-  .linked.vertical > GtkComboBoxText:first-child > .the-button-in-the-combobox:checked,
-  .linked.vertical > GtkComboBox:first-child > .the-button-in-the-combobox:checked {
-    box-shadow: none; }
+  border-top-left-radius: 3px;
+  border-top-right-radius: 3px; }
 
-.linked.vertical > .entry:last-child, .linked.vertical > .button:last-child,
-.linked.vertical > GtkComboBoxText:last-child > .the-button-in-the-combobox,
+.linked.vertical > .button:last-child,
+.linked.vertical > .entry:last-child, .linked.vertical > GtkComboBoxText:last-child > .the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:last-child > .the-button-in-the-combobox {
-  border-radius: 0 0 3px 3px;
+  border-bottom-left-radius: 3px;
+  border-bottom-right-radius: 3px;
   border-bottom-style: solid; }
-  .linked.vertical > .entry:last-child:hover, .linked.vertical > .button:last-child:hover,
-  .linked.vertical > GtkComboBoxText:last-child > .the-button-in-the-combobox:hover,
-  .linked.vertical > GtkComboBox:last-child > .the-button-in-the-combobox:hover {
-    box-shadow: inset 0 1px rgba(207, 214, 230, 0.4); }
-  .linked.vertical > .entry:last-child:active, .linked.vertical > .button:last-child:active,
-  .linked.vertical > GtkComboBoxText:last-child > .the-button-in-the-combobox:active,
-  .linked.vertical > GtkComboBox:last-child > .the-button-in-the-combobox:active, .linked.vertical > .entry:last-child:checked, .linked.vertical > .button:last-child:checked,
-  .linked.vertical > GtkComboBoxText:last-child > .the-button-in-the-combobox:checked,
-  .linked.vertical > GtkComboBox:last-child > .the-button-in-the-combobox:checked {
-    box-shadow: none; }
 
-.linked.vertical > .entry:only-child, .linked.vertical > .button:only-child,
-.linked.vertical > GtkComboBoxText:only-child > .the-button-in-the-combobox,
+.linked.vertical > .button:only-child,
+.linked.vertical > .entry:only-child, .linked.vertical > GtkComboBoxText:only-child > .the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:only-child > .the-button-in-the-combobox {
   border-radius: 3px;
   border-style: solid; }
-  .linked.vertical > .entry:only-child:hover, .linked.vertical > .button:only-child:hover,
-  .linked.vertical > GtkComboBoxText:only-child > .the-button-in-the-combobox:hover,
-  .linked.vertical > GtkComboBox:only-child > .the-button-in-the-combobox:hover {
-    box-shadow: none; }
-  .linked.vertical > .entry:only-child:active, .linked.vertical > .button:only-child:active,
-  .linked.vertical > GtkComboBoxText:only-child > .the-button-in-the-combobox:active,
-  .linked.vertical > GtkComboBox:only-child > .the-button-in-the-combobox:active, .linked.vertical > .entry:only-child:checked, .linked.vertical > .button:only-child:checked,
-  .linked.vertical > GtkComboBoxText:only-child > .the-button-in-the-combobox:checked,
-  .linked.vertical > GtkComboBox:only-child > .the-button-in-the-combobox:checked {
-    box-shadow: none; }
+
+.linked:not(.vertical) > .button,
+.linked:not(.vertical) > .button:hover,
+.linked:not(.vertical) > .button:active,
+.linked:not(.vertical) > .button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button,
+.primary-toolbar .linked:not(.vertical).path-bar > .button,
+.header-bar .linked:not(.vertical).path-bar > .button,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:hover,
+.header-bar .linked:not(.vertical).path-bar > .button:hover,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:active,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:active,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:active,
+.header-bar .linked:not(.vertical).path-bar > .button:active,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:checked,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:checked,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:checked,
+.header-bar .linked:not(.vertical).path-bar > .button:checked,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:insensitive,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:insensitive,
+.primary-toolbar .linked:not(.vertical).path-bar > .button:insensitive, .header-bar .linked:not(.vertical).path-bar > .button:insensitive, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:active,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:checked,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:insensitive {
+  border-left-style: none; }
+  .linked:not(.vertical) > .button:first-child,
+  .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:first-child,
+  .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:first-child,
+  .primary-toolbar .linked:not(.vertical).path-bar > .button:first-child,
+  .header-bar .linked:not(.vertical).path-bar > .button:first-child,
+  NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:first-child {
+    border-left-style: solid; }
+
+.linked.vertical > .button,
+.linked.vertical > .button:hover,
+.linked.vertical > .button:active,
+.linked.vertical > .button:checked {
+  border-top-style: none; }
+  .linked.vertical > .button:first-child {
+    border-top-style: solid; }
 
 .menuitem.button.flat, .menuitem.sidebar-button.button, .button:link, .button:visited, .button:link:hover, .button:link:active, .button:link:checked, .button:visited:hover, .button:visited:active, .button:visited:checked, .menu.button, .popup.button, .notebook tab .button, .app-notification .button.flat,
 .app-notification .sidebar-button.button,
@@ -845,21 +869,23 @@ GtkComboBox {
   GtkComboBox .separator.vertical, GtkComboBox .sidebar .vertical.view.separator, .sidebar GtkComboBox .vertical.view.separator {
     -GtkWidget-wide-separators: true; }
   GtkComboBox.combobox-entry .entry:dir(ltr) {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
     border-right-style: none; }
     GtkComboBox.combobox-entry .entry:dir(ltr):focus {
       box-shadow: 1px 0 #5294E2; }
   GtkComboBox.combobox-entry .entry:dir(rtl) {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
     border-left-style: none; }
     GtkComboBox.combobox-entry .entry:dir(rtl):focus {
       box-shadow: -1px 0 #5294E2; }
-  GtkComboBox.combobox-entry .the-button-in-the-combobox:dir(ltr) {
-    box-shadow: inset 1px 0 #cfd6e6; }
-    GtkComboBox.combobox-entry .the-button-in-the-combobox:dir(ltr):insensitive {
-      box-shadow: inset 1px 0 rgba(207, 214, 230, 0.55); }
-  GtkComboBox.combobox-entry .the-button-in-the-combobox:dir(rtl) {
-    box-shadow: inset -1px 0 #cfd6e6; }
-    GtkComboBox.combobox-entry .the-button-in-the-combobox:dir(rtl):insensitive {
-      box-shadow: inset -1px 0 rgba(207, 214, 230, 0.55); }
+  GtkComboBox.combobox-entry .button:dir(ltr) {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0; }
+  GtkComboBox.combobox-entry .button:dir(rtl) {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0; }
 
 /************
  * Toolbars *
@@ -1092,77 +1118,83 @@ GtkComboBox {
     border-color: rgba(82, 148, 226, 0.65);
     background-color: rgba(82, 148, 226, 0.65); }
 
-.primary-toolbar .linked > .button, .header-bar .linked > .button {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button,
+.header-bar .linked:not(.vertical):not(.path-bar) > .button,
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover,
+.header-bar .linked:not(.vertical):not(.path-bar) > .button:hover,
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:active,
+.header-bar .linked:not(.vertical):not(.path-bar) > .button:active,
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:checked,
+.header-bar .linked:not(.vertical):not(.path-bar) > .button:checked,
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:insensitive, .header-bar .linked:not(.vertical):not(.path-bar) > .button:insensitive {
   border-radius: 3px;
   border-style: solid; }
 
-.primary-toolbar .linked > .button:hover, .header-bar .linked > .button:hover {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child),
+.header-bar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child),
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active),
+.header-bar .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active),
+.primary-toolbar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child),
+.header-bar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child),
+.primary-toolbar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active), .header-bar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) {
   box-shadow: none; }
 
-.primary-toolbar .linked.stack-switcher > .button,
-.header-bar .linked.stack-switcher > .button,
-.primary-toolbar .linked.path-bar > .button, .header-bar .linked.path-bar > .button {
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button,
+.header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button,
+.primary-toolbar .linked:not(.vertical).path-bar > .button, .header-bar .linked:not(.vertical).path-bar > .button {
   color: rgba(82, 93, 118, 0.8);
   outline-color: rgba(82, 93, 118, 0.1);
   border-color: rgba(82, 93, 118, 0.1);
   background-color: rgba(251, 251, 252, 0.9); }
-  .primary-toolbar .linked.stack-switcher > .button:hover,
-  .header-bar .linked.stack-switcher > .button:hover,
-  .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover {
+  .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover,
+  .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover,
+  .primary-toolbar .linked:not(.vertical).path-bar > .button:hover, .header-bar .linked:not(.vertical).path-bar > .button:hover {
     background-color: rgba(255, 255, 255, 0.9); }
-  .primary-toolbar .linked.stack-switcher > .button:active,
-  .header-bar .linked.stack-switcher > .button:active,
-  .primary-toolbar .linked.stack-switcher > .button:checked,
-  .header-bar .linked.stack-switcher > .button:checked,
-  .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked {
+  .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:active,
+  .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:active,
+  .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:checked,
+  .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:checked,
+  .primary-toolbar .linked:not(.vertical).path-bar > .button:active, .header-bar .linked:not(.vertical).path-bar > .button:active, .primary-toolbar .linked:not(.vertical).path-bar > .button:checked, .header-bar .linked:not(.vertical).path-bar > .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #5294E2;
     background-color: #5294E2; }
-  .primary-toolbar .linked.stack-switcher > .button:insensitive,
-  .header-bar .linked.stack-switcher > .button:insensitive,
-  .primary-toolbar .linked.path-bar > .button:insensitive, .header-bar .linked.path-bar > .button:insensitive {
+  .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:insensitive,
+  .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:insensitive,
+  .primary-toolbar .linked:not(.vertical).path-bar > .button:insensitive, .header-bar .linked:not(.vertical).path-bar > .button:insensitive {
     color: rgba(82, 93, 118, 0.4); }
-  .primary-toolbar .linked.stack-switcher > .button:hover,
-  .header-bar .linked.stack-switcher > .button:hover,
-  .primary-toolbar .linked.path-bar > .button:hover, .header-bar .linked.path-bar > .button:hover {
-    box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1), inset -1px 0 rgba(82, 93, 118, 0.1); }
-  .primary-toolbar .linked.stack-switcher > .button:active,
-  .header-bar .linked.stack-switcher > .button:active,
-  .primary-toolbar .linked.stack-switcher > .button:checked,
-  .header-bar .linked.stack-switcher > .button:checked,
-  .primary-toolbar .linked.path-bar > .button:active, .header-bar .linked.path-bar > .button:active, .primary-toolbar .linked.path-bar > .button:checked, .header-bar .linked.path-bar > .button:checked {
-    box-shadow: none; }
-  .primary-toolbar .linked.stack-switcher > .button:first-child:hover,
-  .header-bar .linked.stack-switcher > .button:first-child:hover,
-  .primary-toolbar .linked.path-bar > .button:first-child:hover, .header-bar .linked.path-bar > .button:first-child:hover {
-    box-shadow: inset -1px 0 rgba(82, 93, 118, 0.1); }
-  .primary-toolbar .linked.stack-switcher > .button:first-child:active,
-  .header-bar .linked.stack-switcher > .button:first-child:active,
-  .primary-toolbar .linked.stack-switcher > .button:first-child:checked,
-  .header-bar .linked.stack-switcher > .button:first-child:checked,
-  .primary-toolbar .linked.path-bar > .button:first-child:active, .header-bar .linked.path-bar > .button:first-child:active, .primary-toolbar .linked.path-bar > .button:first-child:checked, .header-bar .linked.path-bar > .button:first-child:checked {
-    box-shadow: none; }
-  .primary-toolbar .linked.stack-switcher > .button:last-child:hover,
-  .header-bar .linked.stack-switcher > .button:last-child:hover,
-  .primary-toolbar .linked.path-bar > .button:last-child:hover, .header-bar .linked.path-bar > .button:last-child:hover {
-    box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); }
-  .primary-toolbar .linked.stack-switcher > .button:last-child:active,
-  .header-bar .linked.stack-switcher > .button:last-child:active,
-  .primary-toolbar .linked.stack-switcher > .button:last-child:checked,
-  .header-bar .linked.stack-switcher > .button:last-child:checked,
-  .primary-toolbar .linked.path-bar > .button:last-child:active, .header-bar .linked.path-bar > .button:last-child:active, .primary-toolbar .linked.path-bar > .button:last-child:checked, .header-bar .linked.path-bar > .button:last-child:checked {
-    box-shadow: none; }
-  .primary-toolbar .linked.stack-switcher > .button:only-child:hover,
-  .header-bar .linked.stack-switcher > .button:only-child:hover,
-  .primary-toolbar .linked.path-bar > .button:only-child:hover, .header-bar .linked.path-bar > .button:only-child:hover {
-    box-shadow: none; }
-  .primary-toolbar .linked.stack-switcher > .button:only-child:active,
-  .header-bar .linked.stack-switcher > .button:only-child:active,
-  .primary-toolbar .linked.stack-switcher > .button:only-child:checked,
-  .header-bar .linked.stack-switcher > .button:only-child:checked,
-  .primary-toolbar .linked.path-bar > .button:only-child:active, .header-bar .linked.path-bar > .button:only-child:active, .primary-toolbar .linked.path-bar > .button:only-child:checked, .header-bar .linked.path-bar > .button:only-child:checked {
-    box-shadow: none; }
+
+.primary-toolbar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):hover,
+.header-bar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):hover,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover:not(:checked):not(:active):not(:only-child):hover, .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover:not(:checked):not(:active):not(:only-child):hover {
+  box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1), inset -1px 0 rgba(82, 93, 118, 0.1); }
+
+.primary-toolbar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):first-child:hover,
+.header-bar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):first-child:hover,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
+  box-shadow: inset -1px 0 rgba(82, 93, 118, 0.1); }
+
+.primary-toolbar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):last-child:hover,
+.header-bar .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child):last-child:hover,
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, .header-bar .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
+  box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); }
+
+.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry {
+  border-left-color: rgba(82, 93, 118, 0); }
+
+.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:not(:last-child),
+.header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:not(:last-child),
+.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:last-child, .header-bar .linked:not(.vertical):not(.pathbar) > .entry + .entry:focus:last-child {
+  border-left-color: #5294E2; }
+
+.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .entry,
+.header-bar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .entry,
+.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .button,
+.header-bar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + .button,
+.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox,
+.header-bar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox,
+.primary-toolbar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox, .header-bar .linked:not(.vertical):not(.pathbar) > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox {
+  border-left-color: #5294E2; }
 
 .primary-toolbar .button.suggested-action, .header-bar .button.suggested-action {
   background-clip: border-box;
@@ -1275,21 +1307,19 @@ GtkComboBox {
     color: rgba(82, 93, 118, 0.35);
     background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.75)); }
 
-.primary-toolbar GtkComboBox.combobox-entry .entry:dir(ltr):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(ltr):focus {
-  box-shadow: none; }
-
-.primary-toolbar GtkComboBox.combobox-entry .entry:dir(rtl):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(rtl):focus {
-  box-shadow: none; }
-
-.primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr), .header-bar GtkComboBox.combobox-entry .button:dir(ltr) {
-  box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); }
-  .primary-toolbar GtkComboBox.combobox-entry .button:dir(ltr):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(ltr):insensitive {
-    box-shadow: inset 1px 0 rgba(82, 93, 118, 0); }
+.primary-toolbar GtkComboBox.combobox-entry .entry:dir(ltr), .header-bar GtkComboBox.combobox-entry .entry:dir(ltr) {
+  border-right-style: none; }
+  .primary-toolbar GtkComboBox.combobox-entry .entry:dir(ltr):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(ltr):focus {
+    box-shadow: none; }
+  .primary-toolbar GtkComboBox.combobox-entry .entry:dir(ltr):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(ltr):focus {
+    box-shadow: 1px 0 #5294E2; }
 
-.primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl), .header-bar GtkComboBox.combobox-entry .button:dir(rtl) {
-  box-shadow: inset -1px 0 rgba(82, 93, 118, 0.1); }
-  .primary-toolbar GtkComboBox.combobox-entry .button:dir(rtl):insensitive, .header-bar GtkComboBox.combobox-entry .button:dir(rtl):insensitive {
-    box-shadow: inset -1px 0 rgba(82, 93, 118, 0); }
+.primary-toolbar GtkComboBox.combobox-entry .entry:dir(rtl), .header-bar GtkComboBox.combobox-entry .entry:dir(rtl) {
+  border-left-style: none; }
+  .primary-toolbar GtkComboBox.combobox-entry .entry:dir(rtl):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(rtl):focus {
+    box-shadow: none; }
+  .primary-toolbar GtkComboBox.combobox-entry .entry:dir(rtl):focus, .header-bar GtkComboBox.combobox-entry .entry:dir(rtl):focus {
+    box-shadow: -1px 0 #5294E2; }
 
 .primary-toolbar GtkSwitch:backdrop, .header-bar GtkSwitch:backdrop {
   opacity: 0.75; }
@@ -2604,8 +2634,7 @@ GtkVolumeButton.button {
 .view:selected:focus,
 .view:selected:hover, .label:selected,
 .label:selected:focus,
-.label:selected:hover, .grid-child:selected, .entry:selected,
-.entry:selected:focus, .menuitem.button.flat:active, .menuitem.sidebar-button.button:active, .menuitem.button.flat:selected, .menuitem.sidebar-button.button:selected, .list-row:selected, .sidebar:selected, .sidebar .view:selected, GtkPlacesSidebar.sidebar .list-row.activatable:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected,
+.label:selected:hover, .grid-child:selected, .menuitem.button.flat:active, .menuitem.sidebar-button.button:active, .menuitem.button.flat:selected, .menuitem.sidebar-button.button:selected, .list-row:selected, .sidebar:selected, .sidebar .view:selected, GtkPlacesSidebar.sidebar .list-row.activatable:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected,
 GtkEntry.gb-command-bar-entry.entry.flat:selected:focus,
 GtkFileChooserDialog GtkPlacesSidebar.sidebar .list-row.activatable:selected,
 GtkFileChooserDialog GtkPlacesSidebar.sidebar .list-row.activatable:selected:hover,
@@ -2826,36 +2855,29 @@ NemoWindow .sidebar .frame {
 NemoWindow GtkSeparator.separator.horizontal, NemoWindow .sidebar GtkSeparator.horizontal.view.separator, .sidebar NemoWindow GtkSeparator.horizontal.view.separator {
   color: #dbdfe3; }
 
-NemoWindow .primary-toolbar NemoPathBar.linked > .button {
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button {
   color: rgba(82, 93, 118, 0.8);
   outline-color: rgba(82, 93, 118, 0.1);
   border-color: rgba(82, 93, 118, 0.1);
   background-color: rgba(251, 251, 252, 0.9); }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover {
+  NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover {
     background-color: rgba(255, 255, 255, 0.9); }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked {
+  NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #5294E2;
     background-color: #5294E2; }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:insensitive {
+  NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:insensitive {
     color: rgba(82, 93, 118, 0.4); }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:hover {
-    box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1), inset -1px 0 rgba(82, 93, 118, 0.1); }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:checked {
-    box-shadow: none; }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:hover {
-    box-shadow: inset -1px 0 rgba(82, 93, 118, 0.1); }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:first-child:checked {
-    box-shadow: none; }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:hover {
-    box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:last-child:checked {
-    box-shadow: none; }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:hover {
-    box-shadow: none; }
-  NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:active, NemoWindow .primary-toolbar NemoPathBar.linked > .button:only-child:checked {
-    box-shadow: none; }
+
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child):hover {
+  box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1), inset -1px 0 rgba(82, 93, 118, 0.1); }
+
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
+  box-shadow: inset -1px 0 rgba(82, 93, 118, 0.1); }
+
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
+  box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); }
 
 .gedit-headerbar-paned {
   color: rgba(212, 213, 219, 0.95); }
@@ -3361,7 +3383,7 @@ UnityPanelWidget,
   box-shadow: none; }
   UnityPanelWidget:backdrop,
   .unity-panel:backdrop {
-    color: #abb6c5; }
+    color: #bdc6d1; }
 
 .unity-panel.menubar.menuitem:hover,
 .unity-panel.menubar .menuitem *:hover {
diff --git a/common/gtk-3.0/3.18/sass/_applications.scss b/common/gtk-3.0/3.18/sass/_applications.scss
index 13fc8b9..d90000f 100644
--- a/common/gtk-3.0/3.18/sass/_applications.scss
+++ b/common/gtk-3.0/3.18/sass/_applications.scss
@@ -157,34 +157,36 @@ NemoWindow GtkSeparator.separator.horizontal {
   @extend .nautilus-desktop.nautilus-canvas-item;
 }
 
-NemoWindow .primary-toolbar NemoPathBar.linked > .button {
-  $_linked_separator_color: $header_button_border;
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button {
 
   @include button(header-hover);
 
   &:hover { background-color: lighten($header_button_bg, 15%); }
   &:active, &:checked { @include button(header-active); }
   &:insensitive { color: transparentize($header_fg, 0.4); }
+}
 
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:hover,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:active,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:checked,
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > .button:insensitive {
   @extend %linked;
+  @extend %linked_button;
+}
 
-  &:hover {
-    box-shadow: inset  1px 0 $_linked_separator_color,
-                inset -1px 0 $_linked_separator_color;
-  }
-  &:active, &:checked { box-shadow: none; }
+NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) {
 
-  &:first-child {
-    &:hover { box-shadow: inset -1px 0 $_linked_separator_color; }
-    &:active, &:checked { box-shadow: none; }
-  }
-  &:last-child {
-    &:hover { box-shadow: inset 1px 0 $_linked_separator_color; }
-    &:active, &:checked { box-shadow: none; }
-  }
-  &:only-child {
-    &:hover { box-shadow: none; }
-    &:active, &:checked { box-shadow: none; }
+  $_linked_separator_color: $header_button_border;
+
+  > .button:hover:not(:checked):not(:active):not(:only-child) {
+
+      &:hover {
+        box-shadow: inset  1px 0 $_linked_separator_color,
+                    inset -1px 0 $_linked_separator_color;
+      }
+      &:first-child:hover { box-shadow: inset -1px 0 $_linked_separator_color; }
+      &:last-child:hover { box-shadow: inset 1px 0 $_linked_separator_color; }
   }
 }
 
diff --git a/common/gtk-3.0/3.18/sass/_common.scss b/common/gtk-3.0/3.18/sass/_common.scss
index 408b429..c24eee0 100644
--- a/common/gtk-3.0/3.18/sass/_common.scss
+++ b/common/gtk-3.0/3.18/sass/_common.scss
@@ -240,7 +240,8 @@ GtkTextView { // This will get overridden by .view, needed by gedit line numbers
 
   &:selected,
   &:selected:focus {
-    @extend %selected_items;
+    background-color: $selected_bg_color;
+    color: $selected_fg_color;
   }
 
   &.progressbar {
@@ -254,20 +255,6 @@ GtkTextView { // This will get overridden by .view, needed by gedit line numbers
     box-shadow: none;
   }
 
-  .linked > & { //FIXME: use same buttons linking logic and template
-    &:first-child {
-      border-top-right-radius: 0;
-      border-bottom-right-radius: 0;
-      &:dir(rtl) { border-right-style: none;}
-    }
-    &:last-child {
-      border-top-left-radius: 0;
-      border-bottom-left-radius: 0;
-      border-left-style: none;
-      &:dir(rtl) { border-left-style: solid; }
-    }
-  }
-
   &.error {
     color: white;
     border-color: $error_color;
@@ -302,52 +289,6 @@ GtkTextView { // This will get overridden by .view, needed by gedit line numbers
     &:active { color: $selected_bg_color; }
   }
 
-  .linked.vertical > & { //FIXME comment stuff and make the whole thing smarter.
-    border-bottom-color: mix($borders_color, $base_color, 30%);
-    box-shadow: none;
-    @extend %linked_vertical;
-
-    &:focus {
-      border-color: $selected_bg_color;
-      box-shadow: 0 -1px 0 0 $selected_bg_color;
-      @extend %linked_vertical;
-    }
-
-    &:insensitive {
-      border-bottom-color: mix($borders_color, $base_color, 30%);
-      @extend %linked_vertical;
-    }
-
-    &:first-child {
-      border-bottom-color: mix($borders_color, $base_color, 30%);
-
-      &:focus {
-        border-bottom-color: $selected_bg_color;
-        box-shadow: none;
-      }
-
-      &:insensitive {
-        border-bottom-color: mix($borders_color, $base_color, 30%);
-        @extend %linked_vertical:first-child;
-      }
-    }
-
-    &:last-child {
-      border-bottom-color: rgba(0,0,0,0.14);
-      &:focus {
-        border-bottom-color: $selected_bg_color;
-        box-shadow: 0 -1px 0 0 $selected_bg_color;
-        @extend %linked_vertical:last-child;
-      }
-
-      &:insensitive {
-        border-bottom-color: rgba(0,0,0,0.14);
-        @extend %linked_vertical:last-child;
-
-      }
-    }
-  }
-
   .osd & {
     @include entry(osd);
     &:focus { @include entry(osd-focus); }
@@ -616,15 +557,21 @@ $_dot_color: $selected_bg_color;
     @extend %linked;
   }
 
-  .linked > &,
-  .linked > &:hover,
-  .linked > &:active,
-  .linked > &:checked { @extend %linked; }
+  .linked:not(.vertical) > &,
+  .linked:not(.vertical) > &:hover,
+  .linked:not(.vertical) > &:active,
+  .linked:not(.vertical) > &:checked {
+    @extend %linked;
+    @extend %linked_button;
+  }
 
   .linked.vertical > &,
   .linked.vertical > &:hover,
   .linked.vertical > &:active,
-  .linked.vertical > &:checked { @extend %linked_vertical; }
+  .linked.vertical > &:checked {
+    @extend %linked_vertical;
+    @extend %linked_vertical_button;
+  }
 }
 
 // all the following is for the +|- buttons on inline toolbars, that way
@@ -643,99 +590,137 @@ $_dot_color: $selected_bg_color;
 // More inline toolbar buttons
 .inline-toolbar.toolbar GtkToolButton {
   & > .button.flat { @extend %linked_middle; }
-  &:dir(rtl) > .button.flat { @extend %linked_middle:dir(rtl); }
   &:first-child > .button.flat { @extend %linked:first-child; }
   &:last-child > .button.flat { @extend %linked:last-child; }
-  &:last-child:dir(rtl) > .button.flat { @extend %linked:last-child:dir(rtl); }
   &:only-child > .button.flat { @extend %linked:only-child; }
 }
 
+// Some crazy linking stuff
+
+// horizontal
+.linked:not(.vertical):not(.pathbar) {
+  > .entry { @extend %linked; }
+
+  > .entry + .entry { border-left-color: transparentize($entry_border, 0.7); }
+  > .entry + .entry:focus:not(:last-child),
+  > .entry + .entry:focus:last-child { border-left-color: if($variant=='light', $selected_bg_color, $entry_border); }
+
+  > .entry + .button,
+  > .entry + .button:hover,
+  > .entry + .button:active,
+  > .entry + .button:checked,
+  > .entry + .button:insensitive { border-left-style: solid; }
+
+  > .entry:focus:not(:only-child) + .entry,
+  > .entry:focus:not(:only-child) + .button,
+  > .entry:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox,
+  > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-left-color:  if($variant=='light', $selected_bg_color, $entry_border); }
+
+  > .button:hover:not(:checked):not(:active):not(:only-child),
+  > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) { box-shadow: -1px 0 $button_border; }
+  > .button:first-child:hover:not(:checked):not(:active) { box-shadow: none; }
+  > .button:checked + .button:not(:checked):not(:active):hover { box-shadow: none; }
+  > .button:checked + .entry { border-left-color: if($variant=='light', $selected_bg_color, $entry_border); }
+  > .entry + .button:not(:checked):not(:active):hover { box-shadow: none; }
+}
+
+// special case for path-bars
+.linked:not(.vertical).path-bar {
+
 $_linked_separator_color: if($variant=='light', transparentize($button_border, 0.6), transparentize($button_border, 0.5));
 
-%linked_middle {
-  border-radius: 0;
-  border-left-style: none;
-  border-right-style: none;
+  > .button:hover:not(:checked):not(:active):not(:only-child) {
 
-  &:hover {
-    box-shadow: inset  1px 0 $_linked_separator_color,
-                inset -1px 0 $_linked_separator_color;
+    &:hover {
+      box-shadow: inset  1px 0 $_linked_separator_color,
+                  inset -1px 0 $_linked_separator_color;
+    }
+    &:first-child:hover { box-shadow: inset -1px 0 $_linked_separator_color; }
+    &:last-child:hover { box-shadow: inset 1px 0 $_linked_separator_color; }
   }
-  &:active, &:checked { box-shadow: none; }
+}
 
-  &:dir(rtl) {
-    border-radius: 0; // needed when including %linked_middle:dir(rtl)
-  }
+// vertical
+.linked.vertical {
+  > .entry { @extend %linked_vertical; }
+
+  > .entry + .entry { border-top-color: transparentize($entry_border, 0.7); }
+  > .entry + .entry:focus:not(:last-child),
+  > .entry + .entry:focus:last-child { border-top-color: if($variant=='light', $selected_bg_color, $entry_border); }
+
+  > .entry + .button,
+  > .entry + .button:hover,
+  > .entry + .button:active,
+  > .entry + .button:checked,
+  > .entry + .button:insensitive { border-top-style: solid; }
+
+  > .entry:focus:not(:only-child) + .entry,
+  > .entry:focus:not(:only-child) + .button,
+  > .entry:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox,
+  > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-top-color: if($variant=='light', $selected_bg_color, $entry_border); }
+
+  > .button:hover:not(:checked):not(:active):not(:only-child),
+  > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) { box-shadow: 0 -1px $button_border; }
+  > .button:first-child:hover:not(:checked):not(:active) { box-shadow: none; }
+  > .button:checked + .button:not(:checked):not(:active):hover { box-shadow: none; }
+  > .button:checked + .entry { border-top-color: if($variant=='light', $selected_bg_color, $entry_border); }
+  > .entry + .button:not(:checked):not(:active):hover { box-shadow: none; }
+}
+
+%linked_middle {
+  border-radius: 0;
+  border-right-style: none;
 }
 
 %linked {
   @extend %linked_middle;
-
   &:first-child {
-    border-radius: 3px 0 0 3px;
-    border-left-style: solid;
-
-    &:hover { box-shadow: inset -1px 0 $_linked_separator_color; }
-    &:active, &:checked { box-shadow: none; }
+    border-top-left-radius: 3px;
+    border-bottom-left-radius: 3px;
   }
   &:last-child {
-    border-radius: 0 3px 3px 0;
+    border-top-right-radius: 3px;
+    border-bottom-right-radius: 3px;
     border-right-style: solid;
-
-    &:hover { box-shadow: inset 1px 0 $_linked_separator_color; }
-    &:active, &:checked { box-shadow: none; }
-
-    &:dir(rtl) { border-bottom-left-radius: 0; }
-
   }
   &:only-child {
     border-radius: 3px;
     border-style: solid;
-
-    &:hover { box-shadow: none; }
-    &:active, &:checked { box-shadow: none; }
   }
 }
 
 %linked_vertical_middle {
-  border-style: solid;
-  border-bottom-style: none;
-  border-top-style: none;
   border-radius: 0;
-
-  &:hover {
-    box-shadow: inset 0 -1px $_linked_separator_color,
-                inset 0  1px $_linked_separator_color;
-  }
-  &:active, &:checked { box-shadow: none; }
+  border-bottom-style: none;
 }
 
 %linked_vertical{
   @extend %linked_vertical_middle;
-
   &:first-child {
-    border-radius: 3px 3px 0 0;
-    border-top-style: solid;
-
-    &:hover { box-shadow: inset 0 -1px $_linked_separator_color; }
-    &:active, &:checked { box-shadow: none; }
+    border-top-left-radius: 3px;
+    border-top-right-radius: 3px;
   }
   &:last-child {
-    border-radius: 0 0 3px 3px;
+    border-bottom-left-radius: 3px;
+    border-bottom-right-radius: 3px;
     border-bottom-style: solid;
-
-    &:hover { box-shadow: inset 0 1px $_linked_separator_color; }
-    &:active, &:checked { box-shadow: none; }
   }
   &:only-child {
     border-radius: 3px;
     border-style: solid;
-
-    &:hover { box-shadow: none; }
-    &:active, &:checked { box-shadow: none; }
   }
 }
 
+%linked_button {
+  border-left-style: none;
+  &:first-child { border-left-style: solid; }
+}
+
+%linked_vertical_button {
+  border-top-style: none;
+  &:first-child { border-top-style: solid; }
+}
+
 %undecorated_button {
   border-color: transparent;
   background-color: transparent;
@@ -919,59 +904,59 @@ GtkComboBox {
   &:insensitive {
     color: $insensitive_fg_color;
   }
-
   .separator.vertical {
     // always disable separators
     -GtkWidget-wide-separators: true;
   }
-
   &.combobox-entry .entry {
-    @extend %linked;
-
     &:dir(ltr) {
+      border-top-right-radius: 0;
+      border-bottom-right-radius: 0;
       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-top-left-radius: 0;
+      border-bottom-left-radius: 0;
       border-left-style: none;
 
-      &:focus { box-shadow: -1px 0 $selected_bg_color; }
+      @if $variant=='light' { &:focus { box-shadow: -1px 0 $selected_bg_color; } }
     }
   }
-
-  &.combobox-entry .the-button-in-the-combobox {
-    @extend %linked;
-
+  &.combobox-entry .button {
     &:dir(ltr) {
-      box-shadow: inset  1px 0 $button_border;
-
-      &:insensitive { box-shadow: inset 1px 0 transparentize($button_border, 0.45); }
+      border-top-left-radius: 0;
+      border-bottom-left-radius: 0;
     }
     &:dir(rtl) {
-      box-shadow: inset -1px 0 $button_border;
-
-      &:insensitive { box-shadow: inset -1px 0 transparentize($button_border, 0.45); }
+      border-top-right-radius: 0;
+      border-bottom-right-radius: 0;
     }
   }
 }
 
-.linked > GtkComboBox > .the-button-in-the-combobox {
-  // the combo is a composite widget so the way we do button linking doesn't
+.linked > GtkComboBox > .the-button-in-the-combobox,
+.linked > GtkComboBoxText > .the-button-in-the-combobox {
+  // the combo is a composite widget so the way we do button linkind doesn't
   // work, special case needed. See
   // https://bugzilla.gnome.org/show_bug.cgi?id=733979
-  &:dir(ltr) { @extend %linked_middle; } // specificity bump
-  &:dir(rtl) { @extend %linked_middle:dir(rtl); }
+  &:dir(ltr),
+  &:dir(rtl) { @extend %linked_middle; } // specificity bump
 }
-.linked > GtkComboBox:first-child > .the-button-in-the-combobox {
+.linked > GtkComboBox:first-child > .the-button-in-the-combobox,
+.linked > GtkComboBoxText:first-child > .the-button-in-the-combobox {
   @extend %linked:first-child;
 }
-.linked > GtkComboBox:last-child > .the-button-in-the-combobox {
+.linked > GtkComboBox:last-child > .the-button-in-the-combobox,
+.linked > GtkComboBoxText:last-child > .the-button-in-the-combobox {
   @extend %linked:last-child;
 }
-.linked > GtkComboBox:only-child > .the-button-in-the-combobox {
+.linked > GtkComboBox:only-child > .the-button-in-the-combobox,
+.linked > GtkComboBoxText:only-child > .the-button-in-the-combobox {
   @extend %linked:only-child;
 }
+
 .linked.vertical > GtkComboBoxText > .the-button-in-the-combobox,
 .linked.vertical > GtkComboBox > .the-button-in-the-combobox { @extend %linked_vertical_middle; }
 .linked.vertical > GtkComboBoxText:first-child > .the-button-in-the-combobox,
@@ -1242,42 +1227,72 @@ GtkComboBox {
     &:insensitive:active, &:insensitive:checked { @include button(header-insensitive-active); }
   }
 
-    .linked > .button { border-radius: 3px; border-style: solid}
-
-    .linked > .button:hover { box-shadow: none; }
-
-    .linked.stack-switcher > .button,
-    .linked.path-bar > .button {
+  // Linking stuff
+  .linked:not(.vertical):not(.path-bar) > .button,
+  .linked:not(.vertical):not(.path-bar) > .button:hover,
+  .linked:not(.vertical):not(.path-bar) > .button:active,
+  .linked:not(.vertical):not(.path-bar) > .button:checked,
+  .linked:not(.vertical):not(.path-bar) > .button:insensitive {
+    border-radius: 3px;
+    border-style: solid;
+    
+  }
+  .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active):not(:only-child),
+  .linked:not(.vertical):not(.path-bar) > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active),
+  .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active):not(:only-child),
+  .linked:not(.vertical).path-bar > .button:hover:not(:checked):not(:active) + .button:not(:checked):not(:active) { box-shadow: none; }
+
+  // special case for path-bars and stack-switchers
+  .linked:not(.vertical):not(.path-bar).stack-switcher > .button,
+  .linked:not(.vertical).path-bar > .button {
+
+    @include button(header-hover);
+
+    &:hover { background-color: lighten($header_button_bg, 15%); }
+    &:active, &:checked { @include button(header-active); }
+    &:insensitive { color: transparentize($header_fg, 0.4); }
+  }
+
+  .linked:not(.vertical):not(.path-bar).stack-switcher > .button,
+  .linked:not(.vertical).path-bar > .button,
+  .linked:not(.vertical):not(.path-bar).stack-switcher > .button:hover,
+  .linked:not(.vertical).path-bar > .button:hover,
+  .linked:not(.vertical):not(.path-bar).stack-switcher > .button:active,
+  .linked:not(.vertical).path-bar > .button:active,
+  .linked:not(.vertical):not(.path-bar).stack-switcher > .button:checked,
+  .linked:not(.vertical).path-bar > .button:checked,
+  .linked:not(.vertical):not(.path-bar).stack-switcher > .button:insensitive,
+  .linked:not(.vertical).path-bar > .button:insensitive {
+    @extend %linked;
+    @extend %linked_button;
+  }
 
-      $_linked_separator_color: $header_button_border;
+  .linked:not(.vertical).path-bar,
+  .linked:not(.vertical):not(.path-bar).stack-switcher {
 
-      @include button(header-hover);
+    $_linked_separator_color: $header_button_border;
 
-      &:hover { background-color: lighten($header_button_bg, 15%); }
-      &:active, &:checked { @include button(header-active); }
-      &:insensitive { color: transparentize($header_fg, 0.4); }
-
-      @extend %linked;
+    > .button:hover:not(:checked):not(:active):not(:only-child) {
 
       &:hover {
         box-shadow: inset  1px 0 $_linked_separator_color,
                     inset -1px 0 $_linked_separator_color;
       }
-      &:active, &:checked { box-shadow: none; }
-
-      &:first-child {
-        &:hover { box-shadow: inset -1px 0 $_linked_separator_color; }
-        &:active, &:checked { box-shadow: none; }
-      }
-      &:last-child {
-        &:hover { box-shadow: inset 1px 0 $_linked_separator_color; }
-        &:active, &:checked { box-shadow: none; }
-      }
-      &:only-child {
-        &:hover { box-shadow: none; }
-        &:active, &:checked { box-shadow: none; }
-      }
+      &:first-child:hover { box-shadow: inset -1px 0 $_linked_separator_color; }
+      &:last-child:hover { box-shadow: inset 1px 0 $_linked_separator_color; }
     }
+  }
+
+  .linked:not(.vertical):not(.pathbar) {
+    > .entry + .entry { border-left-color: transparentize($header_entry_border, 0.5); }
+    > .entry + .entry:focus:not(:last-child),
+    > .entry + .entry:focus:last-child { border-left-color: if($darker=='false' and $variant=='light', $selected_bg_color, $header_entry_border); }
+
+    > .entry:focus:not(:only-child) + .entry,
+    > .entry:focus:not(:only-child) + .button,
+    > .entry:focus:not(:only-child) + GtkComboBox > .the-button-in-the-combobox,
+    > .entry:focus:not(:only-child) + GtkComboBoxText > .the-button-in-the-combobox { border-left-color:  if($darker=='false' and $variant=='light', $selected_bg_color, $header_entry_border); }
+  }
 
   // Header-bar Suggested and Destructive Action buttons
   @each $b_type, $b_color in (suggested-action, $suggested_color),
@@ -1338,25 +1353,19 @@ GtkComboBox {
     }
     &.combobox-entry .entry {
       &:dir(ltr) {
+        border-right-style: none;
+
         &:focus { box-shadow: none; }
+        @if $variant=='light' and $darker=='false' { &:focus { box-shadow: 1px 0 $selected_bg_color; } }
       }
       &:dir(rtl) {
+        border-left-style: none;
+
         &:focus { box-shadow: none; }
+        @if $variant=='light' and $darker=='false' { &:focus { box-shadow: -1px 0 $selected_bg_color; } }
       }
     }
-    &.combobox-entry .button {
 
-      &:dir(ltr) {
-        box-shadow: inset  1px 0 $header_button_border;
-
-        &:insensitive { box-shadow: inset 1px 0 transparentize($header_button_border, 0.45); }
-      }
-      &:dir(rtl) {
-        box-shadow: inset -1px 0 $header_button_border;
-
-        &:insensitive { box-shadow: inset -1px 0 transparentize($header_button_border, 0.45); }
-      }
-    }
   }
 
   // Header-bar Switches
diff --git a/common/gtk-3.0/3.18/sass/_drawing.scss b/common/gtk-3.0/3.18/sass/_drawing.scss
index 1e54c38..2b24642 100644
--- a/common/gtk-3.0/3.18/sass/_drawing.scss
+++ b/common/gtk-3.0/3.18/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.18/sass/_unity.scss b/common/gtk-3.0/3.18/sass/_unity.scss
index 89439d2..c0b9060 100644
--- a/common/gtk-3.0/3.18/sass/_unity.scss
+++ b/common/gtk-3.0/3.18/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,