diff --git a/gtk2_ardour/ardour_button.cc b/gtk2_ardour/ardour_button.cc
index 60fad0db32..034f1fc665 100644
--- a/gtk2_ardour/ardour_button.cc
+++ b/gtk2_ardour/ardour_button.cc
@@ -602,6 +602,13 @@ ArdourButton::on_size_request (Gtk::Requisition* req)
 	}
 
 	req->width += _corner_radius;
+
+	if ((_tweaks & Square)==Square) {
+		if (req->width < req->height)
+			req->width = req->height;
+		if (req->height < req->width)
+			req->height = req->width;
+	}
 }
 
 /**
diff --git a/gtk2_ardour/ardour_button.h b/gtk2_ardour/ardour_button.h
index 393df43b36..53869c89bc 100644
--- a/gtk2_ardour/ardour_button.h
+++ b/gtk2_ardour/ardour_button.h
@@ -53,7 +53,7 @@ class ArdourButton : public CairoWidget , public Gtkmm2ext::Activatable
 	virtual ~ArdourButton ();
 
 	enum Tweaks {
-		unused1 = 0x1,
+		Square = 0x1,
 		unused2 = 0x2,
 		unused3 = 0x4,
 	};
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index 90cb341c69..c6e2689021 100644
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -251,6 +251,14 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
 	ARDOUR_UI::instance()->set_tip(*mute_button,_("Mute"));
 	ARDOUR_UI::instance()->set_tip(route_group_button, _("Route Group"));
 
+	mute_button->set_tweaks(ArdourButton::Square);
+	solo_button->set_tweaks(ArdourButton::Square);
+	rec_enable_button->set_tweaks(ArdourButton::Square);
+	playlist_button.set_tweaks(ArdourButton::Square);
+	automation_button.set_tweaks(ArdourButton::Square);
+	route_group_button.set_tweaks(ArdourButton::Square);
+	number_label.set_tweaks(ArdourButton::Square);
+
 	if (is_midi_track()) {
 		ARDOUR_UI::instance()->set_tip(automation_button, _("MIDI Controllers and Automation"));
 	} else {