diff --git a/gtk2_ardour/ui/editor_mixer.xml b/gtk2_ardour/ui/editor_mixer.xml
index eb46373afe..4c66a0d9b0 100644
--- a/gtk2_ardour/ui/editor_mixer.xml
+++ b/gtk2_ardour/ui/editor_mixer.xml
@@ -3,292 +3,297 @@
 <RouteUI bgnormal="#383838"
          selfdestruct="false"
          gainmeterscript="inspector_gain_meter.xml">
-  <VBox>
-    <VBox id="color_palette_home"
-          noshowall="true">
-      <EventBox id="color_palette_button_home"
-                bgnormal="#383838">
-        <iconbutton id="color_palette_button"
-                    width="97"
-                    height="17"
-                    normalicon="inspector_color_close"
-                    activeicon="inspector_color_open"/>
-      </EventBox>
-      <VBox id="color_buttons_home"
-            noshowall="true"
-            visible="false">
-        <EventBox bgnormal="#000000"
-                  height="1"/>
-        <VBox height="1"/>
-        <HBox>
-          <HBox width="1"/>
-          <iconbutton id="color_button_1"
-                      width="19"
-                      height="19"
-                      normalicon="inspector_color_1"
-                      activeicon="inspector_color_1_active"
-                      _prelighticon="inspector_color_1_prelight"/>
-          <iconbutton id="color_button_2"
-                      width="19"
-                      height="19"
-                      normalicon="inspector_color_2"
-                      activeicon="inspector_color_2_active"
-                      _prelighticon="inspector_color_2_prelight"/>
-          <iconbutton id="color_button_3"
-                      width="19"
-                      height="19"
-                      normalicon="inspector_color_3"
-                      activeicon="inspector_color_3_active"
-                      _prelighticon="inspector_color_3_prelight"/>
-          <iconbutton id="color_button_4"
-                      width="19"
-                      height="19"
-                      normalicon="inspector_color_4"
-                      activeicon="inspector_color_4_active"
-                      _prelighticon="inspector_color_4_prelight"/>
-          <iconbutton id="color_button_5"
-                      width="19"
-                      height="19"
-                      normalicon="inspector_color_5"
-                      activeicon="inspector_color_5_active"
-                      _prelighticon="inspector_color_5_prelight"/>
-        </HBox>
-        <HBox>
-          <HBox width="1"/>
-          <iconbutton id="color_button_6"
-                      width="19"
-                      height="19"
-                      normalicon="inspector_color_6"
-                      activeicon="inspector_color_6_active"
-                      _prelighticon="inspector_color_6_prelight"/>
-          <iconbutton id="color_button_7"
-                      width="19"
-                      height="19"
-                      normalicon="inspector_color_7"
-                      activeicon="inspector_color_7_active"
-                      _prelighticon="inspector_color_7_prelight"/>
-          <iconbutton id="color_button_8"
-                      width="19"
-                      height="19"
-                      normalicon="inspector_color_8"
-                      activeicon="inspector_color_8_active"
-                      _prelighticon="inspector_color_8_prelight"/>
-          <iconbutton id="color_button_9"
-                      width="19"
-                      height="19"
-                      normalicon="inspector_color_9"
-                      activeicon="inspector_color_9_active"
-                      _prelighticon="inspector_color_9_prelight"/>
-          <iconbutton id="color_button_10"
-                      width="19"
-                      height="19"
-                      normalicon="inspector_color_10"
-                      activeicon="inspector_color_10_active"
-                      _prelighticon="inspector_color_10_prelight"/>
-        </HBox>
-        <HBox>
-          <HBox width="1"/>
-          <iconbutton id="color_button_11"
-                      width="19"
-                      height="19"
-                      normalicon="inspector_color_11"
-                      activeicon="inspector_color_11_active"
-                      _prelighticon="inspector_color_11_prelight"/>
-          <iconbutton id="color_button_12"
-                      width="19"
-                      height="19"
-                      normalicon="inspector_color_12"
-                      activeicon="inspector_color_12_active"
-                      _prelighticon="inspector_color_12_prelight"/>
-          <iconbutton id="color_button_13"
-                      width="19"
-                      height="19"
-                      normalicon="inspector_color_13"
-                      activeicon="inspector_color_13_active"
-                      _prelighticon="inspector_color_13_prelight"/>
-          <iconbutton id="color_button_14"
-                      width="19"
-                      height="19"
-                      normalicon="inspector_color_14"
-                      activeicon="inspector_color_14_active"
-                      _prelighticon="inspector_color_14_prelight"/>
-          <iconbutton id="color_button_15"
-                      width="19"
-                      height="19"
-                      normalicon="inspector_color_15"
-                      activeicon="inspector_color_15_active"
-                      _prelighticon="inspector_color_15_prelight"/>
-        </HBox>
-        <VBox height="1"/>
-      </VBox>
-    </VBox>
-    <EventBox bgnormal="#000000">
+  <HBox>
+    <VBox>
       <VBox>
