diff --git a/internal_packages/message-list/stylesheets/message-list.less b/internal_packages/message-list/stylesheets/message-list.less
index 657408dbd..d8fecc8db 100644
--- a/internal_packages/message-list/stylesheets/message-list.less
+++ b/internal_packages/message-list/stylesheets/message-list.less
@@ -133,8 +133,8 @@
     padding: 0 0 5px 0;
 
     background: @background-primary;
-    border: 1px solid @border-secondary-bg;
-    box-shadow: 0 1px 1.5px rgba(0,0,0,0.14);
+    border: 0;
+    box-shadow: 0 0px 0.5px rgba(0, 0, 0, 0.28), 0 1px 1.5px rgba(0, 0, 0, 0.08);
     border-radius: 4px;
 
     &:first-child { padding-top: 0; }
@@ -245,7 +245,7 @@
       border-right: 1px solid @border-color-divider;
       border-left: 1px solid @border-color-divider;
       background-color: darken(@background-primary, 2%);
-      box-shadow: 0 1px 1px rgba(0,0,0,0.1)
+      box-shadow: 0 1px 1px rgba(0,0,0,0.1);
     }
   }
 
@@ -355,8 +355,8 @@
     position: relative;
     z-index: 2;
 
-    border: 1px solid @border-secondary-bg;
-    box-shadow: 0 1px 1.5px rgba(0,0,0,0.14);
+    border: 0;
+    box-shadow: 0 0px 0.5px rgba(0, 0, 0, 0.28), 0 1px 1.5px rgba(0, 0, 0, 0.08);
     border-top: 1px dashed @border-color-divider;
     border-radius: 0 0 4px 4px;
     background: @background-primary;
diff --git a/internal_packages/mode-switch/lib/mode-toggle.cjsx b/internal_packages/mode-switch/lib/mode-toggle.cjsx
index d851b15e1..d926b2817 100644
--- a/internal_packages/mode-switch/lib/mode-toggle.cjsx
+++ b/internal_packages/mode-switch/lib/mode-toggle.cjsx
@@ -20,8 +20,8 @@ class ModeToggle extends React.Component
   render: =>
     return <div></div> unless @state.visible
 
-    <div className="mode-toggle mode-#{@state.mode}"
-         style={order:51, marginTop:10, marginRight:14}
+    <div className="btn btn-toolbar mode-toggle mode-#{@state.mode}"
+         style={order:51}
          onClick={@_onToggleMode}>
       <RetinaImg
         name="toolbar-icon-toggle-pane.png"
