diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 16933af7af..cf51f00762 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -686,20 +686,21 @@ Editor::Editor ()
 	UI::instance()->set_tip (solo_btn, _("When active, something is soloed.\nClick to de-solo everything"));
 	solo_btn.set_related_action (ActionManager::get_action (X_("Main"), X_("cancel-solo")));
 
-	VBox *tsizer = manage(new VBox);
-	tsizer->pack_end(_track_box, false, false, 4);
+	Label *spcr = manage(new Label());
+	spcr->set_size_request(8,-1);
 
-	VBox *rsizer = manage(new VBox);
-	rsizer->pack_end(_livetrax_btn_rec_all, false, false, 4);
+	Table *tsizer = manage(new Table);
+	tsizer->set_homogeneous(false);
+	tsizer->set_border_width(4);
+	tsizer->set_spacings(4);
+	tsizer->attach(*manage(new Label()),   0,6, 0,1, FILL, EXPAND);
+	tsizer->attach(_track_box,             0,2, 1,2, FILL, FILL);
+	tsizer->attach(*manage(new Label()),   2,3, 0,1, EXPAND, SHRINK);
+	tsizer->attach(solo_btn,               3,4, 1,2, FILL, FILL);
+	tsizer->attach(_livetrax_btn_rec_all,  4,5, 1,2, FILL, FILL);
+	tsizer->attach(*spcr,                  5,6, 1,2, SHRINK, SHRINK);  //approx offset
 
-	VBox *ssizer = manage(new VBox);
-	ssizer->pack_end(solo_btn, false, false, 4);
-
-	time_bars_hbox.pack_start (*tsizer, true, true);
-	time_bars_hbox.pack_start (*manage(new Label()), true, true);
-	time_bars_hbox.pack_end (*rsizer, false, false, 12);
-	time_bars_hbox.pack_end (*ssizer, false, false);
-	time_bars_event_box.add (time_bars_hbox);
+	time_bars_event_box.add (*tsizer);
 #else
 	time_bars_event_box.add (time_bars_vbox);
 #endif