diff --git a/panels/applications/cc-applications-panel.ui b/panels/applications/cc-applications-panel.ui
index f8af188c8..7b6538da6 100644
--- a/panels/applications/cc-applications-panel.ui
+++ b/panels/applications/cc-applications-panel.ui
@@ -92,7 +92,7 @@
                             <property name="selection-mode">none</property>
                             <signal name="row-activated" handler="permission_row_activated_cb" object="CcApplicationsPanel" swapped="yes"/>
                             <style>
-                              <class name="content"/>
+                              <class name="boxed-list"/>
                             </style>
                             <child>
                               <object class="CcToggleRow" id="camera">
@@ -193,7 +193,7 @@
                           <object class="GtkListBox" id="integration_list">
                             <property name="selection-mode">none</property>
                             <style>
-                              <class name="content"/>
+                              <class name="boxed-list"/>
                             </style>
                             <child>
                               <object class="CcToggleRow" id="search">
@@ -303,7 +303,7 @@
                             <property name="selection-mode">none</property>
                             <signal name="row-activated" handler="handler_row_activated_cb" object="CcApplicationsPanel" swapped="yes"/>
                             <style>
-                              <class name="content"/>
+                              <class name="boxed-list"/>
                             </style>
                           </object>
                         </child>
@@ -347,7 +347,7 @@
                             <property name="selection-mode">none</property>
                             <signal name="row-activated" handler="storage_row_activated_cb" object="CcApplicationsPanel" swapped="yes"/>
                             <style>
-                              <class name="content"/>
+                              <class name="boxed-list"/>
                             </style>
                             <child>
                               <object class="CcInfoRow" id="storage">
@@ -483,7 +483,7 @@
           <object class="GtkListBox" id="builtin_list">
             <property name="selection-mode">none</property>
             <style>
-              <class name="content"/>
+              <class name="boxed-list"/>
             </style>
           </object>
         </child>
@@ -518,7 +518,7 @@
           <object class="GtkListBox" id="storage_list">
             <property name="selection-mode">none</property>
             <style>
-              <class name="content"/>
+              <class name="boxed-list"/>
             </style>
             <child>
               <object class="CcInfoRow" id="app">
diff --git a/panels/camera/cc-camera-panel.ui b/panels/camera/cc-camera-panel.ui
index 281fed1f9..667808e6e 100644
--- a/panels/camera/cc-camera-panel.ui
+++ b/panels/camera/cc-camera-panel.ui
@@ -87,7 +87,7 @@
                           <object class="GtkListBox" id="camera_apps_list_box">
                             <property name="selection-mode">none</property>
                             <style>
-                              <class name="content"/>
+                              <class name="boxed-list"/>
                             </style>
 
                             <child type="placeholder">
diff --git a/panels/color/cc-color-panel.ui b/panels/color/cc-color-panel.ui
index ad990ec59..17ddcd015 100644
--- a/panels/color/cc-color-panel.ui
+++ b/panels/color/cc-color-panel.ui
@@ -451,7 +451,7 @@
                         <property name="activate-on-single-click">False</property>
                         <property name="selection-mode">single</property>
                         <style>
-                          <class name="content" />
+                          <class name="boxed-list" />
                         </style>
                       </object>
                     </child>
diff --git a/panels/datetime/cc-datetime-panel.ui b/panels/datetime/cc-datetime-panel.ui
index c008405e5..0fca979d7 100644
--- a/panels/datetime/cc-datetime-panel.ui
+++ b/panels/datetime/cc-datetime-panel.ui
@@ -149,7 +149,7 @@
                 <property name="selection-mode">none</property>
                 <signal name="row-activated" handler="date_box_row_activated_cb" swapped="yes"/>
                 <style>
-                  <class name="content"/>
+                  <class name="boxed-list"/>
                 </style>
 
                 <!-- Year row -->
@@ -318,7 +318,7 @@
                     <signal name="row-activated" handler="list_box_row_activated" object="CcDateTimePanel" swapped="no"/>
                     <signal name="keynav-failed" handler="keynav_failed" object="CcDateTimePanel" swapped="no"/>
                     <style>
