gnome-builder improvements

8 files changed, 178 insertions, 171 deletions

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 332b8b1..fbc31b9 100644
--- a/common/gtk-3.0/3.18/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.18/gtk-contained-dark.css
@@ -2441,10 +2441,8 @@ GtkPlacesSidebar.sidebar .sidebar-new-bookmark-row {
 
 GtkPlacesSidebar.sidebar .list-row.activatable {
   color: rgba(211, 218, 227, 0.8);
-  border-width: 1px 0;
+  border-width: 0;
   border-style: solid; }
-  GtkPlacesSidebar.sidebar .list-row.activatable:hover, GtkPlacesSidebar.sidebar .has-open-popup {
-    border-color: rgba(255, 255, 255, 0.05); }
 
 .sidebar-button.button {
   outline-radius: 50%;
@@ -3097,54 +3095,58 @@ GeditViewFrame .gedit-search-slider {
 GbWorkbench .floating-bar {
   color: #D3DAE3; }
 
-GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr),
-GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) {
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr),
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:first-child:dir(rtl) {
   padding: 0 10px;
   color: rgba(207, 218, 231, 0.8);
   border-color: rgba(21, 23, 28, 0.37);
   background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.37));
   background-color: transparent; }
-  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr).image,
-  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr).image:hover,
-  GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl).image, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl).image:hover {
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr).image,
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr).image:hover,
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:first-child:dir(rtl).image, GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:first-child:dir(rtl).image:hover {
     color: inherit; }
-  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover,
-  GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover {
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr):hover,
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:first-child:dir(rtl):hover {
     color: #ffffff;
     border-color: transparent;
     background-image: linear-gradient(to bottom, #5294E2); }
-  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):active,
-  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):checked,
-  GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):active, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):checked {
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr):active,
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr):checked,
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:first-child:dir(rtl):active, GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:first-child:dir(rtl):checked {
     color: #ffffff;
     border-color: transparent;
     background-image: linear-gradient(to bottom, #5294E2); }
-  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):insensitive,
-  GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):insensitive {
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr):insensitive,
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:first-child:dir(rtl):insensitive {
     color: rgba(207, 218, 231, 0.35);
     background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.22)); }
 
-GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) {
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr),
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr):hover,
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr):active,
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr):checked {
   border-left-style: none;
   border-radius: 0 3px 3px 0;
   outline-radius: 0 1px 1px 0; }
-  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover {
-    box-shadow: -1px 0 #5294E2; }
 
-GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) {
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(rtl),
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(rtl):hover,
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(rtl):active,
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(rtl):checked {
   border-right-style: none;
   border-radius: 3px 0 0 3px;
   outline-radius: 1px 0 0 1px; }
-  GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover {
-    box-shadow: 1px 0 #5294E2; }
 
-GbPreferencesPageLanguage GtkSearchEntry {
-  border-bottom-left-radius: 0;
-  border-bottom-right-radius: 0; }
+GbPreferencesPageLanguage .entry {
+  border-radius: 3px 3px 0 0; }
 
-GbPreferencesPageLanguage GtkScrolledWindow {
+GbPreferencesPageLanguage .frame {
   border-top-width: 0; }
 
+GbEditorTweakWidget .linked.vertical > .entry {
+  border-bottom-style: solid; }
+
 GbEditorTweakWidget GtkScrolledWindow {
   border-top: none; }
 
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 2c5ef37..6ec1299 100644
--- a/common/gtk-3.0/3.18/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.18/gtk-contained-darker.css
@@ -2444,10 +2444,8 @@ GtkPlacesSidebar.sidebar .sidebar-new-bookmark-row {
 
 GtkPlacesSidebar.sidebar .list-row.activatable {
   color: rgba(92, 97, 108, 0.8);
-  border-width: 1px 0;
+  border-width: 0;
   border-style: solid; }
-  GtkPlacesSidebar.sidebar .list-row.activatable:hover, GtkPlacesSidebar.sidebar .has-open-popup {
-    border-color: rgba(0, 0, 0, 0.05); }
 
 .sidebar-button.button {
   outline-radius: 50%;
@@ -3100,54 +3098,58 @@ GeditViewFrame .gedit-search-slider {
 GbWorkbench .floating-bar {
   color: #5c616c; }
 
-GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr),
-GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) {
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr),
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:first-child:dir(rtl) {
   padding: 0 10px;
   color: rgba(207, 218, 231, 0.8);
   border-color: rgba(21, 23, 28, 0.37);
   background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.37));
   background-color: transparent; }
-  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr).image,
-  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr).image:hover,
-  GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl).image, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl).image:hover {
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr).image,
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr).image:hover,
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:first-child:dir(rtl).image, GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:first-child:dir(rtl).image:hover {
     color: inherit; }
