diff --git a/gtk2_ardour/icons/inspector_color_close.png b/gtk2_ardour/icons/inspector_color_close.png
index b358875067..496d2fd0fe 100644
Binary files a/gtk2_ardour/icons/inspector_color_close.png and b/gtk2_ardour/icons/inspector_color_close.png differ
diff --git a/gtk2_ardour/icons/inspector_color_open.png b/gtk2_ardour/icons/inspector_color_open.png
index b843257216..4033cda355 100644
Binary files a/gtk2_ardour/icons/inspector_color_open.png and b/gtk2_ardour/icons/inspector_color_open.png differ
diff --git a/gtk2_ardour/icons/inspector_info_close.png b/gtk2_ardour/icons/inspector_info_close.png
index 332e2804b6..1a51f970ca 100644
Binary files a/gtk2_ardour/icons/inspector_info_close.png and b/gtk2_ardour/icons/inspector_info_close.png differ
diff --git a/gtk2_ardour/icons/inspector_info_open.png b/gtk2_ardour/icons/inspector_info_open.png
index 1529b725dc..e9d1184dca 100644
Binary files a/gtk2_ardour/icons/inspector_info_open.png and b/gtk2_ardour/icons/inspector_info_open.png differ
diff --git a/gtk2_ardour/ui/editor_mixer.xml b/gtk2_ardour/ui/editor_mixer.xml
index 5d7bc9776c..2d2ebee7f8 100644
--- a/gtk2_ardour/ui/editor_mixer.xml
+++ b/gtk2_ardour/ui/editor_mixer.xml
@@ -7,9 +7,9 @@
     <VBox>
       <HBox>
         <EventBox id="color_palette_home"
-                  bgnormal="#383838" box.padding="1">
+                  bgnormal="#383838">
           <iconbutton id="color_palette_button"
-                    width="95"
+                    width="97"
                     height="17"
                     normalicon="inspector_color_close"
                     activeicon="inspector_color_open"/>
@@ -18,7 +18,9 @@
       <VBox id="color_buttons_home"
             noshowall="true"
             visible="false">
-        <VBox height="2"/>
+        <EventBox bgnormal="#000000"
+                  height="1"/>
+        <VBox height="1"/>
         <HBox>
           <HBox width="1"/>
           <iconbutton id="color_button_1"
@@ -118,20 +120,21 @@
                       activeicon="inspector_color_15_active"
                       prelighticon="inspector_color_15_prelight"/>
         </HBox>
+        <VBox height="1"/>
       </VBox>
     </VBox>
     <EventBox bgnormal="#000000">
-      <VBox borderwidth="1">
+      <VBox>
         <iconbutton id="info_panel_button"
-                    width="95"
+                    width="97"
                     height="17"
                     normalicon="inspector_info_close"
-                    activeicon="inspector_info_open"/>
+                    activeicon="inspector_info_open"
+                    box.padding="1"/>
         <VBox id="info_panel_home"
               noshowall="true"
               visible="false">
-          <VBox height="1"/>
-          <EventBox bgnormal="#4F4F4F" width="95">
+          <EventBox bgnormal="#4F4F4F" width="97">
             <VBox>
               <HBox box.padding="4">
                 <HBox width="7"/>
@@ -152,6 +155,7 @@
               <HBox height="5"/>
             </VBox>
           </EventBox>
+          <HBox height="1"/>
         </VBox>
       </VBox>
     </EventBox>
diff --git a/gtk2_ardour/ui/editor_window.xml b/gtk2_ardour/ui/editor_window.xml
index a9c646fab8..7d77991366 100644
--- a/gtk2_ardour/ui/editor_window.xml
+++ b/gtk2_ardour/ui/editor_window.xml
@@ -222,6 +222,7 @@
     <HBox box.pack="end"
           box.fill="true"
           box.expand="true">
+      <EventBox bgnormal="#000000" width="2"/>
       <EventBox id="inspector_home"/>
       <EventBox bgnormal="#000000" width="2"/>
       <VBox box.fill="true"