diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
index 9bea175e18..e52078ed85 100644
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -41,6 +41,7 @@
 #include "gtkmm2ext/bindings.h"
 
 #include "widgets/ardour_button.h"
+#include "widgets/tooltips.h"
 
 #include "actions.h"
 #include "ardour_message.h"
@@ -495,6 +496,16 @@ ARDOUR_UI::livetrax_setup_windows ()
 	act = ActionManager::get_action (X_("Main"), X_("ResetMeterPeakHold"));
 	_livetrax_btn_peak_reset.set_related_action (act);
 
+	auto_return_button.set_text(_("Auto Return"));
+	act = ActionManager::get_action ("Transport", "ToggleAutoReturn");
+	auto_return_button.set_related_action (act);
+	ArdourWidgets::set_tooltip (auto_return_button, _("Return to last playback start when transport stops"));
+
+	follow_edits_button.set_text(_("Follow Range"));
+	act = ActionManager::get_action (X_("Transport"), X_("ToggleFollowEdits"));
+	follow_edits_button.set_related_action (act);
+	ArdourWidgets::set_tooltip (follow_edits_button, _("Locate the playhead to the start of the Range, when a Range is selected"));
+
 	int TCOL = 0;
 
 	livetrax_top_table_l.attach (*icon,                 TCOL, TCOL+4, 0, 2, FILL, EXPAND, 4, 4);     TCOL+=4;
@@ -506,22 +517,24 @@ ARDOUR_UI::livetrax_setup_windows ()
 
 	livetrax_top_table_l.attach (*manage(new Label("")),         TCOL, TCOL+1, 0, 2, EXPAND, FILL, 4, 4);   TCOL++;
 
+	livetrax_top_table_l.attach (auto_return_button,             TCOL, TCOL+1, 0, 1, FILL, FILL, 4, 4);
+	livetrax_top_table_l.attach (follow_edits_button,            TCOL, TCOL+1, 1, 2, FILL, FILL, 4, 4);   TCOL++;
+
+	livetrax_top_table_l.attach (*manage(new Label("")),         TCOL, TCOL+1, 0, 2, EXPAND, FILL, 4, 4);   TCOL++;
+
 	livetrax_top_table_l.attach (sync_button,                    TCOL, TCOL+1, 0, 1, FILL, FILL, 4, 4);
 	livetrax_top_table_l.attach (*livetrax_tc_button,            TCOL, TCOL+1, 1, 2, FILL, FILL, 4, 4);  TCOL++;
 
-	livetrax_top_table_l.attach (*manage(new Label("Source: MTC")),         TCOL, TCOL+1, 0, 1, FILL, FILL, 4, 4);
-	livetrax_top_table_l.attach (*manage(new Label("Lock: 00:01:00:00")),   TCOL, TCOL+1, 1, 2, FILL, FILL, 4, 4);   TCOL++;
-
 //	livetrax_top_table.attach (*cw,                             TCOL, TCOL+1, 0, 2, FILL, FILL, 4, 4);   TCOL++;
 
 	TCOL = 0;
 
-	livetrax_top_table_r.attach (disk_space_label,              TCOL, TCOL+1, 0, 1, FILL, FILL, 4, 4);
-	livetrax_top_table_r.attach (*ev_dsp,                       TCOL, TCOL+1, 1, 2, FILL, FILL, 4, 4);   TCOL++;
-
 	livetrax_top_table_r.attach (*livetrax_ff_dropdown,          TCOL, TCOL+1, 0, 1, FILL, FILL, 4, 4);
 	livetrax_top_table_r.attach (*livetrax_sr_button,            TCOL, TCOL+1, 1, 2, FILL, FILL, 4, 4);   TCOL++;
 
+	livetrax_top_table_r.attach (disk_space_label,              TCOL, TCOL+1, 0, 1, FILL, FILL, 4, 4);
+	livetrax_top_table_r.attach (*ev_dsp,                       TCOL, TCOL+1, 1, 2, FILL, FILL, 4, 4);   TCOL++;
+
 	livetrax_top_table_r.attach (*manage(new Label("")),         TCOL, TCOL+1, 0, 2, EXPAND, FILL, 4, 4);   TCOL++;
 
 	livetrax_top_table_r.attach (*livetrax_stereo_out_button,      TCOL, TCOL+1, 0, 1, FILL, FILL, 4, 4);