diff --git a/data/screenshot.png b/data/screenshot.png
index d618f0f9..a8e3760a 100644
Binary files a/data/screenshot.png and b/data/screenshot.png differ
diff --git a/src/Indicator.vala b/src/Indicator.vala
index 77aa35c1..f1e4932a 100644
--- a/src/Indicator.vala
+++ b/src/Indicator.vala
@@ -84,10 +84,9 @@ public class DateTime.Indicator : Wingpanel.Indicator {
             main_grid = new Gtk.Grid ();
             main_grid.margin_top = 12;
             main_grid.attach (calendar, 0, 0);
-            main_grid.attach (new Gtk.Separator (Gtk.Orientation.VERTICAL), 1, 0);
-            main_grid.attach (scrolled_window, 2, 0);
-            main_grid.attach (new Wingpanel.Widgets.Separator (), 0, 2, 3);
-            main_grid.attach (settings_button, 0, 3, 3);
+            main_grid.attach (scrolled_window, 1, 0);
+            main_grid.attach (new Wingpanel.Widgets.Separator (), 0, 2, 2);
+            main_grid.attach (settings_button, 0, 3, 2);
 
             var size_group = new Gtk.SizeGroup (Gtk.SizeGroupMode.HORIZONTAL);
             size_group.add_widget (calendar);