diff --git a/internal_packages/mode-switch/stylesheets/mode-switch.less b/internal_packages/mode-switch/stylesheets/mode-switch.less
index 1af16f80d..9639132de 100644
--- a/internal_packages/mode-switch/stylesheets/mode-switch.less
+++ b/internal_packages/mode-switch/stylesheets/mode-switch.less
@@ -3,6 +3,7 @@
 .mode-toggle {
     z-index: 1000;
     position: relative;
+    padding-top:5px;
     .content-mask {
       background-color: @text-color-subtle;
     }
diff --git a/static/images/splitpane/icon-toolbar-ViewMode-TwoPane-active@2x.png b/static/images/splitpane/icon-toolbar-ViewMode-TwoPane-active@2x.png
new file mode 100644
index 000000000..03e6753a4
Binary files /dev/null and b/static/images/splitpane/icon-toolbar-ViewMode-TwoPane-active@2x.png differ
diff --git a/static/images/splitpane/modeslider-bg@1x.png b/static/images/splitpane/modeslider-bg@1x.png
deleted file mode 100644
index a653608ae..000000000
Binary files a/static/images/splitpane/modeslider-bg@1x.png and /dev/null differ
diff --git a/static/images/splitpane/modeslider-bg@2x.png b/static/images/splitpane/modeslider-bg@2x.png
deleted file mode 100644
index 028e26037..000000000
Binary files a/static/images/splitpane/modeslider-bg@2x.png and /dev/null differ
diff --git a/static/images/splitpane/modeslider-knob@1x.png b/static/images/splitpane/modeslider-knob@1x.png
deleted file mode 100644
index ce2f26258..000000000
Binary files a/static/images/splitpane/modeslider-knob@1x.png and /dev/null differ
diff --git a/static/images/splitpane/modeslider-knob@2x.png b/static/images/splitpane/modeslider-knob@2x.png
deleted file mode 100644
index c1a327b2a..000000000
Binary files a/static/images/splitpane/modeslider-knob@2x.png and /dev/null differ
diff --git a/static/images/splitpane/toolbar-icon-listmode-active@1x.png b/static/images/splitpane/toolbar-icon-listmode-active@1x.png
deleted file mode 100644
index c660fceb1..000000000
Binary files a/static/images/splitpane/toolbar-icon-listmode-active@1x.png and /dev/null differ
diff --git a/static/images/splitpane/toolbar-icon-listmode-active@2x.png b/static/images/splitpane/toolbar-icon-listmode-active@2x.png
deleted file mode 100644
index 4a7e37121..000000000
Binary files a/static/images/splitpane/toolbar-icon-listmode-active@2x.png and /dev/null differ
diff --git a/static/images/splitpane/toolbar-icon-listmode@1x.png b/static/images/splitpane/toolbar-icon-listmode@1x.png
deleted file mode 100644
index 0e60f1a79..000000000
Binary files a/static/images/splitpane/toolbar-icon-listmode@1x.png and /dev/null differ
diff --git a/static/images/splitpane/toolbar-icon-listmode@2x.png b/static/images/splitpane/toolbar-icon-listmode@2x.png
deleted file mode 100644
index dd9e2cd95..000000000
Binary files a/static/images/splitpane/toolbar-icon-listmode@2x.png and /dev/null differ
diff --git a/static/images/splitpane/toolbar-icon-splitpanes-active@1x.png b/static/images/splitpane/toolbar-icon-splitpanes-active@1x.png
deleted file mode 100644
index 1d9869d76..000000000
Binary files a/static/images/splitpane/toolbar-icon-splitpanes-active@1x.png and /dev/null differ
diff --git a/static/images/splitpane/toolbar-icon-splitpanes-active@2x.png b/static/images/splitpane/toolbar-icon-splitpanes-active@2x.png
deleted file mode 100644
index 8667aa737..000000000
Binary files a/static/images/splitpane/toolbar-icon-splitpanes-active@2x.png and /dev/null differ
diff --git a/static/images/splitpane/toolbar-icon-splitpanes@1x.png b/static/images/splitpane/toolbar-icon-splitpanes@1x.png
deleted file mode 100644
index 41ae4cf15..000000000
Binary files a/static/images/splitpane/toolbar-icon-splitpanes@1x.png and /dev/null differ
diff --git a/static/images/splitpane/toolbar-icon-splitpanes@2x.png b/static/images/splitpane/toolbar-icon-splitpanes@2x.png
deleted file mode 100644
index 02f4b2633..000000000
Binary files a/static/images/splitpane/toolbar-icon-splitpanes@2x.png and /dev/null differ
diff --git a/static/images/splitpane/toolbar-icon-toggle-pane@2x.png b/static/images/splitpane/toolbar-icon-toggle-pane@2x.png
index 718e5cca9..a89139051 100644
Binary files a/static/images/splitpane/toolbar-icon-toggle-pane@2x.png and b/static/images/splitpane/toolbar-icon-toggle-pane@2x.png differ
diff --git a/static/images/toolbar/toolbar-archive@2x.png b/static/images/toolbar/toolbar-archive@2x.png
index e4f3bba31..f2d046825 100644
Binary files a/static/images/toolbar/toolbar-archive@2x.png and b/static/images/toolbar/toolbar-archive@2x.png differ
diff --git a/static/images/toolbar/toolbar-compose@2x.png b/static/images/toolbar/toolbar-compose@2x.png
index 5d2085c00..4ddf7bf8a 100644
Binary files a/static/images/toolbar/toolbar-compose@2x.png and b/static/images/toolbar/toolbar-compose@2x.png differ