diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 3b330a42c4..b1af8ab205 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -343,13 +343,17 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
 	
 	if (route()->is_master()) {
 		master_mute_button.show ();
-		get_container ("track_buttons_home").hide ();
+		//get_container ("track_buttons_home").hide ();
+        color_buttons_home.set_visible (false);
+        color_palette_button.set_visible (false);
+        color_palette_button.set_active (false);
 		//mute_button.hide ();
 		//solo_button.hide ();
 		//rec_enable_button.hide ();
 	} else {
 		master_mute_button.hide ();
-		get_container ("track_buttons_home").show ();
+        color_palette_button.set_visible (true);
+        color_palette_home.set_visible (true);
 		//mute_button.show ();
 		//solo_button.show ();
 		//rec_enable_button.show ();
diff --git a/gtk2_ardour/ui/editor_mixer.xml b/gtk2_ardour/ui/editor_mixer.xml
index 039e97256d..ebe8f1fc6d 100644
--- a/gtk2_ardour/ui/editor_mixer.xml
+++ b/gtk2_ardour/ui/editor_mixer.xml
@@ -7,6 +7,8 @@
     <VBox>
       <HBox>
         <EventBox id="color_palette_home"
+                  noshowall="true"
+                  visible="false"
                   bgnormal="#383838">
           <iconbutton id="color_palette_button"
                       width="97"