diff --git a/src/AppChooser/AppButton.vala b/src/AppChooser/AppButton.vala
index cf9bcf48..09ec1286 100644
--- a/src/AppChooser/AppButton.vala
+++ b/src/AppChooser/AppButton.vala
@@ -22,10 +22,14 @@ public class AppChooser.AppButton : Gtk.ListBoxRow {
             ellipsize = Pango.EllipsizeMode.END
         };
 
-        var box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
+        var box = new Granite.Box (HORIZONTAL, HALF);
         box.append (icon);
         box.append (name);
 
-        child = box;
+        var list_item = new Granite.ListItem () {
+            child = box
+        };
+
+        child = list_item;
     }
 }
diff --git a/src/AppChooser/Dialog.vala b/src/AppChooser/Dialog.vala
index 04495758..fba4b855 100644
--- a/src/AppChooser/Dialog.vala
+++ b/src/AppChooser/Dialog.vala
@@ -118,7 +118,6 @@ public class AppChooser.Dialog : Gtk.Window {
             hexpand = true,
             vexpand = true
         };
-        listbox.add_css_class (Granite.STYLE_CLASS_RICH_LIST);
         listbox.set_placeholder (placeholder);
 
         var scrolled_window = new Gtk.ScrolledWindow () {
diff --git a/src/ScreenCast/Dialog.vala b/src/ScreenCast/Dialog.vala
index 072daeba..cd816563 100644
--- a/src/ScreenCast/Dialog.vala
+++ b/src/ScreenCast/Dialog.vala
@@ -30,7 +30,6 @@ public class ScreenCast.Dialog : Granite.MessageDialog {
             hexpand = true,
             vexpand = true
         };
-        list_box.add_css_class (Granite.STYLE_CLASS_RICH_LIST);
         list_box.set_header_func (header_func);
 
         if (MONITOR in source_types) {
diff --git a/src/ScreenCast/SelectionRow.vala b/src/ScreenCast/SelectionRow.vala
index 58bb7c7e..43cde961 100644
--- a/src/ScreenCast/SelectionRow.vala
+++ b/src/ScreenCast/SelectionRow.vala
@@ -58,18 +58,22 @@ public class ScreenCast.SelectionRow : Gtk.ListBoxRow {
             xalign = 0
         };
 
-        label_box = new Gtk.Box (VERTICAL, 0) {
-            margin_start = 6,
+        label_box = new Granite.Box (VERTICAL, NONE) {
             valign = CENTER
         };
+        label_box.add_css_class ("text-box");
         label_box.append (title_label);
 
-        var box = new Gtk.Box (HORIZONTAL, 0);
+        var box = new Granite.Box (HORIZONTAL, NONE);
         box.append (check_button);
         box.append (image);
         box.append (label_box);
 
-        child = box;
+        var list_item = new Granite.ListItem () {
+            child = box
+        };
+
+        child = list_item;
 
         check_button.bind_property ("active", this, "selected", DEFAULT);
     }