diff --git a/panels/applications/cc-applications-panel.css b/panels/applications/cc-applications-panel.css
index 538a9c9f4c350a35735278d39115ee2bf0e6ecee..c28771d9f74975e1f3c929a7b62b2ad634901c80 100644
--- a/panels/applications/cc-applications-panel.css
+++ b/panels/applications/cc-applications-panel.css
@@ -5,7 +5,3 @@
 .section-subtitle {
   opacity: 0.55;
 }
-
-.sidebar-icon.fullcolor {
-  opacity: 1;
-}
diff --git a/panels/applications/cc-applications-row.ui b/panels/applications/cc-applications-row.ui
index 5894dd8dd745777c2bba33a26fb0e0a4cc620a6a..5bd6e0931910c2b33867c9adb9ba9ca83efad7fe 100644
--- a/panels/applications/cc-applications-row.ui
+++ b/panels/applications/cc-applications-row.ui
@@ -12,8 +12,6 @@
           <object class="GtkImage" id="image">
             <property name="pixel-size">32</property>
             <style>
-              <class name="sidebar-icon"/>
-              <class name="fullcolor"/>
               <class name="lowres-icon"/>
             </style>
           </object>
diff --git a/shell/cc-panel-list.c b/shell/cc-panel-list.c
index 579b3561f1401db796059f41782f591186f5cff1..9ab6b7b80dc00483717d2b020f68e7c6222e08ab 100644
--- a/shell/cc-panel-list.c
+++ b/shell/cc-panel-list.c
@@ -287,13 +287,12 @@ row_data_new (CcPanelCategory     category,
   gtk_widget_set_hexpand (grid, TRUE);
   gtk_widget_set_margin_top (grid, 12);
   gtk_widget_set_margin_bottom (grid, 12);
-  gtk_widget_set_margin_start (grid, 12);
-  gtk_widget_set_margin_end (grid, 12);
+  gtk_widget_set_margin_start (grid, 6);
+  gtk_widget_set_margin_end (grid, 6);
   gtk_grid_set_column_spacing (GTK_GRID (grid), 12);
 
   /* Icon */
   image = gtk_image_new_from_icon_name (icon);
-  gtk_style_context_add_class (gtk_widget_get_style_context (image), "sidebar-icon");
 
   gtk_grid_attach (GTK_GRID (grid), image, 0, 0, 1, 1);
 
@@ -314,7 +313,6 @@ row_data_new (CcPanelCategory     category,
   if (has_sidebar)
     {
       image = gtk_image_new_from_icon_name ("go-next-symbolic");
-      gtk_style_context_add_class (gtk_widget_get_style_context (image), "sidebar-icon");
       gtk_grid_attach (GTK_GRID (grid), image, 2, 0, 1, 1);
     }
 
diff --git a/shell/cc-panel-list.ui b/shell/cc-panel-list.ui
index a4d7594cb10818c2f0f6f2951dad5f267933ceea..b0c380b4bd51889a898046ead6ddd3b55c43d4a0 100644
--- a/shell/cc-panel-list.ui
+++ b/shell/cc-panel-list.ui
@@ -23,17 +23,14 @@
                     <property name="visible">False</property>
                     <child>
                       <object class="GtkBox">
-                        <property name="margin-start">12</property>
-                        <property name="margin-end">12</property>
+                        <property name="margin-start">6</property>
+                        <property name="margin-end">6</property>
                         <property name="margin-top">12</property>
                         <property name="margin-bottom">12</property>
                         <property name="spacing">12</property>
                         <child>
                           <object class="GtkImage">
                             <property name="icon_name">preferences-system-privacy-symbolic</property>
-                            <style>
-                              <class name="sidebar-icon" />
-                            </style>
                           </object>
                         </child>
                         <child>
@@ -46,9 +43,6 @@
                         <child>
                           <object class="GtkImage">
                             <property name="icon_name">go-next-symbolic</property>
-                            <style>
-                              <class name="sidebar-icon" />
-                            </style>
                           </object>
                         </child>
                       </object>
diff --git a/shell/cc-window.ui b/shell/cc-window.ui
index 70fbcb00efc7489e97a130e8b881244a36813942..f4bf89f7ebfc24b328fb5a3952e376c3b8acb9d3 100644
--- a/shell/cc-window.ui
+++ b/shell/cc-window.ui
@@ -84,9 +84,6 @@
                 <property name="vexpand">True</property>
                 <property name="width-request">200</property>
                 <property name="hscrollbar_policy">never</property>
-                <style>
-                  <class name="view"/>
-                </style>
                 <child>
                   <object class="CcPanelList" id="panel_list">
                     <property name="search-mode" bind-source="search_bar" bind-property="search-mode-enabled" bind-flags="bidirectional" />