-                      <class name="content"/>
+                      <class name="boxed-list"/>
                     </style>
                     <child>
                       <object class="AdwActionRow" id="auto_datetime_row">
@@ -353,7 +353,7 @@
                     <signal name="row-activated" handler="list_box_row_activated" object="CcDateTimePanel" swapped="no"/>
                     <signal name="keynav-failed" handler="keynav_failed" object="CcDateTimePanel" swapped="no"/>
                     <style>
-                      <class name="content"/>
+                      <class name="boxed-list"/>
                     </style>
                     <child>
                       <object class="AdwActionRow" id="auto_timezone_row">
@@ -389,7 +389,7 @@
                     <signal name="row-activated" handler="list_box_row_activated" object="CcDateTimePanel" swapped="no"/>
                     <signal name="keynav-failed" handler="keynav_failed" object="CcDateTimePanel" swapped="no"/>
                     <style>
-                      <class name="content"/>
+                      <class name="boxed-list"/>
                     </style>
                     <child>
                       <object class="AdwActionRow" id="timeformat_row">
diff --git a/panels/diagnostics/cc-diagnostics-panel.ui b/panels/diagnostics/cc-diagnostics-panel.ui
index f4f8d75ac..92ed32eb6 100644
--- a/panels/diagnostics/cc-diagnostics-panel.ui
+++ b/panels/diagnostics/cc-diagnostics-panel.ui
@@ -42,7 +42,7 @@
                   <object class="GtkListBox" id="diagnostics_list_box">
                     <property name="selection-mode">none</property>
                     <style>
-                      <class name="content"/>
+                      <class name="boxed-list"/>
                     </style>
                     <child>
                       <object class="GtkListBoxRow">
diff --git a/panels/display/cc-display-settings.ui b/panels/display/cc-display-settings.ui
index 6bd157620..15518e88a 100644
--- a/panels/display/cc-display-settings.ui
+++ b/panels/display/cc-display-settings.ui
@@ -6,7 +6,7 @@
       <object class="GtkListBox" id="listbox">
         <property name="selection_mode">none</property>
         <style>
-          <class name="content" />
+          <class name="boxed-list" />
         </style>
         <child>
           <object class="AdwComboRow" id="orientation_row">
diff --git a/panels/display/cc-night-light-page.ui b/panels/display/cc-night-light-page.ui
index 9e69c3438..0bf7a760a 100644
--- a/panels/display/cc-night-light-page.ui
+++ b/panels/display/cc-night-light-page.ui
@@ -68,7 +68,7 @@
                 <property name="selection-mode">none</property>
 
                 <style>
-                  <class name="content" />
+                  <class name="boxed-list" />
                 </style>
 
                 <!-- Night Light -->
diff --git a/panels/info-overview/cc-info-overview-panel.ui b/panels/info-overview/cc-info-overview-panel.ui
index 18669acb5..6e0ce452f 100644
--- a/panels/info-overview/cc-info-overview-panel.ui
+++ b/panels/info-overview/cc-info-overview-panel.ui
@@ -29,7 +29,7 @@
                     <property name="selection-mode">none</property>
                     <signal name="row-activated" handler="cc_info_panel_row_activated_cb" swapped="yes"/>
                     <style>
-                      <class name="content" />
+                      <class name="boxed-list" />
                     </style>
 
                     <!-- Device name -->
@@ -48,7 +48,7 @@
                   <object class="GtkListBox" id="hardware_box">
                     <property name="selection-mode">none</property>
                     <style>
-                      <class name="content" />
+                      <class name="boxed-list" />
                     </style>
 
                     <!-- Hardware Model -->
@@ -101,7 +101,7 @@
                     <property name="selection-mode">none</property>
                     <signal name="row-activated" handler="cc_info_panel_row_activated_cb" swapped="yes"/>
                     <style>
-                      <class name="content" />
+                      <class name="boxed-list" />
                     </style>
 
                     <!-- OS Name -->