-  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover,
-  GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover {
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr):hover,
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:first-child:dir(rtl):hover {
     color: #ffffff;
     border-color: transparent;
     background-image: linear-gradient(to bottom, #5294E2); }
-  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):active,
-  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):checked,
-  GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):active, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):checked {
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr):active,
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr):checked,
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:first-child:dir(rtl):active, GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:first-child:dir(rtl):checked {
     color: #ffffff;
     border-color: transparent;
     background-image: linear-gradient(to bottom, #5294E2); }
-  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):insensitive,
-  GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):insensitive {
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr):insensitive,
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:first-child:dir(rtl):insensitive {
     color: rgba(207, 218, 231, 0.35);
     background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.22)); }
 
-GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) {
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr),
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr):hover,
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr):active,
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr):checked {
   border-left-style: none;
   border-radius: 0 3px 3px 0;
   outline-radius: 0 1px 1px 0; }
-  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover {
-    box-shadow: -1px 0 #5294E2; }
 
-GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) {
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(rtl),
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(rtl):hover,
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(rtl):active,
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(rtl):checked {
   border-right-style: none;
   border-radius: 3px 0 0 3px;
   outline-radius: 1px 0 0 1px; }
-  GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover {
-    box-shadow: 1px 0 #5294E2; }
 
-GbPreferencesPageLanguage GtkSearchEntry {
-  border-bottom-left-radius: 0;
-  border-bottom-right-radius: 0; }
+GbPreferencesPageLanguage .entry {
+  border-radius: 3px 3px 0 0; }
 
-GbPreferencesPageLanguage GtkScrolledWindow {
+GbPreferencesPageLanguage .frame {
   border-top-width: 0; }
 
+GbEditorTweakWidget .linked.vertical > .entry {
+  border-bottom-style: solid; }
+
 GbEditorTweakWidget GtkScrolledWindow {
   border-top: none; }
 
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 4ac5b94..005cbc8 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
@@ -2441,10 +2441,8 @@ GtkPlacesSidebar.sidebar .sidebar-new-bookmark-row {
 
 GtkPlacesSidebar.sidebar .list-row.activatable {
   color: rgba(211, 218, 227, 0.8);
-  border-width: 1px 0;
+  border-width: 0;
   border-style: solid; }
-  GtkPlacesSidebar.sidebar .list-row.activatable:hover, GtkPlacesSidebar.sidebar .has-open-popup {
-    border-color: rgba(255, 255, 255, 0.05); }
 
 .sidebar-button.button {
   outline-radius: 50%;
@@ -3097,54 +3095,58 @@ GeditViewFrame .gedit-search-slider {
 GbWorkbench .floating-bar {
   color: #D3DAE3; }
 
-GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr),
-GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) {
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr),
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:first-child:dir(rtl) {
   padding: 0 10px;
   color: rgba(207, 218, 231, 0.8);
   border-color: rgba(21, 23, 28, 0.4);
   background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.4));
   background-color: transparent; }
-  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr).image,
-  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr).image:hover,
-  GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl).image, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl).image:hover {
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr).image,
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr).image:hover,
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:first-child:dir(rtl).image, GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:first-child:dir(rtl).image:hover {
     color: inherit; }
