diff --git a/src/Views/Appearance.vala b/src/Views/Appearance.vala
index 4a920b5dd..19426300a 100644
--- a/src/Views/Appearance.vala
+++ b/src/Views/Appearance.vala
@@ -450,8 +450,7 @@ public class PantheonShell.Appearance : Switchboard.SettingsPage {
             overlay.add_overlay (dock);
             overlay.add_overlay (window_back);
             overlay.add_overlay (window_front);
-            overlay.add_css_class (Granite.STYLE_CLASS_CARD);
-            overlay.add_css_class (Granite.STYLE_CLASS_ROUNDED);
+            overlay.add_css_class (Granite.CssClass.CARD);
 
             var monitor = Gdk.Display.get_default ().get_monitor_at_surface (
                 (((Gtk.Application) Application.get_default ()).active_window).get_surface ()
diff --git a/src/Views/Wallpaper.vala b/src/Views/Wallpaper.vala
index e0a379156..3006546b8 100644
--- a/src/Views/Wallpaper.vala
+++ b/src/Views/Wallpaper.vala
@@ -113,9 +113,12 @@ public class PantheonShell.Wallpaper : Switchboard.SettingsPage {
         var box = new Gtk.Box (VERTICAL, 0);
         box.append (view_overlay);
         box.append (actionbar);
-        box.add_css_class (Granite.STYLE_CLASS_FRAME);
 
-        child = box;
+        var frame = new Gtk.Frame (null) {
+            child = box
+        };
+
+        child = frame;
         add_css_class ("wallpaper");
 
         add_wallpaper_button.clicked.connect (show_wallpaper_chooser);
diff --git a/src/Widgets/WallpaperContainer.vala b/src/Widgets/WallpaperContainer.vala
index ba782228a..9add42aa0 100644
--- a/src/Widgets/WallpaperContainer.vala
+++ b/src/Widgets/WallpaperContainer.vala
@@ -74,8 +74,7 @@ public class PantheonShell.WallpaperContainer : Gtk.FlowBoxChild {
             content_fit = COVER,
             height_request = THUMB_HEIGHT
         };
-        image.add_css_class (Granite.STYLE_CLASS_CARD);
-        image.add_css_class (Granite.STYLE_CLASS_ROUNDED);
+        image.add_css_class (Granite.CssClass.CARD);
 
         var check = new Gtk.CheckButton () {
             active = true,