diff --git a/src/DeviceRow.vala b/src/DeviceRow.vala
index b906b637..9ff7fecb 100644
--- a/src/DeviceRow.vala
+++ b/src/DeviceRow.vala
@@ -51,10 +51,6 @@ public class Sound.DeviceRow : Gtk.ListBoxRow {
         description_label.add_css_class (Granite.STYLE_CLASS_SMALL_LABEL);
 
         var grid = new Gtk.Grid () {
-            margin_top = 6,
-            margin_end = 6,
-            margin_bottom = 6,
-            margin_start = 6,
             column_spacing = 12,
             orientation = Gtk.Orientation.HORIZONTAL
         };
diff --git a/src/InputPanel.vala b/src/InputPanel.vala
index 653702f6..28a473c3 100644
--- a/src/InputPanel.vala
+++ b/src/InputPanel.vala
@@ -29,6 +29,7 @@ public class Sound.InputPanel : Gtk.Box {
             vexpand = true
         };
         devices_listbox.set_placeholder (no_device_grid);
+        devices_listbox.add_css_class (Granite.STYLE_CLASS_RICH_LIST);
 
         devices_listbox.row_activated.connect ((row) => {
             pam.set_default_device.begin (((Sound.DeviceRow) row).device);
diff --git a/src/OutputPanel.vala b/src/OutputPanel.vala
index 8b46ca88..edd5ed6e 100644
--- a/src/OutputPanel.vala
+++ b/src/OutputPanel.vala
@@ -47,6 +47,7 @@ public class Sound.OutputPanel : Gtk.Box {
             vexpand = true
         };
         devices_listbox.set_placeholder (no_device_grid);
+        devices_listbox.add_css_class (Granite.STYLE_CLASS_RICH_LIST);
 
         var scrolled = new Gtk.ScrolledWindow () {
             child = devices_listbox