diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index ecefc1f3d1..69a2a0bc37 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -2749,37 +2749,26 @@ Editor::setup_toolbar ()
 
 	/* table containing mode buttons */
 
-	Table* mouse_mode_button_table = manage (new Table (Profile->get_sae() ? 4 : 6, 2));
-
-	int c = 0;
+	HBox* mouse_mode_button_box = manage (new HBox ());
 
 	if (Profile->get_sae()) {
-		mouse_mode_button_table->attach (mouse_move_button, c, c + 1, 0, 1);
-		++c;
+		mouse_mode_button_box->pack_start (mouse_move_button);
 	} else {
-		mouse_mode_button_table->attach (mouse_move_button, c, c + 1, 0, 1);
-		mouse_mode_button_table->attach (mouse_select_button, c + 1, c + 2, 0, 1);
-		mouse_mode_button_table->attach (join_object_range_button, c, c + 2, 1, 2);
-		c += 2;
+		mouse_mode_button_box->pack_start (mouse_move_button);
+		mouse_mode_button_box->pack_start (join_object_range_button);
+		mouse_mode_button_box->pack_start (mouse_select_button);
 	}
 
-	mouse_mode_button_table->attach (mouse_zoom_button, c, c + 1, 0, 1);
-	++c;
-	
+	mouse_mode_button_box->pack_start (mouse_zoom_button);
+
 	if (!Profile->get_sae()) {
-		mouse_mode_button_table->attach (mouse_gain_button, c, c + 1, 0, 1);
-		++c;
+		mouse_mode_button_box->pack_start (mouse_gain_button);
 	}
-	
-	mouse_mode_button_table->attach (mouse_timefx_button, c, c + 1, 0, 1);
-	++c;
-	
-	mouse_mode_button_table->attach (mouse_audition_button, c, c + 1, 0, 1);
-	++c;
-	
-	mouse_mode_button_table->attach (internal_edit_button, c, c + 1, 0, 1);
-	++c;
-	
+
+	mouse_mode_button_box->pack_start (mouse_timefx_button);
+	mouse_mode_button_box->pack_start (mouse_audition_button);
+	mouse_mode_button_box->pack_start (internal_edit_button);
+
 	vector<string> edit_mode_strings;
 	edit_mode_strings.push_back (edit_mode_to_string (Slide));
 	if (!Profile->get_sae()) {
@@ -2792,7 +2781,7 @@ Editor::setup_toolbar ()
 	edit_mode_selector.signal_changed().connect (sigc::mem_fun(*this, &Editor::edit_mode_selection_done));
 
 	mode_box->pack_start (edit_mode_selector);
-	mode_box->pack_start (*mouse_mode_button_table);
+	mode_box->pack_start (*mouse_mode_button_box);
 
 	mouse_mode_tearoff = manage (new TearOff (*mode_box));
 	mouse_mode_tearoff->set_name ("MouseModeBase");
diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index fbfd500495..b46b44b3eb 100644
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -626,9 +626,10 @@ Editor::register_actions ()
 	mouse_select_button.set_name ("MouseModeButton");
 	mouse_select_button.get_image ()->show ();
 
-	join_object_range_button.set_image (*(manage (new Image (::get_icon ("join_tools")))));
+	join_object_range_button.set_image (*(manage (new Image (::get_icon ("tool_object_range")))));
+	join_object_range_button.set_label ("");
 	join_object_range_button.set_name ("MouseModeButton");
-	join_object_range_button.get_image()->show ();
+	join_object_range_button.get_image ()->show ();
 
 	act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-gain", _("Gain Tool"), sigc::bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseGain));
 	act->connect_proxy (mouse_gain_button);
diff --git a/gtk2_ardour/icons/tool_object_range.png b/gtk2_ardour/icons/tool_object_range.png
new file mode 100644
index 0000000000..cd3732eb40
Binary files /dev/null and b/gtk2_ardour/icons/tool_object_range.png differ