-  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover,
-  GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover {
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr):hover,
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:first-child:dir(rtl):hover {
     color: #ffffff;
     border-color: transparent;
     background-image: linear-gradient(to bottom, #5294E2); }
-  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):active,
-  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):checked,
-  GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):active, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):checked {
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr):active,
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr):checked,
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:first-child:dir(rtl):active, GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:first-child:dir(rtl):checked {
     color: #ffffff;
     border-color: transparent;
     background-image: linear-gradient(to bottom, #5294E2); }
-  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):insensitive,
-  GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):insensitive {
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr):insensitive,
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:first-child:dir(rtl):insensitive {
     color: rgba(207, 218, 231, 0.35);
     background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.25)); }
 
-GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) {
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr),
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr):hover,
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr):active,
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr):checked {
   border-left-style: none;
   border-radius: 0 3px 3px 0;
   outline-radius: 0 1px 1px 0; }
-  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover {
-    box-shadow: -1px 0 #5294E2; }
 
-GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) {
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(rtl),
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(rtl):hover,
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(rtl):active,
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(rtl):checked {
   border-right-style: none;
   border-radius: 3px 0 0 3px;
   outline-radius: 1px 0 0 1px; }
-  GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover {
-    box-shadow: 1px 0 #5294E2; }
 
-GbPreferencesPageLanguage GtkSearchEntry {
-  border-bottom-left-radius: 0;
-  border-bottom-right-radius: 0; }
+GbPreferencesPageLanguage .entry {
+  border-radius: 3px 3px 0 0; }
 
-GbPreferencesPageLanguage GtkScrolledWindow {
+GbPreferencesPageLanguage .frame {
   border-top-width: 0; }
 
+GbEditorTweakWidget .linked.vertical > .entry {
+  border-bottom-style: solid; }
+
 GbEditorTweakWidget GtkScrolledWindow {
   border-top: none; }
 
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 d33e6f8..b18fb0d 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
@@ -2444,10 +2444,8 @@ GtkPlacesSidebar.sidebar .sidebar-new-bookmark-row {
 
 GtkPlacesSidebar.sidebar .list-row.activatable {
   color: rgba(92, 97, 108, 0.8);
-  border-width: 1px 0;
+  border-width: 0;
   border-style: solid; }
-  GtkPlacesSidebar.sidebar .list-row.activatable:hover, GtkPlacesSidebar.sidebar .has-open-popup {
-    border-color: rgba(0, 0, 0, 0.05); }
 
 .sidebar-button.button {
   outline-radius: 50%;
@@ -3100,54 +3098,58 @@ GeditViewFrame .gedit-search-slider {
 GbWorkbench .floating-bar {
   color: #5c616c; }
 
-GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr),
-GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) {
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr),
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:first-child:dir(rtl) {
   padding: 0 10px;
   color: rgba(207, 218, 231, 0.8);
   border-color: rgba(21, 23, 28, 0.4);
   background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.4));
   background-color: transparent; }
-  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr).image,
-  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr).image:hover,
-  GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl).image, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl).image:hover {
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr).image,
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr).image:hover,
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:first-child:dir(rtl).image, GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:first-child:dir(rtl).image:hover {
     color: inherit; }
-  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover,
-  GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover {
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr):hover,
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:first-child:dir(rtl):hover {
     color: #ffffff;
     border-color: transparent;
     background-image: linear-gradient(to bottom, #5294E2); }
-  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):active,
-  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):checked,
-  GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):active, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):checked {
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr):active,
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr):checked,
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:first-child:dir(rtl):active, GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:first-child:dir(rtl):checked {
     color: #ffffff;
     border-color: transparent;
     background-image: linear-gradient(to bottom, #5294E2); }
-  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):insensitive,
-  GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):insensitive {
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr):insensitive,
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:first-child:dir(rtl):insensitive {
     color: rgba(207, 218, 231, 0.35);
     background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.25)); }
 
-GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) {
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr),
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr):hover,
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr):active,
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr):checked {
   border-left-style: none;
   border-radius: 0 3px 3px 0;
   outline-radius: 0 1px 1px 0; }
-  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover {
-    box-shadow: -1px 0 #5294E2; }
 
-GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) {
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(rtl),
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(rtl):hover,
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(rtl):active,
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(rtl):checked {
   border-right-style: none;
   border-radius: 3px 0 0 3px;
   outline-radius: 1px 0 0 1px; }
-  GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover {
-    box-shadow: 1px 0 #5294E2; }
 
-GbPreferencesPageLanguage GtkSearchEntry {
-  border-bottom-left-radius: 0;
-  border-bottom-right-radius: 0; }
+GbPreferencesPageLanguage .entry {
+  border-radius: 3px 3px 0 0; }
 
-GbPreferencesPageLanguage GtkScrolledWindow {
+GbPreferencesPageLanguage .frame {
   border-top-width: 0; }
 
+GbEditorTweakWidget .linked.vertical > .entry {
+  border-bottom-style: solid; }
+
 GbEditorTweakWidget GtkScrolledWindow {
   border-top: none; }
 
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 b75b81d..37a5420 100644
--- a/common/gtk-3.0/3.18/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.18/gtk-contained-solid.css
@@ -2448,10 +2448,8 @@ GtkPlacesSidebar.sidebar .sidebar-new-bookmark-row {
 
 GtkPlacesSidebar.sidebar .list-row.activatable {
   color: rgba(92, 97, 108, 0.8);
-  border-width: 1px 0;
+  border-width: 0;
   border-style: solid; }
-  GtkPlacesSidebar.sidebar .list-row.activatable:hover, GtkPlacesSidebar.sidebar .has-open-popup {
-    border-color: rgba(0, 0, 0, 0.05); }
 
 .sidebar-button.button {
   outline-radius: 50%;
@@ -3104,54 +3102,58 @@ GeditViewFrame .gedit-search-slider {
 GbWorkbench .floating-bar {
   color: #5c616c; }
 
-GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr),
-GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) {
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr),
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:first-child:dir(rtl) {
   padding: 0 10px;
   color: rgba(82, 93, 118, 0.8);
   border-color: rgba(82, 93, 118, 0.1);
   background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.9));
   background-color: transparent; }
-  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr).image,
-  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr).image:hover,
-  GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl).image, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl).image:hover {
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr).image,
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr).image:hover,
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:first-child:dir(rtl).image, GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:first-child:dir(rtl).image:hover {
     color: inherit; }
-  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover,
-  GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover {
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr):hover,
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:first-child:dir(rtl):hover {
     color: #ffffff;
     border-color: #5294E2;
     background-image: linear-gradient(to bottom, #5294E2); }
-  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):active,
-  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):checked,
-  GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):active, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):checked {
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr):active,
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr):checked,
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:first-child:dir(rtl):active, GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:first-child:dir(rtl):checked {
     color: #ffffff;
     border-color: #5294E2;
     background-image: linear-gradient(to bottom, #5294E2); }
-  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):insensitive,
-  GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):insensitive {
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr):insensitive,
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:first-child:dir(rtl):insensitive {
     color: rgba(82, 93, 118, 0.35);
     background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.75)); }
 
-GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) {
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr),
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr):hover,
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr):active,
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr):checked {
   border-left-style: none;
   border-radius: 0 3px 3px 0;
   outline-radius: 0 1px 1px 0; }