diff --git a/panels/keyboard/cc-input-chooser.ui b/panels/keyboard/cc-input-chooser.ui
index ff98a8a02..ce6485e7a 100644
--- a/panels/keyboard/cc-input-chooser.ui
+++ b/panels/keyboard/cc-input-chooser.ui
@@ -44,7 +44,7 @@
                 <signal name="row-activated" handler="on_input_sources_listbox_row_activated_cb" object="CcInputChooser" swapped="yes" />
                 <signal name="selected-rows-changed" handler="on_input_sources_listbox_selected_rows_changed_cb" object="CcInputChooser" swapped="yes" />
                 <style>
-                  <class name="content" />
+                  <class name="boxed-list" />
                 </style>
               </object>
             </child>
diff --git a/panels/keyboard/cc-input-list-box.ui b/panels/keyboard/cc-input-list-box.ui
index 45791de84..16e014147 100644
--- a/panels/keyboard/cc-input-list-box.ui
+++ b/panels/keyboard/cc-input-list-box.ui
@@ -10,7 +10,7 @@
         <property name="selection-mode">none</property>
         <signal name="row_activated" handler="input_row_activated_cb" object="CcInputListBox" swapped="yes"/>
         <style>
-          <class name="content"/>
+          <class name="boxed-list"/>
         </style>
         <child>
           <object class="GtkListBoxRow" id="no_inputs_row">
diff --git a/panels/keyboard/cc-keyboard-panel.ui b/panels/keyboard/cc-keyboard-panel.ui
index 3d3110410..76e7e3a6d 100644
--- a/panels/keyboard/cc-keyboard-panel.ui
+++ b/panels/keyboard/cc-keyboard-panel.ui
@@ -90,7 +90,7 @@
                   <object class="GtkListBox" id="input_source_list">
                     <property name="margin-bottom">20</property>
                     <style>
-                      <class name="content"/>
+                      <class name="boxed-list"/>
                     </style>
                     <child>
                       <object class="GtkListBoxRow">
@@ -166,7 +166,7 @@
                     <property name="margin-bottom">20</property>
                     <signal name="row-activated" handler="special_chars_activated" object="CcKeyboardPanel" swapped="no" />
                     <style>
-                      <class name="content"/>
+                      <class name="boxed-list"/>
                     </style>
                     <child>
                       <object class="AdwActionRow" id="alt_chars_row">
@@ -222,7 +222,7 @@
                     <property name="width-request">250</property>
                     <signal name="row-activated" handler="keyboard_shortcuts_activated" object="CcKeyboardPanel" swapped="no" />
                     <style>
-                      <class name="content"/>
+                      <class name="boxed-list"/>
                     </style>
                     <child>
                       <object class="AdwActionRow" id="common_shortcuts_row">
diff --git a/panels/keyboard/cc-keyboard-shortcut-dialog.ui b/panels/keyboard/cc-keyboard-shortcut-dialog.ui
index 6a7c8a2ad..53400e97d 100644
--- a/panels/keyboard/cc-keyboard-shortcut-dialog.ui
+++ b/panels/keyboard/cc-keyboard-shortcut-dialog.ui
@@ -84,7 +84,7 @@
                         <property name="margin-end">12</property>
                         <signal name="row-activated" handler="section_row_activated" object="CcKeyboardShortcutDialog" swapped="no" />
                         <style>
-                          <class name="content" />
+                          <class name="boxed-list" />
                         </style>
                       </object>
                     </child>
@@ -102,7 +102,7 @@
                       <object class="GtkListBox" id="shortcut_listbox">
                         <property name="selection-mode">none</property>
                         <style>
-                          <class name="content" />
+                          <class name="boxed-list" />
                         </style>
                         <signal name="row-activated" handler="shortcut_row_activated" object="CcKeyboardShortcutDialog" swapped="no" />
                         <child>
diff --git a/panels/keyboard/cc-xkb-modifier-dialog.ui b/panels/keyboard/cc-xkb-modifier-dialog.ui
index bfcc243ae..4e78216e5 100644
--- a/panels/keyboard/cc-xkb-modifier-dialog.ui
+++ b/panels/keyboard/cc-xkb-modifier-dialog.ui
@@ -30,7 +30,7 @@
             <child>
               <object class="GtkListBox" id="switch_listbox">
                 <style>
