diff --git a/src/plugins/kibana/public/discover/styles/main.less b/src/plugins/kibana/public/discover/styles/main.less
index 5e5040445507..25dba9ba3bee 100644
--- a/src/plugins/kibana/public/discover/styles/main.less
+++ b/src/plugins/kibana/public/discover/styles/main.less
@@ -8,6 +8,7 @@
 
   &-wrapper {
     padding-right: 0px !important;
+    padding-left: @collapser-width;
   }
 
   &-content {
diff --git a/src/plugins/kibana/public/visualize/editor/styles/_editor.less b/src/plugins/kibana/public/visualize/editor/styles/_editor.less
index d6f2a1272663..e17c84bd9c7a 100644
--- a/src/plugins/kibana/public/visualize/editor/styles/_editor.less
+++ b/src/plugins/kibana/public/visualize/editor/styles/_editor.less
@@ -332,6 +332,7 @@
     display: flex;
     flex-direction: column;
     overflow: auto;
+    padding-left: @collapser-width;
 
     &.embedded {
       flex-shrink: 1;
@@ -358,22 +359,6 @@
       flex: 1 1 100%;
       position: relative;
     }
-
-    .table-vis-container {
-      padding-left: 20px;
-    }
-
-    .leaflet-left .leaflet-control {
-      margin-left: 30px;
-    }
-
-    .markdown-vis {
-      padding: 20px;
-    }
-
-    .y-axis-col-wrapper {
-      padding-left: 20px;
-    }
   }
 }
 
diff --git a/src/ui/public/collapsible_sidebar/collapsible_sidebar.less b/src/ui/public/collapsible_sidebar/collapsible_sidebar.less
index 537b906b89d3..d05a263a8cee 100644
--- a/src/ui/public/collapsible_sidebar/collapsible_sidebar.less
+++ b/src/ui/public/collapsible_sidebar/collapsible_sidebar.less
@@ -6,28 +6,13 @@
 
   .sidebar-collapser {
     background-color: @collapser-bg;
-    height: 28px;
+    height: 100%;
     position: absolute;
     top: 0;
-    right: -20px;
-    width: 20px;
-    border: 1px solid;
-    border-color: @collapser-border;
-    border-width: 0 1px 1px 0;
+    right: -(@collapser-width);
+    width: @collapser-width;
     cursor: pointer;
     z-index: -1;
-    border-bottom-right-radius: 4px;
-
-    &:hover {
-      background-color: @collapser-hover-bg;
-
-      .chevron-cont{
-
-        &:before {
-          color: @collapser-hover-color;
-        }
-      }
-    }
 
     .chevron-cont{
       position: absolute;
diff --git a/src/ui/public/styles/variables/for-theme.less b/src/ui/public/styles/variables/for-theme.less
index e8b58f76097e..9d8b7e0f9d38 100644
--- a/src/ui/public/styles/variables/for-theme.less
+++ b/src/ui/public/styles/variables/for-theme.less
@@ -65,13 +65,15 @@
 
 
 // Collapser ===================================================================
-@collapser-bg: @white;
+@collapser-bg: @gray-lighter;
 @collapser-border: @gray-lighter;
 @collapser-color: @gray3;
 
-@collapser-hover-bg: @gray-lighter;
+@collapser-hover-bg: @white;
 @collapser-hover-color: @gray3;
 
+@collapser-width: 20px;
+
 
 // Dashboard ===================================================================
 @dashboard-bg: @gray-lighter;