-  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover {
-    box-shadow: -1px 0 #5294E2; }
 
-GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) {
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(rtl),
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(rtl):hover,
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(rtl):active,
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(rtl):checked {
   border-right-style: none;
   border-radius: 3px 0 0 3px;
   outline-radius: 1px 0 0 1px; }
-  GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover {
-    box-shadow: 1px 0 #5294E2; }
 
-GbPreferencesPageLanguage GtkSearchEntry {
-  border-bottom-left-radius: 0;
-  border-bottom-right-radius: 0; }
+GbPreferencesPageLanguage .entry {
+  border-radius: 3px 3px 0 0; }
 
-GbPreferencesPageLanguage GtkScrolledWindow {
+GbPreferencesPageLanguage .frame {
   border-top-width: 0; }
 
+GbEditorTweakWidget .linked.vertical > .entry {
+  border-bottom-style: solid; }
+
 GbEditorTweakWidget GtkScrolledWindow {
   border-top: none; }
 
diff --git a/common/gtk-3.0/3.18/gtk-contained.css b/common/gtk-3.0/3.18/gtk-contained.css
index 111a851..6e5b03d 100644
--- a/common/gtk-3.0/3.18/gtk-contained.css
+++ b/common/gtk-3.0/3.18/gtk-contained.css
@@ -2448,10 +2448,8 @@ GtkPlacesSidebar.sidebar .sidebar-new-bookmark-row {
 
 GtkPlacesSidebar.sidebar .list-row.activatable {
   color: rgba(92, 97, 108, 0.8);
-  border-width: 1px 0;
+  border-width: 0;
   border-style: solid; }
-  GtkPlacesSidebar.sidebar .list-row.activatable:hover, GtkPlacesSidebar.sidebar .has-open-popup {
-    border-color: rgba(0, 0, 0, 0.05); }
 
 .sidebar-button.button {
   outline-radius: 50%;
@@ -3104,54 +3102,58 @@ GeditViewFrame .gedit-search-slider {
 GbWorkbench .floating-bar {
   color: #5c616c; }
 
-GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr),
-GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) {
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr),
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:first-child:dir(rtl) {
   padding: 0 10px;
   color: rgba(82, 93, 118, 0.8);
   border-color: rgba(82, 93, 118, 0.1);
   background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.9));
   background-color: transparent; }
-  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr).image,
-  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr).image:hover,
-  GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl).image, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl).image:hover {
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr).image,
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr).image:hover,
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:first-child:dir(rtl).image, GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:first-child:dir(rtl).image:hover {
     color: inherit; }
-  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover,
-  GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover {
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr):hover,
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:first-child:dir(rtl):hover {
     color: #ffffff;
     border-color: #5294E2;
     background-image: linear-gradient(to bottom, #5294E2); }
-  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):active,
-  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):checked,
-  GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):active, GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):checked {
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr):active,
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr):checked,
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:first-child:dir(rtl):active, GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:first-child:dir(rtl):checked {
     color: #ffffff;
     border-color: #5294E2;
     background-image: linear-gradient(to bottom, #5294E2); }
-  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):insensitive,
-  GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):insensitive {
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr):insensitive,
+  GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:first-child:dir(rtl):insensitive {
     color: rgba(82, 93, 118, 0.35);
     background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.75)); }
 
-GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr) {
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr),
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr):hover,
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr):active,
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(ltr):checked {
   border-left-style: none;
   border-radius: 0 3px 3px 0;
   outline-radius: 0 1px 1px 0; }
