diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 06e4b93899..e710e5cbf3 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -569,15 +569,9 @@ Editor::Editor ()
 	// CAIROCANVAS
 	time_pad->show();
 
-	edit_packer.set_col_spacings (0);
-	edit_packer.set_row_spacings (0);
-	edit_packer.set_homogeneous (false);
-	edit_packer.set_border_width (0);
-	edit_packer.set_name ("EditorWindow");
+    /* rest of the packing is done in ui/editor_window.xml */
 
-        /* rest of the packing is done in ui/editor_window.xml */
-
-	edit_packer.attach (*_track_canvas_viewport,  1, 2, 0, 2,    FILL|EXPAND, FILL|EXPAND, 0, 0);
+	edit_packer.attach (*_track_canvas_viewport,  1, 2, 1, 3,    FILL|EXPAND, FILL|EXPAND, 0, 0);
 
 	_route_groups = new EditorRouteGroups (this);
 	_routes = new EditorRoutes (this);
diff --git a/gtk2_ardour/icons/master_mute.png b/gtk2_ardour/icons/master_mute.png
index cf6cbb2f12..69809efe33 100755
Binary files a/gtk2_ardour/icons/master_mute.png and b/gtk2_ardour/icons/master_mute.png differ
diff --git a/gtk2_ardour/icons/master_mute_active.png b/gtk2_ardour/icons/master_mute_active.png
index 03288cbd99..46352070f0 100755
Binary files a/gtk2_ardour/icons/master_mute_active.png and b/gtk2_ardour/icons/master_mute_active.png differ
diff --git a/gtk2_ardour/ui/editor_window.xml b/gtk2_ardour/ui/editor_window.xml
index f176138b97..8d2f2fc461 100644
--- a/gtk2_ardour/ui/editor_window.xml
+++ b/gtk2_ardour/ui/editor_window.xml
@@ -463,19 +463,34 @@
                   paned.resize="true"
                   paned.shrink="true">
             <Table id="edit_packer"
-                   rows="3"
+                   rows="4"
                    columns="3">
               <HBox table.leftattach="0"
-                    table.rightattach="1"
+                    table.rightattach="3"
                     table.topattach="0"
                     table.bottomattach="1"
-                    table.xfill="false"
-                    table.yfill="false">
+                    table.xfill="true"
+                    table.yfill="true">
+              <EventBox bgnormal="#424242"
+                        height="1"
+                        width="233"/>
+                <EventBox bgnormal="#000000"
+                          height="1"
+                          width="1"/>
+                <EventBox bgnormal="#424242"
+                          height="1"
+                          box.expand="true"
+                          box.fill="true"/>
+              </HBox>
+                <HBox table.leftattach="0"
+                      table.rightattach="1"
+                      table.topattach="1"
+                      table.bottomattach="2"
+                      table.xfill="false"
+                      table.yfill="false">
                 <VBox id="timebars_vbox">
                   <VBox id="marker_lane"
                         noshowall="true">
-                    <EventBox height="1"
-                              bgnormal="#424242"/>
                     <EventBox bgnormal="#6C6C6C">
                       <HBox noshowall="true">
                         <Icon source="marker_label"/>
@@ -545,11 +560,11 @@
                                   bgnormal="#424242"/>
                       </HBox>
                     </EventBox>
-                  </VBox>
-                    <VBox id="skip_playback_lane"
-                          noshowall="true">
                     <EventBox height="1"
                               bgnormal="#424242"/>
+                  </VBox>
+                  <VBox id="skip_playback_lane"
+                        noshowall="true">
                     <EventBox bgnormal="#6C6C6C">
                       <HBox>
                         <icon source="skip_lane_label"/>
@@ -564,9 +579,9 @@
                                   bgnormal="#424242"/>
                       </HBox>
                     </EventBox>
+                    <EventBox height="1"
+                              bgnormal="#424242"/>
                   </VBox>
-                  <EventBox height="1"
-                            bgnormal="#424242"/>
                   <HBox id="global_tracks_hbox"
                         spacing="1">
                     <Dropdown id="global_tracks_dropdown"
@@ -609,40 +624,49 @@
                 <EventBox width="1"
                           bgnormal="#000000"/>
               </HBox>
+              <HBox table.leftattach="0"
+                    table.rightattach="1"
+                    table.topattach="2"
+                    table.bottomattach="3"
+                    table.yfill="true"
+                    table.yexpand="true">
               <Layout id="controls_layout"
                       hadjustment="unused_adjustment"
                       vadjustment="vertical_adjustment"
-                      table.leftattach="0"
-                      table.rightattach="1"
-                      table.topattach="1"
-                      table.bottomattach="2"
-                      table.yfill="true"
-                      table.yexpand="true"
                       bgnormal="#3E3E3E">
                 <VBox id="edit_controls_vbox"
                       width="233"/>
               </Layout>
+              <EventBox width="1"
+                        bgnormal="#000000"/>
+
+              </HBox>
               <VScrollbar adjustment="vertical_adjustment"
                           table.leftattach="2"
                           table.rightattach="3"
-                          table.topattach="1"
-                          table.bottomattach="2"
+                          table.topattach="2"
+                          table.bottomattach="3"
                           table.yfill="true"
                           bgnormal="#353535"/>
               <HScrollbar adjustment="horizontal_adjustment"
                           table.leftattach="1"
                           table.rightattach="2"
-                          table.topattach="2"
-                          table.bottomattach="3"
+                          table.topattach="3"
+                          table.bottomattach="4"
                           table.xfill="true"
                           bgnormal="#353535"/>
-              <EventBox table.leftattach="0"
-                        table.rightattach="1"
-                        table.topattach="2"
-                        table.bottomattach="3"
-                        table.xfill="true"
-                        table.yfill="true"
-                        bgnormal="#383838"/>
+              <HBox table.leftattach="0"
+                    table.rightattach="1"
+                    table.topattach="3"
+                    table.bottomattach="4"
+                    table.xfill="true"
+                    table.yfill="true">
+                <EventBox bgnormal="#383838"
+                          box.fill="true"
+                          box.expand="true"/>
+                <EventBox bgnormal="#000000"
+                          width="1"/>
+              </HBox>
             </Table>
           </VPaned>
         </HPaned>
diff --git a/gtk2_ardour/ui/master_ui.xml b/gtk2_ardour/ui/master_ui.xml
index 659d75d072..12222d6ae0 100644
--- a/gtk2_ardour/ui/master_ui.xml
+++ b/gtk2_ardour/ui/master_ui.xml
@@ -39,7 +39,7 @@
             noshowall="true"/>
       <iconbutton id="master_mute_button"
                   width="83"
-                  height="29"
+                  height="30"
                   normalicon="master_mute"
                   activeicon="master_mute_active"
                   _prelighticon="master_mute_prelight"