diff --git a/src/libide/greeter/ide-greeter-workspace.ui b/src/libide/greeter/ide-greeter-workspace.ui
index a4fb6b4f4307bcfcd7b3aa5300c159fcf348ad12..daaf9f905cb50e8176d0d241402c5069368c6291 100644
--- a/src/libide/greeter/ide-greeter-workspace.ui
+++ b/src/libide/greeter/ide-greeter-workspace.ui
@@ -55,7 +55,7 @@
                 <child>
                   <object class="GtkScrolledWindow" id="scroller">
                     <style>
-                      <class name="shadow-when-scroll"/>
+                      <class name="undershoot-top"/>
                     </style>
                     <property name="vexpand">true</property>
                     <property name="hscrollbar-policy">never</property>
diff --git a/src/libide/gui/ide-search-popover.ui b/src/libide/gui/ide-search-popover.ui
index 7d74e4ecb89f745490a51b9852436346fcf5a284..1259c77e029ac7d210311b12fc94698c1f678d1f 100644
--- a/src/libide/gui/ide-search-popover.ui
+++ b/src/libide/gui/ide-search-popover.ui
@@ -75,23 +75,20 @@
                 <property name="hscrollbar-policy">never</property>
                 <property name="min-content-height">400</property>
                 <child>
-                  <object class="GtkViewport">
-                    <property name="scroll-to-focus">true</property>
-                    <child>
-                      <object class="GtkListView" id="list_view">
-                        <style>
-                          <class name="results"/>
-                        </style>
-                        <signal name="activate" handler="ide_search_popover_activate_cb" swapped="true" object="IdeSearchPopover"/>
-                        <property name="orientation">vertical</property>
-                        <property name="model">
-                          <object class="GtkSingleSelection" id="selection">
-                            <signal name="notify::selected-item" handler="ide_search_popover_selection_changed_cb" swapped="true" object="IdeSearchPopover"/>
-                          </object>
-                        </property>
-                        <property name="factory">
-                          <object class="GtkBuilderListItemFactory">
-                            <property name="bytes"><![CDATA[
+                  <object class="GtkListView" id="list_view">
+                    <style>
+                      <class name="results"/>
+                    </style>
+                    <signal name="activate" handler="ide_search_popover_activate_cb" swapped="true" object="IdeSearchPopover"/>
+                    <property name="orientation">vertical</property>
+                    <property name="model">
+                      <object class="GtkSingleSelection" id="selection">
+                        <signal name="notify::selected-item" handler="ide_search_popover_selection_changed_cb" swapped="true" object="IdeSearchPopover"/>
+                      </object>
+                    </property>
+                    <property name="factory">
+                      <object class="GtkBuilderListItemFactory">
+                        <property name="bytes"><![CDATA[
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
 <template class="GtkListItem">
@@ -174,11 +171,9 @@
 </template>
 </interface>
 ]]>
-                            </property>
-                          </object>
                         </property>
                       </object>
-                    </child>
+                    </property>
                   </object>
                 </child>
               </object>
diff --git a/src/libide/gui/style.css b/src/libide/gui/style.css
index 6db1fd54c2b8df76af8098cf5664daea8ae9f4e1..ac1d21f27b2ee754567b9a0831f696c03dd9a34f 100644
--- a/src/libide/gui/style.css
+++ b/src/libide/gui/style.css
@@ -36,6 +36,8 @@ popover.global-search contents .navigation-sidebar {
 }
 popover.global-search listview.results {
   padding: 6px 0;
+  background: none;
+  color: inherit;
 }
 popover.global-search listview.results row {
   min-height: 36px;
@@ -50,12 +52,16 @@ notificationstack button {
   background: none;
 }
 
-scrolledwindow.shadow-when-scroll undershoot.top {
-  box-shadow: inset 0px 5px 14px -14px rgba(0,0,0,.9);
+scrolledwindow.undershoot-top > undershoot.top,
+preferencespage.undershoot-top > scrolledwindow > undershoot.top {
+  box-shadow: inset 0 1px alpha(@shade_color, .75);
+  background: linear-gradient(to bottom, alpha(@shade_color, .75), transparent 4px);
 }
 
-scrolledwindow.bottom-shadow-when-scroll undershoot.bottom {
-  box-shadow: inset 0px -5px 14px -14px rgba(0,0,0,.9);
+scrolledwindow.undershoot-bottom > undershoot.bottom,
+preferencespage.undershoot-bottom > scrolledwindow > undershoot.bottom {
+  box-shadow: inset 0 -1px alpha(@shade_color, .75);
+  background: linear-gradient(to top, alpha(@shade_color, .75), transparent 4px);
 }
 
 button.pill.small {
diff --git a/src/libide/terminal/ide-terminal.c b/src/libide/terminal/ide-terminal.c
index 766154220c006ee980786176bd714fb0109ae7ca..eadca0c96925ca0e1f70d89f97ae920bdbfd9869 100644
--- a/src/libide/terminal/ide-terminal.c
+++ b/src/libide/terminal/ide-terminal.c
@@ -101,6 +101,22 @@ ide_terminal_get_colors (IdeTerminal *self,
     *fg = priv->fg;
 }
 
+static void
+ide_terminal_direction_changed (GtkWidget        *widget,
+                                GtkTextDirection  previous_direction)
+{
+  IdeTerminal *self = IDE_TERMINAL (widget);
+  IdeTerminalPrivate *priv = ide_terminal_get_instance_private (self);
+
+  if (priv->popover != NULL)
+    {
+      if (gtk_widget_get_direction (GTK_WIDGET (self)) == GTK_TEXT_DIR_RTL)
+        gtk_widget_set_halign (GTK_WIDGET (priv->popover), GTK_ALIGN_END);
+      else
+        gtk_widget_set_halign (GTK_WIDGET (priv->popover), GTK_ALIGN_START);
+    }
+}
+
 static void
 ide_terminal_css_changed (GtkWidget         *widget,
                           GtkCssStyleChange *change)
@@ -215,7 +231,12 @@ ide_terminal_popup (IdeTerminal *self,
 
       priv->popover = GTK_POPOVER (gtk_popover_menu_new_from_model (G_MENU_MODEL (menu)));
       gtk_popover_set_has_arrow (priv->popover, FALSE);
-      gtk_widget_set_halign (GTK_WIDGET (priv->popover), GTK_ALIGN_END);
+
+      if (gtk_widget_get_direction (GTK_WIDGET (self)) == GTK_TEXT_DIR_RTL)
+        gtk_widget_set_halign (GTK_WIDGET (priv->popover), GTK_ALIGN_END);
+      else
+        gtk_widget_set_halign (GTK_WIDGET (priv->popover), GTK_ALIGN_START);
+
       gtk_widget_set_parent (GTK_WIDGET (priv->popover), GTK_WIDGET (self));
 
       g_signal_connect_object (priv->popover,
@@ -558,6 +579,7 @@ ide_terminal_class_init (IdeTerminalClass *klass)
 
   object_class->dispose = ide_terminal_dispose;
 
+  widget_class->direction_changed = ide_terminal_direction_changed;
   widget_class->css_changed = ide_terminal_css_changed;
   widget_class->size_allocate = ide_terminal_size_allocate;
 
diff --git a/src/libide/tree/ide-tree.ui b/src/libide/tree/ide-tree.ui
index f46772e44a264fafac45b98865e0673f5b043f1e..6cd17699f4e4f42c9a428f833f7229b58cfb13aa 100644
--- a/src/libide/tree/ide-tree.ui
+++ b/src/libide/tree/ide-tree.ui
@@ -23,6 +23,7 @@
             </property>
             <style>
               <class name="navigation-sidebar"/>
+              <class name="undershoot-bottom"/>
             </style>
           </object>
         </child>
diff --git a/src/plugins/buildui/gbp-buildui-status-popover.ui b/src/plugins/buildui/gbp-buildui-status-popover.ui
index d8f44d3340640d3c52b656f71c2a38e36ba54896..81bad0e89d09022494aa1ce785ba67e2b61ddd84 100644
--- a/src/plugins/buildui/gbp-buildui-status-popover.ui
+++ b/src/plugins/buildui/gbp-buildui-status-popover.ui
@@ -38,7 +38,7 @@
                     <property name="min-content-width">400</property>
                     <property name="max-content-width">400</property>
                     <style>
-                      <class name="shadow-when-scroll"/>
+                      <class name="undershoot-top"/>
                     </style>
                     <child>
                       <object class="GtkListView">
@@ -79,7 +79,7 @@
                     <property name="min-content-width">400</property>
                     <property name="max-content-width">400</property>
                     <style>
-                      <class name="shadow-when-scroll"/>
+                      <class name="undershoot-top"/>
                     </style>
                     <child>
                       <object class="GtkListView">
diff --git a/src/plugins/buildui/gbp-buildui-targets-dialog.c b/src/plugins/buildui/gbp-buildui-targets-dialog.c
index 8e5271ba3076500a2f1b6eaa53d1b2284e0bc55f..3ede1269815c1c5155f7bab620adee823379e3fa 100644
--- a/src/plugins/buildui/gbp-buildui-targets-dialog.c
+++ b/src/plugins/buildui/gbp-buildui-targets-dialog.c
@@ -275,6 +275,6 @@ gbp_buildui_targets_dialog_init (GbpBuilduiTargetsDialog *self)
        child = gtk_widget_get_next_sibling (child))
     {
       if (GTK_IS_SCROLLED_WINDOW (child))
-        gtk_widget_add_css_class (child, "shadow-when-scroll");
+        gtk_widget_add_css_class (child, "undershoot-top");
     }
 }
diff --git a/src/plugins/create-project/gbp-create-project-widget.ui b/src/plugins/create-project/gbp-create-project-widget.ui
index d34833ed7b559789a6e3901e0ee1cbddf3a4cec1..d7d07f114d8a6008c4720d747cea65cdafc9876b 100644
--- a/src/plugins/create-project/gbp-create-project-widget.ui
+++ b/src/plugins/create-project/gbp-create-project-widget.ui
@@ -3,6 +3,9 @@
   <template class="GbpCreateProjectWidget" parent="GtkWidget">
     <child>
       <object class="AdwPreferencesPage" id="main">
+        <style>
+          <class name="undershoot-top"/>
+        </style>
         <child>
           <object class="AdwPreferencesGroup">
             <child>
diff --git a/src/plugins/project-tree/gbp-project-tree-pane.ui b/src/plugins/project-tree/gbp-project-tree-pane.ui
index bd7aefa5932842651a92192bcb3802f6d1bfa3fa..47fb05125c82cfd1532c87f26ea27ece39823b03 100644
--- a/src/plugins/project-tree/gbp-project-tree-pane.ui
+++ b/src/plugins/project-tree/gbp-project-tree-pane.ui
@@ -111,10 +111,10 @@
             <signal name="search-started" handler="on_search_cb" swapped="true"/>
             <signal name="activate" handler="on_search_activate_cb" swapped="true"/>
             <property name="placeholder-text" translatable="yes">Filter</property>
-            <property name="margin-start">3</property>
-            <property name="margin-end">3</property>
-            <property name="margin-top">3</property>
-            <property name="margin-bottom">3</property>
+            <property name="margin-start">6</property>
+            <property name="margin-end">6</property>
+            <property name="margin-top">6</property>
+            <property name="margin-bottom">6</property>
           </object>
         </child>
       </object>
diff --git a/src/plugins/symbol-tree/gbp-symbol-popover.ui b/src/plugins/symbol-tree/gbp-symbol-popover.ui
index b3cc337870c4cc27d2ee17337dc43815e48b5515..d854f0c8d299a618d57fe202348c9ef234fe0e5d 100644
--- a/src/plugins/symbol-tree/gbp-symbol-popover.ui
+++ b/src/plugins/symbol-tree/gbp-symbol-popover.ui
@@ -17,7 +17,7 @@
             <property name="min-content-width">400</property>
             <property name="max-content-width">400</property>
             <style>
-              <class name="bottom-shadow-when-scroll"/>
+              <class name="undershoot-bottom"/>
             </style>
             <child>
               <object class="GtkListView" id="list_view">
diff --git a/src/plugins/vcsui/gbp-vcsui-clone-page.ui b/src/plugins/vcsui/gbp-vcsui-clone-page.ui
index b703b30f58b8a8c2af796ea431f8c96cd5954d3f..b1a2a64dd48f5476d7a6d31e012f5d8b49675e43 100644
--- a/src/plugins/vcsui/gbp-vcsui-clone-page.ui
+++ b/src/plugins/vcsui/gbp-vcsui-clone-page.ui
@@ -4,6 +4,9 @@
   <template class="GbpVcsuiClonePage" parent="GtkWidget">
     <child>
       <object class="AdwPreferencesPage" id="main">
+        <style>
+          <class name="undershoot-top"/>
+        </style>
         <child>
           <object class="AdwPreferencesGroup">
             <property name="margin-top">36</property>
@@ -72,7 +75,7 @@
                                 <property name="max-content-width">300</property>
                                 <property name="max-content-height">500</property>
                                 <style>
-                                  <class name="shadow-when-scroll"/>
+                                  <class name="undershoot-top"/>
                                 </style>
                                 <child>
                                   <object class="GtkListView">
diff --git a/src/plugins/vcsui/gbp-vcsui-switcher-popover.ui b/src/plugins/vcsui/gbp-vcsui-switcher-popover.ui
index 65beb890ebcbc36ce3f9f825d974f2d4bae2c25f..a3e90ac59accb3c06faffa004cc4b8461d8da935 100644
--- a/src/plugins/vcsui/gbp-vcsui-switcher-popover.ui
+++ b/src/plugins/vcsui/gbp-vcsui-switcher-popover.ui
@@ -35,7 +35,7 @@
                     <property name="min-content-width">300</property>
                     <property name="max-content-width">300</property>
                     <style>
-                      <class name="shadow-when-scroll"/>
+                      <class name="undershoot-top"/>
                     </style>
                     <child>
                       <object class="GtkListView" id="branches_view">
@@ -101,7 +101,7 @@
                     <property name="min-content-width">300</property>
                     <property name="max-content-width">300</property>
                     <style>
-                      <class name="shadow-when-scroll"/>
+                      <class name="undershoot-top"/>
                     </style>
                     <child>
                       <object class="GtkListView" id="tags_view">