diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 64a54741a3..bbc5211c3e 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -235,7 +235,18 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 	auto_loop_button.set_name ("transport button");
 	play_selection_button.set_name ("transport button");
 	rec_button.set_name ("transport recenable button");
+	join_play_range_button.set_name ("transport button");
 
+	roll_button.set_tweaks (ArdourButton::ShowHover);
+	stop_button.set_tweaks (ArdourButton::ShowHover);
+	auto_loop_button.set_tweaks (ArdourButton::ShowHover);
+	play_selection_button.set_tweaks (ArdourButton::ShowHover);
+	rec_button.set_tweaks (ArdourButton::ShowHover);
+	join_play_range_button.set_tweaks (ArdourButton::ShowHover);
+
+	goto_start_button.set_tweaks (ArdourButton::Tweaks(ArdourButton::ShowClick|ArdourButton::ShowHover));
+	goto_end_button.set_tweaks (ArdourButton::Tweaks(ArdourButton::ShowClick|ArdourButton::ShowHover));
+	
 	last_configure_time= 0;
 	last_peak_grab = 0;
 
diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index 485126d717..7c34652419 100644
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -243,19 +243,10 @@ ARDOUR_UI::setup_transport ()
 	time_master_button.set_name ("TransportButton");
 	sync_button.set_name ("TransportSyncButton");
 
-	stop_button.set_size_request(29, -1);
-	roll_button.set_size_request(29, -1);
-	auto_loop_button.set_size_request(29, -1);
-	play_selection_button.set_size_request(29, -1);
-	goto_start_button.set_size_request(29, -1);
-	goto_end_button.set_size_request(29, -1);
-	rec_button.set_size_request(29, -1);
-
 	Widget* w;
 
 	stop_button.set_active_state (Active);
 
-
 	goto_start_button.set_image (get_icon (X_("transport_start")));
 	goto_end_button.set_image (get_icon (X_("transport_end")));
 	roll_button.set_image (get_icon (X_("transport_play")));