diff --git a/data/styles/CategoryView.scss b/data/styles/CategoryView.scss
index 38c1b61f..c31fde49 100644
--- a/data/styles/CategoryView.scss
+++ b/data/styles/CategoryView.scss
@@ -1,11 +1,11 @@
 category-view .main-clamp {
     padding: rem(12px);
 
-    .category-box {
-        border-spacing: rem(24px);
-    }
-
     .rich-list row {
         border-radius: rem(3px);
     }
+
+    flowboxchild box {
+        margin: 0.5rem;
+    }
 }
diff --git a/src/CategoryView.vala b/src/CategoryView.vala
index e06dde62..e0cde6e3 100644
--- a/src/CategoryView.vala
+++ b/src/CategoryView.vala
@@ -56,14 +56,13 @@ public class Switchboard.CategoryView : Adw.NavigationPage {
         plug_search = new PlugsSearch ();
         plug_search_result = new Gee.ArrayList<SearchEntry?> ();
 
-        var category_box = new Gtk.Box (VERTICAL, 0) {
+        var category_box = new Granite.Box (VERTICAL, DOUBLE) {
             vexpand = true
         };
         category_box.append (personal_category);
         category_box.append (hardware_category);
         category_box.append (network_category);
         category_box.append (system_category);
-        category_box.add_css_class ("category-box");
 
         stack = new Gtk.Stack () {
             transition_type = CROSSFADE,
diff --git a/src/Widgets/CategoryIcon.vala b/src/Widgets/CategoryIcon.vala
index 36c61a61..f7e0da11 100644
--- a/src/Widgets/CategoryIcon.vala
+++ b/src/Widgets/CategoryIcon.vala
@@ -31,7 +31,7 @@ public class Switchboard.CategoryIcon : Gtk.FlowBoxChild {
 
     construct {
         var icon = new Gtk.Image.from_icon_name (plug.icon) {
-            pixel_size = 32,
+            icon_size = LARGE,
             tooltip_text = plug.description
         };
 
@@ -42,12 +42,7 @@ public class Switchboard.CategoryIcon : Gtk.FlowBoxChild {
             xalign = 0
         };
 
-        var layout = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6) {
-            margin_top = 6,
-            margin_end = 6,
-            margin_bottom = 6,
-            margin_start = 6
-        };
+        var layout = new Granite.Box (HORIZONTAL, HALF);
         layout.append (icon);
         layout.append (plug_name);