diff --git a/panels/background/background.ui b/panels/background/background.ui
index 2b72502..5eaef45 100644
--- a/panels/background/background.ui
+++ b/panels/background/background.ui
@@ -197,7 +197,7 @@
False
diff --git a/panels/background/cc-background-chooser-dialog.c b/panels/background/cc-background-chooser-dialog.c
index 61d19d4..f99267b 100644
--- a/panels/background/cc-background-chooser-dialog.c
+++ b/panels/background/cc-background-chooser-dialog.c
@@ -406,6 +406,7 @@ cc_background_chooser_dialog_init (CcBackgroundChooserDialog *chooser)
priv->icon_view = gtk_icon_view_new ();
gtk_widget_set_hexpand (priv->icon_view, TRUE);
+ gtk_icon_view_set_columns (GTK_ICON_VIEW (priv->icon_view), 3);
gtk_container_add (GTK_CONTAINER (priv->sw_content), priv->icon_view);
g_signal_connect (priv->icon_view, "selection-changed", G_CALLBACK (on_selection_changed), chooser);
g_signal_connect (priv->icon_view, "item-activated", G_CALLBACK (on_item_activated), chooser);
diff --git a/panels/color/cc-color-panel.c b/panels/color/cc-color-panel.c
index 590973d..90b40c8 100644
--- a/panels/color/cc-color-panel.c
+++ b/panels/color/cc-color-panel.c
@@ -2104,7 +2104,6 @@ cc_color_panel_dispose (GObject *object)
g_clear_object (&priv->list_box_size);
g_clear_pointer (&priv->sensors, g_ptr_array_unref);
g_clear_pointer (&priv->list_box_filter, g_free);
- g_clear_pointer (&priv->assistant_calib, gtk_widget_destroy);
g_clear_pointer (&priv->dialog_assign, gtk_widget_destroy);
G_OBJECT_CLASS (cc_color_panel_parent_class)->dispose (object);
diff --git a/panels/color/color.ui b/panels/color/color.ui
index 06d146a..1f90a9c 100644
--- a/panels/color/color.ui
+++ b/panels/color/color.ui
@@ -228,6 +228,7 @@