-        <iconbutton id="info_panel_button"
-                    width="97"
-                    height="17"
-                    normalicon="inspector_info_close"
-                    activeicon="inspector_info_open"
-                    box.padding="1"/>
-        <VBox id="info_panel_home"
-              noshowall="true"
-              visible="false">
-          <EventBox bgnormal="#4F4F4F"
-                    width="97">
-            <VBox>
-              <HBox box.padding="4">
-                <HBox width="7"/>
-                <Label id="input_info_label"
-                       text="In"
-                       winfont="Arial Bold 9"
-                       macfont="Helvetica Bold 9"/>
-                <HBox box.fill="true"
-                      box.expand="true"/>
-              </HBox>
-              <HBox>
-                <HBox width="7"/>
-                <Label id="output_info_label"
-                       text="Out"
-                       winfont="Arial Bold 9"
-                       macfont="Helvetica Bold 9"/>
-                <HBox box.fill="true"
-                      box.expand="true"/>
-              </HBox>
-              <HBox height="5"/>
-            </VBox>
+        <VBox id="color_palette_home"
+              noshowall="true">
+          <EventBox id="color_palette_button_home"
+                    bgnormal="#383838">
+            <iconbutton id="color_palette_button"
+                        width="97"
+                        height="17"
+                        normalicon="inspector_color_close"
+                        activeicon="inspector_color_open"/>
           </EventBox>
