diff --git a/gtk2_ardour/ui/editor_window.xml b/gtk2_ardour/ui/editor_window.xml
index 3df1426fd8..6e1c9c5b9a 100644
--- a/gtk2_ardour/ui/editor_window.xml
+++ b/gtk2_ardour/ui/editor_window.xml
@@ -168,19 +168,30 @@
         </EventBox>
       </VBox>
     </EventBox>
+    <HBox>
+      <EventBox id="master_bus_ui_home"/>
+      <EventBox bgnormal="#D9E99F"
+              width="100"
+              box.fill="true"
+              box.expand="true"/>
+    </HBox>
     <HBox id="global_hpacker"
           box.pack="end"
           box.fill="true"
           box.expand="true">
       <VBox>
-        <EventBox id="master_bus_ui_home"/>
         <EventBox id="inspector_home"
             box.fill="true"
             box.expand="true"/>
       </VBox>
-      <VBox id="global_vpacker"
+      <VBox box.fill="true"
+            box.expand="true">
+        <VBox id="global_vpacker"
             box.fill="true"
             box.expand="true">
+        </VBox>
+        <EventBox id="mixer_ui_home"
+                  box.pack="end"/>
       </VBox>
     </HBox>
   </VBox>
diff --git a/gtk2_ardour/ui/mixer_strip.xml b/gtk2_ardour/ui/mixer_strip.xml
index 65c8cb879f..89ee05be05 100644
--- a/gtk2_ardour/ui/mixer_strip.xml
+++ b/gtk2_ardour/ui/mixer_strip.xml
@@ -3,7 +3,7 @@
 <RouteUI>
   <EventBox bgnormal="#383838" bgactive="#545454">
     <VBox>
-      <EventBox id="color_palette_home" borderwidth="1" visible="false">
+      <EventBox id="color_palette_home" borderwidth="1" noshowall="true" visible="false">
         <VBox>
           <iconbutton id="color_palette_button"
                       width="95"