-  GbSearchBox.linked > GtkMenuButton.button:last-child:dir(ltr):hover {
-    box-shadow: -1px 0 #5294E2; }
 
-GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl) {
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(rtl),
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(rtl):hover,
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(rtl):active,
+GbSearchBox.linked:not(.vertical) > GtkMenuButton.button:last-child:dir(rtl):checked {
   border-right-style: none;
   border-radius: 3px 0 0 3px;
   outline-radius: 1px 0 0 1px; }
-  GbSearchBox.linked > GtkMenuButton.button:first-child:dir(rtl):hover {
-    box-shadow: 1px 0 #5294E2; }
 
-GbPreferencesPageLanguage GtkSearchEntry {
-  border-bottom-left-radius: 0;
-  border-bottom-right-radius: 0; }
+GbPreferencesPageLanguage .entry {
+  border-radius: 3px 3px 0 0; }
 
-GbPreferencesPageLanguage GtkScrolledWindow {
+GbPreferencesPageLanguage .frame {
   border-top-width: 0; }
 
+GbEditorTweakWidget .linked.vertical > .entry {
+  border-bottom-style: solid; }
+
 GbEditorTweakWidget GtkScrolledWindow {
   border-top: none; }
 
diff --git a/common/gtk-3.0/3.18/sass/_applications.scss b/common/gtk-3.0/3.18/sass/_applications.scss
index dcd297c..6ffd578 100644
--- a/common/gtk-3.0/3.18/sass/_applications.scss
+++ b/common/gtk-3.0/3.18/sass/_applications.scss
@@ -321,7 +321,7 @@ GeditFileBrowserWidget .toolbar {
 //
 GbWorkbench .floating-bar { color: $fg_color; }
 
-GbSearchBox.linked {
+GbSearchBox.linked:not(.vertical) {
 
   > GtkMenuButton.button:last-child:dir(ltr),
   > GtkMenuButton.button:first-child:dir(rtl) {
@@ -334,36 +334,35 @@ GbSearchBox.linked {
     &:insensitive { @include entry(header-insensitive); }
   }
 
-  > GtkMenuButton.button:last-child:dir(ltr) {
-
+  > GtkMenuButton.button:last-child:dir(ltr),
+  > GtkMenuButton.button:last-child:dir(ltr):hover,
+  > GtkMenuButton.button:last-child:dir(ltr):active,
+  > GtkMenuButton.button:last-child:dir(ltr):checked {
     border-left-style: none;
     border-radius: 0 3px 3px 0;
     outline-radius: 0 1px 1px 0;
-
-    &:hover { box-shadow: -1px 0 $selected_bg_color; }
   }
-  > GtkMenuButton.button:first-child:dir(rtl) {
+
+  > GtkMenuButton.button:last-child:dir(rtl),
+  > GtkMenuButton.button:last-child:dir(rtl):hover,
+  > GtkMenuButton.button:last-child:dir(rtl):active,
+  > GtkMenuButton.button:last-child:dir(rtl):checked {
     border-right-style: none;
     border-radius: 3px 0 0 3px;
     outline-radius: 1px 0 0 1px;
-
-    &:hover { box-shadow: 1px 0 $selected_bg_color; }
   }
 }
 
 // Preference page language style
 GbPreferencesPageLanguage  {
-
-  GtkSearchEntry {
-    border-bottom-left-radius: 0;
-    border-bottom-right-radius: 0;
-  }
-  GtkScrolledWindow { border-top-width: 0; }
+  .entry { border-radius: 3px 3px 0 0; }
+  .frame { border-top-width: 0 }
 }
 
 // Editor tweak widget
-GbEditorTweakWidget GtkScrolledWindow {
-  border-top: none;
+GbEditorTweakWidget {
+  .linked.vertical > .entry { border-bottom-style: solid; }
+  GtkScrolledWindow { border-top: none; }
 }
 
 // View stack styling
diff --git a/common/gtk-3.0/3.18/sass/_common.scss b/common/gtk-3.0/3.18/sass/_common.scss
index eb4fb53..da22ce6 100644
--- a/common/gtk-3.0/3.18/sass/_common.scss
+++ b/common/gtk-3.0/3.18/sass/_common.scss
@@ -2676,13 +2676,9 @@ GtkPlacesSidebar.sidebar {
   // Preserve everything else of the list-row class
   .list-row.activatable {
     color: transparentize($fg_color, 0.2);
-    border-width: 1px 0;
+    border-width: 0;
     border-style: solid;
 
-    &:hover {
-      border-color: if($variant=='light', transparentize(black, 0.95), transparentize(white, 0.95));
-    }
-
     &:selected { @extend %selected_items; }
   }