2 files changed, 16 insertions, 21 deletions
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; }
   }