-          <HBox height="1"/>
+          <VBox id="color_buttons_home"
+                noshowall="true"
+                visible="false">
+            <EventBox bgnormal="#000000"
+                      height="1"/>
+            <VBox height="1"/>
+            <HBox>
+              <HBox width="1"/>
+              <iconbutton id="color_button_1"
+                          width="19"
+                          height="19"
+                          normalicon="inspector_color_1"
+                          activeicon="inspector_color_1_active"
+                          _prelighticon="inspector_color_1_prelight"/>
+              <iconbutton id="color_button_2"
+                          width="19"
+                          height="19"
+                          normalicon="inspector_color_2"
+                          activeicon="inspector_color_2_active"
+                          _prelighticon="inspector_color_2_prelight"/>
+              <iconbutton id="color_button_3"
+                          width="19"
+                          height="19"
+                          normalicon="inspector_color_3"
+                          activeicon="inspector_color_3_active"
+                          _prelighticon="inspector_color_3_prelight"/>
+              <iconbutton id="color_button_4"
+                          width="19"
+                          height="19"
+                          normalicon="inspector_color_4"
+                          activeicon="inspector_color_4_active"
+                          _prelighticon="inspector_color_4_prelight"/>
+              <iconbutton id="color_button_5"
+                          width="19"
+                          height="19"
+                          normalicon="inspector_color_5"
+                          activeicon="inspector_color_5_active"
+                          _prelighticon="inspector_color_5_prelight"/>
+            </HBox>
+            <HBox>
+              <HBox width="1"/>
+              <iconbutton id="color_button_6"
+                          width="19"
+                          height="19"
+                          normalicon="inspector_color_6"
+                          activeicon="inspector_color_6_active"
+                          _prelighticon="inspector_color_6_prelight"/>
+              <iconbutton id="color_button_7"
+                          width="19"
+                          height="19"
+                          normalicon="inspector_color_7"
+                          activeicon="inspector_color_7_active"
+                          _prelighticon="inspector_color_7_prelight"/>
+              <iconbutton id="color_button_8"
+                          width="19"
+                          height="19"
+                          normalicon="inspector_color_8"
+                          activeicon="inspector_color_8_active"
+                          _prelighticon="inspector_color_8_prelight"/>
+              <iconbutton id="color_button_9"
+                          width="19"
+                          height="19"
+                          normalicon="inspector_color_9"
+                          activeicon="inspector_color_9_active"
+                          _prelighticon="inspector_color_9_prelight"/>
+              <iconbutton id="color_button_10"
+                          width="19"
+                          height="19"
+                          normalicon="inspector_color_10"
+                          activeicon="inspector_color_10_active"
+                          _prelighticon="inspector_color_10_prelight"/>
+            </HBox>
+            <HBox>
+              <HBox width="1"/>
+              <iconbutton id="color_button_11"
+                          width="19"
+                          height="19"
+                          normalicon="inspector_color_11"
+                          activeicon="inspector_color_11_active"
+                          _prelighticon="inspector_color_11_prelight"/>
+              <iconbutton id="color_button_12"
+                          width="19"
+                          height="19"
+                          normalicon="inspector_color_12"
+                          activeicon="inspector_color_12_active"
+                          _prelighticon="inspector_color_12_prelight"/>
+              <iconbutton id="color_button_13"
+                          width="19"
+                          height="19"
+                          normalicon="inspector_color_13"
+                          activeicon="inspector_color_13_active"
+                          _prelighticon="inspector_color_13_prelight"/>
+              <iconbutton id="color_button_14"
+                          width="19"
+                          height="19"
+                          normalicon="inspector_color_14"
+                          activeicon="inspector_color_14_active"
+                          _prelighticon="inspector_color_14_prelight"/>
+              <iconbutton id="color_button_15"
+                          width="19"
+                          height="19"
+                          normalicon="inspector_color_15"
+                          activeicon="inspector_color_15_active"
+                          _prelighticon="inspector_color_15_prelight"/>
+            </HBox>
+            <VBox height="1"/>
+          </VBox>
+        </VBox>
+        <EventBox bgnormal="#000000">
+          <VBox>
+            <iconbutton id="info_panel_button"
+                        width="97"
+                        height="17"
+                        normalicon="inspector_info_close"
+                        activeicon="inspector_info_open"
+                        box.padding="1"/>
+            <VBox id="info_panel_home"
+                  noshowall="true"
+                  visible="false">
+              <EventBox bgnormal="#4F4F4F"
+                        width="97">
+                <VBox>
+                  <HBox box.padding="4">
+                    <HBox width="7"/>
+                    <Label id="input_info_label"
+                           text="In"
+                           winfont="Arial Bold 9"
+                           macfont="Helvetica Bold 9"/>
+                    <HBox box.fill="true"
+                          box.expand="true"/>
+                  </HBox>
+                  <HBox>
+                    <HBox width="7"/>
+                    <Label id="output_info_label"
+                           text="Out"
+                           winfont="Arial Bold 9"
+                           macfont="Helvetica Bold 9"/>
+                    <HBox box.fill="true"
+                          box.expand="true"/>
+                  </HBox>
+                  <HBox height="5"/>
+                </VBox>
+              </EventBox>
+              <HBox height="1"/>
+            </VBox>
+          </VBox>
+        </EventBox>
+        <VBox box.pack="end">
+          <EventBox height="1"
+                    bgnormal="#5D5D5D"/>
+          <EventBox id="panners_home"
+                    bgnormal="#383838"
+                    width="95"
+                    height="60"/>
+          <HBox id="level_meter_home"/>
+          <Vbox>
+            <HBox id="gain_meter_home"/>
+            <HBox id="invert_button_box"
+                  visible="false"/>
+            <VBox>
+              <HBox>
+                <VBox id="track_buttons_home"
+                      visible="true"
+                      noshowall="true">
+                  <HBox>
+                    <iconbutton id="rec_enable_button"
+                                width="49"
+                                height="21"
+                                normalicon="inspector_record"
+                                activeicon="inspector_record_active"
+                                _prelighticon="inspector_record_prelight"
+                                visible="false"
+                                noshowall="true"/>
+                    <iconbutton id="monitor_input_button"
+                                width="47"
+                                height="21"
+                                normalicon="inspector_monitor_input"
+                                activeicon="inspector_monitor_input_active"
+                                _prelighticon="inspector_monitor_input_prelight"
+                                visible="false"
+                                noshowall="true"/>
+                  </HBox>
+                  <HBox>
+                    <iconbutton id="mute_button"
+                                width="49"
+                                height="21"
+                                normalicon="inspector_mute"
+                                activeicon="inspector_mute_active"
+                                implicitactiveicon="inspector_mute_implicit"
+                                _prelighticon="inspector_mute_prelight"
+                                visible="false"
+                                noshowall="true"/>
+
+                    <iconbutton id="solo_button"
+                                width="47"
+                                height="21"
+                                normalicon="inspector_solo"
+                                activeicon="inspector_solo_active"
+                                implicitactiveicon="inspector_solo_safe"
+                                _prelighticon="inspector_solo_prelight"
+                                visible="false"
+                                noshowall="true"/>
+                  </HBox>
+                </VBox>
+              </HBox>
+              <iconbutton id="master_mute_button"
+                          width="95"
+                          height="41"
+                          normalicon="inspector_master_mute"
+                          activeicon="inspector_master_mute_active"
+                          _prelighticon="inspector_master_mute_prelight"
+                          visible="false"
+                          noshowall="true"/>
+              <HBox>
+                <EventBox width="1"
+                          bgnormal="#383838"/>
+                <EventBox id="name_label_home">
+                  <HBox>
+                    <Button id="name_button"
+                            width="95"
+                            height="47"
+                            fgnormal="#D7D7D7"
+                            fghover="#D7D7D7"
+                            fgactive="#D7D7D7"
+                            winfont ="Arial 10"
+                            macfont ="Helvetica 10"
+                            textcolornormal="#ffffff"
+                            textcoloractive="#ffffff"
+                            textcolorselected="#ffffff"/>
+                    <EventBox id="name_entry_eventbox"
+                              width="95"
+                              height="47"
+                              noshowall="true"
+                              visible="false">
+                      <Layout width="97"
+                              height="47"
+                              color="#383838">
+                        <FocusEntry id="name_entry"
+                                    x="7"
+                                    y="13"
+                                    width="80"
+                                    height="20"
+                                    fgnormal="#ffffff"
+                                    winfont ="Arial 10"
+                                    macfont ="Helvetica 10"
+                                    cssname="EditorTrackNameDisplay"
+                                    textcolornormal="#ffffff"
+                                    textcoloractive="#ffffff"
+                                    textcolorselected="#ffffff"
+                                    noshowall="true"
+                                    visible="false"/>
+                      </Layout>
+                    </EventBox>
+                  </HBox>
+                </EventBox>
+              </HBox>
+
+            </VBox>
+            <HBox visible="false"
+                  noshowall="true">
+              <Button id="show_sends_button"/>
+              <Button id="monitor_disk_button"/>
+              <Button id="comment_button"/>
+              <Button id="midi_input_enable_button"/>
+              <Button id="group_button"/>
+            </HBox>
+          </Vbox>
         </VBox>
       </VBox>