-                  <class name="content"/>
+                  <class name="boxed-list"/>
                 </style>
                 <child>
                   <object class="AdwActionRow" id="switch_row">
@@ -50,7 +50,7 @@
             <child>
               <object class="GtkListBox" id="listbox">
                 <style>
-                  <class name="content"/>
+                  <class name="boxed-list"/>
                 </style>
               </object>
             </child>
diff --git a/panels/location/cc-location-panel.ui b/panels/location/cc-location-panel.ui
index 1eda5edb5..14c05840c 100644
--- a/panels/location/cc-location-panel.ui
+++ b/panels/location/cc-location-panel.ui
@@ -94,7 +94,7 @@
                           <object class="GtkListBox" id="location_apps_list_box">
                             <property name="selection-mode">none</property>
                             <style>
-                              <class name="content"/>
+                              <class name="boxed-list"/>
                             </style>
 
                             <child type="placeholder">
diff --git a/panels/lock/cc-lock-panel.ui b/panels/lock/cc-lock-panel.ui
index 945ae2676..f8c67ee6f 100644
--- a/panels/lock/cc-lock-panel.ui
+++ b/panels/lock/cc-lock-panel.ui
@@ -31,7 +31,7 @@
                     <property name="selection-mode">none</property>
 
                     <style>
-                      <class name="content" />
+                      <class name="boxed-list" />
                     </style>
 
                     <!-- Blank Screen Delay row -->
diff --git a/panels/microphone/cc-microphone-panel.ui b/panels/microphone/cc-microphone-panel.ui
index 343629db5..569dd88e1 100644
--- a/panels/microphone/cc-microphone-panel.ui
+++ b/panels/microphone/cc-microphone-panel.ui
@@ -86,7 +86,7 @@
                             <property name="can-focus">true</property>
                             <property name="selection-mode">none</property>
                             <style>
-                              <class name="content"/>
+                              <class name="boxed-list"/>
                             </style>
 
                             <child type="placeholder">
diff --git a/panels/mouse/cc-mouse-panel.ui b/panels/mouse/cc-mouse-panel.ui
index 997a1a219..0cacf9f83 100644
--- a/panels/mouse/cc-mouse-panel.ui
+++ b/panels/mouse/cc-mouse-panel.ui
@@ -13,7 +13,7 @@
                   <object class="GtkListBox" id="general_listbox">
                     <property name="selection_mode">none</property>
                     <style>
-                      <class name="content"/>
+                      <class name="boxed-list"/>
                     </style>
                     <child>
                       <object class="AdwActionRow" id="primary_button_row">
@@ -69,7 +69,7 @@
                   <object class="GtkListBox" id="mouse_listbox">
                     <property name="selection_mode">none</property>
                     <style>
-                      <class name="content"/>
+                      <class name="boxed-list"/>
                     </style>
                     <child>
                       <object class="AdwActionRow" id="mouse_row">
@@ -115,7 +115,7 @@
                   <object class="GtkListBox" id="touchpad_listbox">
                     <property name="selection_mode">none</property>
                     <style>
-                      <class name="content"/>
+                      <class name="boxed-list"/>
                     </style>
                     <child>
                       <object class="AdwActionRow" id="touchpad_toggle_row">
diff --git a/panels/multitasking/cc-multitasking-panel.ui b/panels/multitasking/cc-multitasking-panel.ui
index 19b9ac7f5..7bd0ba576 100644
--- a/panels/multitasking/cc-multitasking-panel.ui
+++ b/panels/multitasking/cc-multitasking-panel.ui
@@ -35,7 +35,7 @@
                     <property name="margin-bottom">24</property>
 
                     <style>
-                      <class name="content"/>
+                      <class name="boxed-list"/>
                     </style>
 
                     <!-- Hot Corner -->
@@ -116,7 +116,7 @@
                     <property name="margin-bottom">18</property>
 
                     <style>
-                      <class name="content"/>
+                      <class name="boxed-list"/>
                     </style>
 
                     <!-- Dynamic Workspaces -->
