diff --git a/gtk2_ardour/cuebox_ui.cc b/gtk2_ardour/cuebox_ui.cc
index d848eb2cf5..68a520fa4a 100644
--- a/gtk2_ardour/cuebox_ui.cc
+++ b/gtk2_ardour/cuebox_ui.cc
@@ -92,7 +92,7 @@ CueEntry::event_handler (GdkEvent* ev)
 			break;
 		case GDK_ENTER_NOTIFY:
 			if (ev->crossing.detail != GDK_NOTIFY_INFERIOR) {
-//				name_button->set_fill_color (UIConfiguration::instance ().color ("neutral:foregroundest"));
+				name_button->set_fill_color (UIConfiguration::instance ().color ("neutral:foregroundest"));
 				set_fill_color (HSV (fill_color ()).lighter (0.15).color ());
 			}
 			break;
@@ -123,7 +123,7 @@ CueEntry::_size_allocate (ArdourCanvas::Rect const& alloc)
 
 	name_text->size_allocate (ArdourCanvas::Rect (0, 0, height, height));
 	name_text->set_position (Duple (4. * scale, 2.5 * scale));
-	name_text->clamp_width (width - height);
+	name_text->clamp_width (height);
 
 	/* font scale may have changed. uiconfig 'embeds' the ui-scale in the font */
 	name_text->set_font_description (UIConfiguration::instance ().get_SmallBoldMonospaceFont ());
@@ -157,7 +157,7 @@ CueEntry::render (ArdourCanvas::Rect const& area, Cairo::RefPtr<Cairo::Context>
 
 	render_children (area, context);
 
-	{ //Play triangle, needs to match TriggerEntry buttons exactly
+	if (false) { //Play triangle, needs to match TriggerEntry buttons exactly
 		context->set_line_width (1 * scale);
 
 		float margin = 4 * scale;
diff --git a/gtk2_ardour/trigger_master.cc b/gtk2_ardour/trigger_master.cc
index 495ffb9e90..4a80ab38e6 100644
--- a/gtk2_ardour/trigger_master.cc
+++ b/gtk2_ardour/trigger_master.cc
@@ -564,7 +564,7 @@ CueMaster::CueMaster (Item* parent)
 	Event.connect (sigc::mem_fun (*this, &CueMaster::event_handler));
 
 	stop_shape = new ArdourCanvas::Polygon (this);
-	stop_shape->set_outline (true);
+	stop_shape->set_outline (false);
 	stop_shape->set_fill (true);
 	stop_shape->name = X_("stopbutton");
 	stop_shape->set_ignore_events (true);
@@ -639,7 +639,6 @@ CueMaster::event_handler (GdkEvent* ev)
 			break;
 		case GDK_ENTER_NOTIFY:
 			if (ev->crossing.detail != GDK_NOTIFY_INFERIOR) {
-				stop_shape->set_outline_color (UIConfiguration::instance ().color ("neutral:foreground"));
 				stop_shape->set_fill_color (UIConfiguration::instance ().color ("neutral:foreground"));
 				set_fill_color (HSV (fill_color ()).lighter (0.25).color ());
 			}
@@ -667,7 +666,7 @@ CueMaster::_size_allocate (ArdourCanvas::Rect const& alloc)
 	Rectangle::_size_allocate (alloc);
 
 	const double scale = UIConfiguration::instance ().get_ui_scale ();
-	_poly_margin       = 2. * scale;
+	_poly_margin       = 2 * scale;
 
 	const Distance width  = _rect.width ();
 	const Distance height = _rect.height ();
@@ -689,8 +688,7 @@ void
 CueMaster::set_default_colors ()
 {
 	set_fill_color (HSV (UIConfiguration::instance ().color ("theme:bg")).darker (0.5).color ());
-	stop_shape->set_outline_color (UIConfiguration::instance ().color ("neutral:foreground"));
-	stop_shape->set_fill_color (fill_color());
+	stop_shape->set_fill_color (UIConfiguration::instance ().color ("neutral:midground"));
 }
 
 void
diff --git a/gtk2_ardour/trigger_page.cc b/gtk2_ardour/trigger_page.cc
index 7489455241..f15889a191 100644
--- a/gtk2_ardour/trigger_page.cc
+++ b/gtk2_ardour/trigger_page.cc
@@ -66,8 +66,8 @@ using namespace std;
 TriggerPage::TriggerPage ()
 	: Tabbable (_content, _("Trigger Drom"), X_("trigger"))
 	, _cue_area_frame (0.5, 0, 1.0, 0)
-	, _cue_box (32, 16 * default_triggers_per_box)
-	, _master_widget (32, 16)
+	, _cue_box (16, 16 * default_triggers_per_box)
+	, _master_widget (16, 16)
 	, _master (_master_widget.root ())
 {
 	load_bindings ();