-    </EventBox>
-    <VBox box.pack="end">
-      <EventBox height="1"
-                bgnormal="#5D5D5D"/>
-      <EventBox id="panners_home"
-                bgnormal="#383838"
-                width="95"
-                height="60"/>
-      <HBox id="level_meter_home"/>
-      <Vbox>
-        <HBox id="gain_meter_home"/>
-        <HBox id="invert_button_box"
-              visible="false"/>
-        <VBox>
-          <HBox>
-            <VBox id="track_buttons_home"
-                  visible="true"
-                  noshowall="true">
-              <HBox>
-                <iconbutton id="rec_enable_button"
-                            width="49"
-                            height="21"
-                            normalicon="inspector_record"
-                            activeicon="inspector_record_active"
-                            _prelighticon="inspector_record_prelight"
-                            visible="false"
-                            noshowall="true"/>
-                <iconbutton id="monitor_input_button"
-                            width="47"
-                            height="21"
-                            normalicon="inspector_monitor_input"
-                            activeicon="inspector_monitor_input_active"
-                            _prelighticon="inspector_monitor_input_prelight"
-                            visible="false"
-                            noshowall="true"/>
-              </HBox>
-              <HBox>
-                <iconbutton id="mute_button"
-                            width="49"
-                            height="21"
-                            normalicon="inspector_mute"
-                            activeicon="inspector_mute_active"
-                            implicitactiveicon="inspector_mute_implicit"
-                            _prelighticon="inspector_mute_prelight"
-                            visible="false"
-                            noshowall="true"/>
-                
-                <iconbutton id="solo_button"
-                            width="47"
-                            height="21"
-                            normalicon="inspector_solo"
-                            activeicon="inspector_solo_active"
-                            implicitactiveicon="inspector_solo_safe"
-                            _prelighticon="inspector_solo_prelight"
-                            visible="false"
-                            noshowall="true"/>
-              </HBox>
-            </VBox>
-          </HBox>
-          <iconbutton id="master_mute_button"
-                      width="95"
-                      height="41"
-                      normalicon="inspector_master_mute"
-                      activeicon="inspector_master_mute_active"
-                      _prelighticon="inspector_master_mute_prelight"
-                      visible="false"
-                      noshowall="true"/>
-          <HBox>
-          <EventBox width="1"
-                    bgnormal="#383838"/>
-          <EventBox id="name_label_home">
-          <HBox>
-              <Button id="name_button"
-                      width="95"
-                      height="47"
-                      fgnormal="#D7D7D7"
-                      fghover="#D7D7D7"
-                      fgactive="#D7D7D7"
-                      winfont ="Arial 10"
-                      macfont ="Helvetica 10"
-                      textcolornormal="#ffffff"
-                      textcoloractive="#ffffff"
-                      textcolorselected="#ffffff"/>
-              <EventBox id="name_entry_eventbox"
-                        width="95"
-                        height="47"
-                        noshowall="true"
-                        visible="false">
-              <Layout width="97"
-                      height="47"
-                      color="#383838">
-              <FocusEntry id="name_entry"
-                          x="7"
-                          y="13"
-                          width="80"
-                          height="20"
-                          fgnormal="#ffffff"
-                          winfont ="Arial 10"
-                          macfont ="Helvetica 10"
-                          cssname="EditorTrackNameDisplay"
-                          textcolornormal="#ffffff"
-                          textcoloractive="#ffffff"
-                          textcolorselected="#ffffff"
-                          noshowall="true"
-                          visible="false"/>
-              </Layout>
-              </EventBox>
-          </HBox>
-          </EventBox>
-          </HBox>
-            
-        </VBox>
-        <HBox visible="false"
-              noshowall="true">
-          <Button id="show_sends_button"/>
-          <Button id="monitor_disk_button"/>
-          <Button id="comment_button"/>
-          <Button id="midi_input_enable_button"/>
-          <Button id="group_button"/>
-        </HBox>
-      </Vbox>
+
+      <Icon id="rec_enable_indicator_on"
+            source="rec_enable_indicator_on"
+            ui.orphan="true"/>
+
+      <Icon id="rec_enable_indicator_off"
+            source="rec_enable_indicator_off"
+            ui.orphan="true"/>
     </VBox>
