diff --git a/gtk2_ardour/ardour3_styles.rc.in b/gtk2_ardour/ardour3_styles.rc.in
index c510a372e8..89a3347df6 100644
--- a/gtk2_ardour/ardour3_styles.rc.in
+++ b/gtk2_ardour/ardour3_styles.rc.in
@@ -628,6 +628,8 @@ style "medium_bold_entry"  = "medium_bold_text"
 
 style "small_entry" = "small_text"
 {
+	xthickness = 3
+	ythickness = 3
 	fg[NORMAL] = @@COLPREFIX@_text
 	fg[ACTIVE] = @@COLPREFIX@_contrasting_indicator
 	fg[SELECTED] = @@COLPREFIX@_fg_selected
@@ -637,8 +639,8 @@ style "small_entry" = "small_text"
 	text[SELECTED] = @@COLPREFIX@_fg_selected
 
 	bg[NORMAL] = @@COLPREFIX@_base
+	bg[ACTIVE] = @@COLPREFIX@_base
 	bg[SELECTED] = @@COLPREFIX@_base
-	bg[SELECTED] = @@COLPREFIX@_bg_selected
 
 	base[NORMAL] = @@COLPREFIX@_base
 	base[ACTIVE] = @@COLPREFIX@_base
@@ -647,8 +649,9 @@ style "small_entry" = "small_text"
 
 style "red_active_small_entry" = "small_entry"
 {
-	fg[ACTIVE] = @@COLPREFIX@_bright_indicator
-	fg[SELECTED] = @@COLPREFIX@_bright_indicator
+	fg[ACTIVE] = @@COLPREFIX@_text
+	fg[SELECTED] = @@COLPREFIX@_text
+	text[SELECTED] = @@COLPREFIX@_text
 }
 
 style "small_bold_entry" = "small_bold_text"
@@ -905,25 +908,17 @@ style "paler_bright_when_active" = "medium_text"
 	bg[ACTIVE] = lighter(@@COLPREFIX@_bright_indicator)
 }
 
-style "peak_display_peaked_entry" = "small_text"
+style "peak_display_peaked_entry" = "small_entry"
 {
-	fg[NORMAL] = @@COLPREFIX@_text
 	fg[ACTIVE] = @@COLPREFIX@_text
 	fg[SELECTED] = @@COLPREFIX@_text
-	text[NORMAL] = @@COLPREFIX@_text
-	text[ACTIVE] = @@COLPREFIX@_text
 	text[SELECTED] = @@COLPREFIX@_text
 
-        bg[NORMAL] = @@COLPREFIX@_bright_indicator
-        bg[ACTIVE] = @@COLPREFIX@_bright_indicator
-        bg[PRELIGHT] = @@COLPREFIX@_bright_indicator
-        bg[INSENSITIVE] = @@COLPREFIX@_bright_indicator
-        bg[SELECTED] = @@COLPREFIX@_bright_indicator
-        base[NORMAL] = @@COLPREFIX@_bright_indicator
-        base[ACTIVE] = @@COLPREFIX@_bright_indicator
-        base[PRELIGHT] = @@COLPREFIX@_bright_indicator
-        base[INSENSITIVE] = @@COLPREFIX@_bright_indicator
-        base[SELECTED] = @@COLPREFIX@_bright_indicator
+	base[NORMAL] = @@COLPREFIX@_bright_indicator
+	base[ACTIVE] = @@COLPREFIX@_bright_indicator
+	base[PRELIGHT] = @@COLPREFIX@_bright_indicator
+	base[INSENSITIVE] = @@COLPREFIX@_bright_indicator
+	base[SELECTED] = @@COLPREFIX@_bright_indicator
 }
 
 style "selected_strip_frame"
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 1874aa91e8..c343b298c3 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -478,7 +478,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 	gpm.set_type (rt->meter_type());
 	
 	mute_solo_table.attach (gpm.gain_display,0,1,1,2, EXPAND|FILL, EXPAND);
-	mute_solo_table.attach (gpm.peak_display,1,2,1,2);
+	mute_solo_table.attach (gpm.peak_display,1,2,1,2, EXPAND|FILL, EXPAND);
 
 	if (solo_button->get_parent()) {
 		mute_solo_table.remove (*solo_button);