@@ -192,7 +192,7 @@
                     <property name="margin-bottom">18</property>
 
                     <style>
-                      <class name="content"/>
+                      <class name="boxed-list"/>
                     </style>
 
                     <!-- Primary Display -->
@@ -272,7 +272,7 @@
                     <property name="margin-bottom">18</property>
 
                     <style>
-                      <class name="content"/>
+                      <class name="boxed-list"/>
                     </style>
 
                     <!-- All Workspaces -->
diff --git a/panels/network/cc-network-panel.ui b/panels/network/cc-network-panel.ui
index f11044ad4..91c5f77a8 100644
--- a/panels/network/cc-network-panel.ui
+++ b/panels/network/cc-network-panel.ui
@@ -99,7 +99,7 @@
                                   <object class="GtkListBox" id="empty_listbox">
                                     <property name="selection_mode">none</property>
                                     <style>
-                                      <class name="content" />
+                                      <class name="boxed-list" />
                                     </style>
                                     <child>
                                       <object class="AdwActionRow">
diff --git a/panels/network/cc-wifi-connection-list.c b/panels/network/cc-wifi-connection-list.c
index c97128200..5de65ca2e 100644
--- a/panels/network/cc-wifi-connection-list.c
+++ b/panels/network/cc-wifi-connection-list.c
@@ -706,7 +706,7 @@ cc_wifi_connection_list_init (CcWifiConnectionList *self)
 {
   self->listbox = GTK_LIST_BOX (gtk_list_box_new ());
   gtk_list_box_set_selection_mode (GTK_LIST_BOX (self->listbox), GTK_SELECTION_NONE);
-  gtk_widget_add_css_class (GTK_WIDGET (self->listbox), "content");
+  gtk_widget_add_css_class (GTK_WIDGET (self->listbox), "boxed-list");
   adw_bin_set_child (ADW_BIN (self), GTK_WIDGET (self->listbox));
 
   self->hide_unavailable = TRUE;
diff --git a/panels/network/cc-wifi-panel.ui b/panels/network/cc-wifi-panel.ui
index dfd12a8ac..d4855cd2b 100644
--- a/panels/network/cc-wifi-panel.ui
+++ b/panels/network/cc-wifi-panel.ui
@@ -24,7 +24,7 @@
                     <property name="margin_bottom">32</property>
                     <property name="selection-mode">none</property>
                     <style>
-                      <class name="content"/>
+                      <class name="boxed-list"/>
                     </style>
                     <child>
                       <object class="CcListRow" id="rfkill_row">
diff --git a/panels/network/network-ethernet.ui b/panels/network/network-ethernet.ui
index 0864c981b..d6efae569 100644
--- a/panels/network/network-ethernet.ui
+++ b/panels/network/network-ethernet.ui
@@ -52,7 +52,7 @@
           <object class="GtkListBox" id="details_listbox">
             <property name="selection_mode">none</property>
             <style>
-              <class name="content" />
+              <class name="boxed-list" />
             </style>
             <child>
               <object class="AdwActionRow" id="details_row">
diff --git a/panels/network/network-proxy.ui b/panels/network/network-proxy.ui
index ba7f43389..68042ee43 100644
--- a/panels/network/network-proxy.ui
+++ b/panels/network/network-proxy.ui
@@ -22,7 +22,7 @@
       <object class="GtkListBox">
         <property name="selection_mode">none</property>
         <style>
-          <class name="content" />
+          <class name="boxed-list" />
         </style>
         <child>
           <object class="GtkListBoxRow">
diff --git a/panels/network/network-vpn.ui b/panels/network/network-vpn.ui
index bd6dd3d4a..6bd0a2b04 100644
--- a/panels/network/network-vpn.ui
+++ b/panels/network/network-vpn.ui
@@ -17,7 +17,7 @@
       <object class="GtkListBox">
         <property name="selection_mode">none</property>
         <style>
-          <class name="content" />
+          <class name="boxed-list" />
         </style>
         <child>
           <object class="GtkListBoxRow">
diff --git a/panels/network/network-wifi.ui b/panels/network/network-wifi.ui
index 2d5f13207..ca4418bbb 100644
--- a/panels/network/network-wifi.ui
+++ b/panels/network/network-wifi.ui
@@ -26,7 +26,7 @@
               <object class="GtkListBox" id="hotspot_box">
                 <property name="selection-mode">none</property>
                 <style>
-                  <class name="content" />
+                  <class name="boxed-list" />
                 </style>
                 <child>
                   <object class="CcListRow" id="hotspot_name_row">
diff --git a/panels/notifications/cc-notifications-panel.ui b/panels/notifications/cc-notifications-panel.ui
index 3e1b988ce..1aec46ae8 100644
--- a/panels/notifications/cc-notifications-panel.ui
+++ b/panels/notifications/cc-notifications-panel.ui
@@ -25,7 +25,7 @@
                         <property name="margin_bottom">32</property>
                         <signal name="keynav-failed" handler="keynav_failed" object="CcNotificationsPanel" swapped="yes" />
                         <style>
-                          <class name="content"/>
+                          <class name="boxed-list"/>
                         </style>
                         <child>
                           <object class="CcListRow" id="dnd_row">
@@ -60,7 +60,7 @@
                         <signal name="keynav-failed" handler="keynav_failed" object="CcNotificationsPanel" swapped="yes" />
                         <signal name="row-activated" handler="select_app" object="CcNotificationsPanel" swapped="yes" />
                         <style>
-                          <class name="content"/>
+                          <class name="boxed-list"/>
                         </style>
                         <accessibility>
                           <relation name="labelled-by">app_list_heading_label</relation>
diff --git a/panels/power/cc-power-panel.ui b/panels/power/cc-power-panel.ui
index cb81889ae..b531fc879 100644
--- a/panels/power/cc-power-panel.ui
+++ b/panels/power/cc-power-panel.ui
@@ -65,7 +65,7 @@
                   <relation name="labelled-by">battery_section</relation>
                 </accessibility>
                 <style>
-                  <class name="content"/>
+                  <class name="boxed-list"/>
                 </style>
               </object>
             </child>
@@ -82,7 +82,7 @@
                   <relation name="labelled-by">device_section</relation>
                 </accessibility>
                 <style>
-                  <class name="content"/>
+                  <class name="boxed-list"/>
                 </style>
               </object>
             </child>
@@ -102,7 +102,7 @@
                   <relation name="labelled-by">power_profile_section</relation>
                 </accessibility>
                 <style>
-                  <class name="content"/>
+                  <class name="boxed-list"/>
                 </style>
               </object>
             </child>
@@ -113,7 +113,7 @@
                 <property name="margin_top">12</property>
                 <signal name="keynav-failed" handler="keynav_failed_cb" object="CcPowerPanel" swapped="yes"/>
                 <style>
-                  <class name="content"/>
+                  <class name="boxed-list"/>
                 </style>
               </object>
             </child>
diff --git a/panels/region/cc-format-chooser.ui b/panels/region/cc-format-chooser.ui
index 56fe9b0c5..4a15de9e0 100644
--- a/panels/region/cc-format-chooser.ui
+++ b/panels/region/cc-format-chooser.ui
@@ -144,7 +144,7 @@
                                 <property name="selection-mode">none</property>
                                 <signal name="row-activated" handler="row_activated" object="CcFormatChooser" swapped="yes" />
                                 <style>
-                                 <class name="content" />
+                                 <class name="boxed-list" />
                                 </style>
                               </object>
                             </child>
@@ -173,7 +173,7 @@
                                 <property name="selection-mode">none</property>
                                 <signal name="row-activated" handler="row_activated" object="CcFormatChooser" swapped="yes" />
                                 <style>
-                                 <class name="content" />
+                                 <class name="boxed-list" />
                                 </style>
                               </object>
                             </child>
diff --git a/panels/region/cc-region-panel.ui b/panels/region/cc-region-panel.ui
index a7e096954..bb7720a24 100644
--- a/panels/region/cc-region-panel.ui
+++ b/panels/region/cc-region-panel.ui
@@ -69,7 +69,7 @@
                     <property name="margin_bottom">18</property>
                     <property name="selection-mode">none</property>
                     <style>
-                      <class name="content" />
+                      <class name="boxed-list" />
                     </style>
                     <child>
                       <object class="GtkListBoxRow" id="language_row">
@@ -171,7 +171,7 @@
                   <object class="GtkListBox" id="formats_list">
                     <property name="selection-mode">none</property>
                     <style>
-                      <class name="content" />
+                      <class name="boxed-list" />
                     </style>
                     <child>
                       <object class="GtkListBoxRow" id="formats_row">
diff --git a/panels/search/cc-search-panel.ui b/panels/search/cc-search-panel.ui
index 6d601d607..9199904e4 100644
--- a/panels/search/cc-search-panel.ui
+++ b/panels/search/cc-search-panel.ui
@@ -36,7 +36,7 @@
                   <object class="GtkListBox" id="list_box">
                     <property name="visible">True</property>
                     <style>
-                      <class name="content"/>
+                      <class name="boxed-list"/>
                     </style>
                   </object>
                 </child>
diff --git a/panels/sharing/cc-sharing-panel.ui b/panels/sharing/cc-sharing-panel.ui
index 7381528bd..d2341a521 100644
--- a/panels/sharing/cc-sharing-panel.ui
+++ b/panels/sharing/cc-sharing-panel.ui
@@ -41,7 +41,7 @@
                   <object class="GtkListBox" id="main_list_box">
                     <property name="selection-mode">none</property>
                     <style>
-                      <class name="content" />
+                      <class name="boxed-list" />
                     </style>
                     <child>
                       <object class="CcListRow" id="personal_file_sharing_row">
@@ -440,7 +440,7 @@
               <object class="GtkListBox" id="shared_folders_listbox">
                 <property name="selection-mode">none</property>
                 <style>
-                  <class name="content" />
+                  <class name="boxed-list" />
                 </style>
                 <layout>
                   <property name="column">0</property>
diff --git a/panels/sound/cc-sound-panel.ui b/panels/sound/cc-sound-panel.ui
index 3249fb8ce..62d26eb70 100644
--- a/panels/sound/cc-sound-panel.ui
+++ b/panels/sound/cc-sound-panel.ui
@@ -57,7 +57,7 @@
                   <object class="GtkListBox" id="output_list_box">
                     <property name="selection_mode">none</property>
                     <style>
-                      <class name="content"/>
+                      <class name="boxed-list"/>
                     </style>
                     <child>
                       <object class="GtkListBoxRow">
@@ -232,7 +232,7 @@
                   <object class="GtkListBox" id="input_list_box">
                     <property name="selection_mode">none</property>
                     <style>
-                      <class name="content"/>
+                      <class name="boxed-list"/>
                     </style>
                     <child>
                       <object class="GtkListBoxRow">
diff --git a/panels/sound/cc-stream-list-box.ui b/panels/sound/cc-stream-list-box.ui
index 95f88f7dc..6050c2ca0 100644
--- a/panels/sound/cc-stream-list-box.ui
+++ b/panels/sound/cc-stream-list-box.ui
@@ -7,7 +7,7 @@
         <property name="hexpand">True</property>
         <property name="selection-mode">none</property>
         <style>
-          <class name="content" />
+          <class name="boxed-list" />
         </style>
       </object>
     </child>
diff --git a/panels/thunderbolt/cc-bolt-device-dialog.ui b/panels/thunderbolt/cc-bolt-device-dialog.ui
index 7d164dcdc..1c6d5b8c5 100644
--- a/panels/thunderbolt/cc-bolt-device-dialog.ui
+++ b/panels/thunderbolt/cc-bolt-device-dialog.ui
@@ -218,7 +218,7 @@
                         <property name="vexpand">False</property>
                                                 <property name="selection-mode">none</property>
                         <style>
-                          <class name="content" />
+                          <class name="boxed-list" />
                         </style>
                       </object>
                     </child>
diff --git a/panels/universal-access/cc-ua-panel.ui b/panels/universal-access/cc-ua-panel.ui
index 7e34af0e5..8e54abe81 100644
--- a/panels/universal-access/cc-ua-panel.ui
+++ b/panels/universal-access/cc-ua-panel.ui
@@ -70,7 +70,7 @@
                               <object class="GtkListBox" id="seeing_listbox">
                                 <property name="selection-mode">none</property>
                                 <style>
-                                  <class name="content" />
+                                  <class name="boxed-list" />
                                 </style>
                                 <accessibility>
                                   <relation name="labelled-by">seeing_heading_label</relation>
@@ -319,7 +319,7 @@
                               <object class="GtkListBox" id="hearing_listbox">
                                 <property name="selection-mode">none</property>
                                 <style>
-                                  <class name="content" />
+                                  <class name="boxed-list" />
                                 </style>
                                 <accessibility>
                                   <relation name="labelled-by">hearing_heading_label</relation>
@@ -378,7 +378,7 @@
                               <object class="GtkListBox" id="typing_listbox">
                                 <property name="selection-mode">none</property>
                                 <style>
-                                  <class name="content" />
+                                  <class name="boxed-list" />
                                 </style>
                                 <accessibility>
                                   <relation name="labelled-by">typing_heading_label</relation>
@@ -530,7 +530,7 @@
                               <object class="GtkListBox" id="pointing_listbox">
                                 <property name="selection-mode">none</property>
                                 <style>
-                                  <class name="content" />
+                                  <class name="boxed-list" />
                                 </style>
                                 <accessibility>
                                   <relation name="labelled-by">pointing_heading_label</relation>
diff --git a/panels/usage/cc-usage-panel.ui b/panels/usage/cc-usage-panel.ui
index 8478a7628..c3cc3882c 100644
--- a/panels/usage/cc-usage-panel.ui
+++ b/panels/usage/cc-usage-panel.ui
@@ -44,7 +44,7 @@
                     <property name="can-focus">1</property>
                     <property name="selection-mode">none</property>
                     <style>
-                      <class name="content" />
+                      <class name="boxed-list" />
                     </style>
                     <child>
                       <object class="AdwActionRow">
@@ -141,7 +141,7 @@
                     <property name="can-focus">1</property>
                     <property name="selection-mode">none</property>
                     <style>
-                      <class name="content" />
+                      <class name="boxed-list" />
                     </style>
                     <child>
                       <object class="AdwActionRow">
diff --git a/panels/user-accounts/cc-user-panel.ui b/panels/user-accounts/cc-user-panel.ui
index 060bbaf5d..b3e14264f 100644
--- a/panels/user-accounts/cc-user-panel.ui
+++ b/panels/user-accounts/cc-user-panel.ui
@@ -259,7 +259,7 @@
                                     <property name="selection-mode">GTK_SELECTION_NONE</property>
                                     <signal name="row-activated" handler="activate_row"/>
                                     <style>
-                                      <class name="content"/>
+                                      <class name="boxed-list"/>
                                     </style>
                                     <child>
                                       <object class="HdyActionRow" id="account_type_row">
@@ -357,7 +357,7 @@
                                     <property name="selection-mode">GTK_SELECTION_NONE</property>
                                     <signal name="row-activated" handler="activate_row"/>
                                     <style>
-                                      <class name="content"/>
+                                      <class name="boxed-list"/>
                                     </style>
                                     <child>
                                       <object class="HdyActionRow" id="password_row">
diff --git a/panels/wwan/cc-wwan-apn-dialog.ui b/panels/wwan/cc-wwan-apn-dialog.ui
index 9ac07ce38..59216d9fb 100644
--- a/panels/wwan/cc-wwan-apn-dialog.ui
+++ b/panels/wwan/cc-wwan-apn-dialog.ui
@@ -106,7 +106,7 @@
                         <property name="selection-mode">none</property>
                         <signal name="row-activated" handler="cc_wwan_apn_activated_cb" swapped="yes" />
                         <style>
-                          <class name="content" />
+                          <class name="boxed-list" />
                         </style>
                       </object>
                     </child>