diff --git a/public/app/features/explore/ExploreToolbar.tsx b/public/app/features/explore/ExploreToolbar.tsx
index 0c2d734ecc0..6fde5001481 100644
--- a/public/app/features/explore/ExploreToolbar.tsx
+++ b/public/app/features/explore/ExploreToolbar.tsx
@@ -101,9 +101,9 @@ export class ExploreToolbar extends PureComponent<Props, {}> {
             </div>
             <div className="toolbar-header-close">
               {exploreId === 'right' && (
-                <a onClick={this.props.onCloseSplit}>
-                  <i className="fa fa-times" />
-                </a>
+                <button className="btn navbar-button" onClick={this.props.onCloseSplit}>
+                  Close Split
+                </button>
               )}
             </div>
           </div>
diff --git a/public/sass/pages/_explore.scss b/public/sass/pages/_explore.scss
index d64121f761d..2c367a63a6d 100644
--- a/public/sass/pages/_explore.scss
+++ b/public/sass/pages/_explore.scss
@@ -4,18 +4,33 @@
   display: none;
 }
 
+.timepicker {
+  display: flex;
+}
+
+.timepicker-rangestring {
+  margin-left: 0.5em;
+}
+
 .datasource-picker {
   min-width: 200px;
   max-width: 200px;
 }
 
+.sidemenu-open {
+  .toolbar {
+    margin-left: 0;
+  }
+}
+
 .toolbar-splitted,
 .toolbar {
   display: flex;
   background: inherit;
   justify-content: space-between;
   height: auto;
-  padding: 2px $dashboard-padding;
+  padding: 0px $dashboard-padding;
+  margin-left: $panel-margin * 3;
 }
 
 .toolbar {
@@ -102,6 +117,11 @@
     display: inline-block;
   }
 
+  .toolbar-splitted,
+  .toolbar {
+    margin-left: 0;
+  }
+
   .toolbar {
     flex-flow: row wrap;
   }