diff --git a/src/workbench/editor/style.scss b/src/workbench/editor/style.scss
index a0893f053..20d42147f 100644
--- a/src/workbench/editor/style.scss
+++ b/src/workbench/editor/style.scss
@@ -28,6 +28,8 @@
     }
 
     &__group-header {
+        background: var(--editorGroupHeader-tabsBackground);
+        border-bottom: 1px solid var(--editorGroupHeader-tabsBorder);
         display: flex;
         position: relative;
     }
@@ -35,6 +37,10 @@
     &__group-tabs {
         flex-grow: 1;
         height: 35px;
+
+        #{$tab}__item--active {
+            border-top: 1px solid var(--tab-activeBorder);
+        }
     }
 
     &__group-actions {
diff --git a/src/workbench/panel/panel.tsx b/src/workbench/panel/panel.tsx
index 1c12940bf..eda0b4afd 100644
--- a/src/workbench/panel/panel.tsx
+++ b/src/workbench/panel/panel.tsx
@@ -40,7 +40,7 @@ export function Panel(props: IPanel & IPanelController) {
     return (
         <div className={defaultClassName}>
             <div className={panelHeaderClassName}>
-                <Scrollable noScrollY isShowShadow>
+                <Scrollable noScrollY>
                     <Tabs
                         activeTab={current?.id}
                         data={sortedPanels}
diff --git a/src/workbench/sidebar/explore/style.scss b/src/workbench/sidebar/explore/style.scss
index 06a4cd3cb..fc5cf696f 100644
--- a/src/workbench/sidebar/explore/style.scss
+++ b/src/workbench/sidebar/explore/style.scss
@@ -7,6 +7,17 @@
             text-transform: uppercase;
         }
     }
+
+    #{$folderTree} {
+        #{$tree}__indent__guide {
+            opacity: 0;
+            transition: opacity 0.3s linear;
+        }
+
+        &:hover #{$tree}__indent__guide {
+            opacity: 1;
+        }
+    }
 }
 
 #{$folderTree} {
diff --git a/src/workbench/sidebar/style.scss b/src/workbench/sidebar/style.scss
index 3565fa979..9c134368b 100644
--- a/src/workbench/sidebar/style.scss
+++ b/src/workbench/sidebar/style.scss
@@ -3,6 +3,7 @@
 #{$sidebar} {
     background-color: var(--sideBar-background);
     border-color: var(--sideBar-border);
+    border-right: 1px solid var(--sideBar-border);
     color: var(--sideBar-foreground);
     height: 100%;
     left: 0;
@@ -22,10 +23,8 @@
 
     &__header {
         align-items: center;
-        background-color: var(--sideBarSectionHeader-background);
-        border-color: var(--sideBarSectionHeader-border);
+
         box-sizing: border-box;
-        color: var(--sideBarSectionHeader-foreground);
         display: flex;
         height: 35px;
         overflow: hidden;
@@ -67,4 +66,9 @@
         flex: 1;
         padding-left: 5px;
     }
+
+    #{$collapse}__header {
+        background-color: var(--sideBarSectionHeader-background);
+        color: var(--sideBarSectionHeader-foreground);
+    }
 }
diff --git a/src/workbench/statusBar/style.scss b/src/workbench/statusBar/style.scss
index d56bf27b8..937f78b62 100644
--- a/src/workbench/statusBar/style.scss
+++ b/src/workbench/statusBar/style.scss
@@ -4,6 +4,7 @@
     align-items: center;
     background-color: var(--statusBar-background);
     border-color: var(--statusBar-border);
+    border-top: 1px solid var(--statusBar-border);
     bottom: 0;
     color: var(--statusBar-foreground);
     display: flex;
diff --git a/src/workbench/style.scss b/src/workbench/style.scss
index f1fcf0cf5..c6306b860 100644
--- a/src/workbench/style.scss
+++ b/src/workbench/style.scss
@@ -47,6 +47,7 @@
 }
 
 #{$compositeBar} {
+    border-right: 1px solid var(--activityBar-border);
     display: flex;
     flex-direction: column;
     min-height: 100%;