diff --git a/data/plug.css b/data/plug.css
index 27c8370e5..f7eb9ec4b 100644
--- a/data/plug.css
+++ b/data/plug.css
@@ -83,6 +83,12 @@
     -gtk-icon-transform: scale(0.6);
 }
 
+settingspage.wallpaper actionbar box.end,
+settingspage.wallpaper actionbar box.start {
+    border-spacing: 12px;
+    padding: 6px;
+}
+
 .appearance-view desktop-preview {
     min-height: 96px;
     margin: 6px 6px 12px 12px;
diff --git a/src/Views/Wallpaper.vala b/src/Views/Wallpaper.vala
index 7cd5b1f39..f836959bc 100644
--- a/src/Views/Wallpaper.vala
+++ b/src/Views/Wallpaper.vala
@@ -79,15 +79,9 @@ public class PantheonShell.Wallpaper : Switchboard.SettingsPage {
             child = wallpaper_scrolled_window
         };
 
-        var add_wallpaper_button = new Gtk.Button.with_label (_("Import Photo…")) {
-            margin_top = 12,
-            margin_end = 12,
-            margin_bottom = 12,
-            margin_start = 12
-        };
+        var add_wallpaper_button = new Gtk.Button.with_label (_("Import Photo…"));
 
         combo = new Gtk.ComboBoxText () {
-            margin_end = 6,
             valign = CENTER
         };
         combo.append ("centered", _("Centered"));
@@ -101,19 +95,10 @@ public class PantheonShell.Wallpaper : Switchboard.SettingsPage {
         }
 
         color_button = new Gtk.ColorButton () {
-            margin_top = 12,
-            margin_end = 12,
-            margin_bottom = 12,
-            margin_start = 0,
             rgba = rgba_color
         };
         color_button.color_set.connect (update_color);
 
-        var size_group = new Gtk.SizeGroup (HORIZONTAL);
-        size_group.add_widget (add_wallpaper_button);
-        size_group.add_widget (combo);
-        size_group.add_widget (color_button);
-
         load_settings ();
 
         var actionbar = new Gtk.ActionBar ();
@@ -128,6 +113,7 @@ public class PantheonShell.Wallpaper : Switchboard.SettingsPage {
         box.add_css_class (Granite.STYLE_CLASS_FRAME);
 
         child = box;
+        add_css_class ("wallpaper");
 
         add_wallpaper_button.clicked.connect (show_wallpaper_chooser);