-  </VBox>
-  
-  <Icon id="rec_enable_indicator_on"
-        source="rec_enable_indicator_on"
-        ui.orphan="true"/>
-  
-  <Icon id="rec_enable_indicator_off"
-        source="rec_enable_indicator_off"
-        ui.orphan="true"/>
- </RouteUI>
+    <EventBox bgnormal="#000000" width="2"/>
+  </HBox>
+</RouteUI>
diff --git a/gtk2_ardour/ui/editor_window.xml b/gtk2_ardour/ui/editor_window.xml
index 254c839f6a..e8351fd56c 100644
--- a/gtk2_ardour/ui/editor_window.xml
+++ b/gtk2_ardour/ui/editor_window.xml
@@ -431,13 +431,14 @@
         </HBox>
       </VBox>
     </EventBox>
-    <EventBox bgnormal="#000000" height="1"/>
+    <EventBox bgnormal="#000000"
+              box.pack="end"
+              height="2"/>
     <HBox box.pack="end"
           box.fill="true"
           box.expand="true">
-      <EventBox bgnormal="#000000" width="2"/>
+      <EventBox bgnormal="#000000" width="3"/>
       <EventBox id="inspector_home"/>
-      <EventBox bgnormal="#000000" width="2"/>
       <VBox box.fill="true"
             box.expand="true">
         <EventBox id="compact_meter_bridge_home"
@@ -644,6 +645,7 @@
                    box.fill="true"
                    box.expand="true"/>
       </VBox>
+      <EventBox bgnormal="#000000" width="3"/>
     </HBox>
   </VBox>
 </Window>