diff --git a/packages/application/style/base.css b/packages/application/style/base.css
index da8100bfac..d3e955b7aa 100644
--- a/packages/application/style/base.css
+++ b/packages/application/style/base.css
@@ -80,6 +80,10 @@ body[data-notebook='edit'] #spacer-widget-bottom {
   box-shadow: var(--jp-elevation-z4);
 }
 
+.jp-TreePanel > .lm-TabPanel-stackedPanel {
+  box-shadow: var(--jp-elevation-z4);
+}
+
 body[data-notebook='notebooks'] #main-panel {
   margin-left: unset;
   margin-right: unset;
@@ -89,3 +93,13 @@ body[data-notebook='notebooks'] #main-panel {
 body[data-notebook='notebooks'] #spacer-widget-top {
   min-height: unset;
 }
+
+#main-panel > .jp-TreePanel {
+  padding: 0px 5px;
+}
+
+@media only screen and (max-width: 760px) {
+  #main-panel > .jp-TreePanel {
+    margin: 0px -5px;
+  }
+}
diff --git a/packages/notebook-extension/style/base.css b/packages/notebook-extension/style/base.css
index 31054eea43..9b391a399c 100644
--- a/packages/notebook-extension/style/base.css
+++ b/packages/notebook-extension/style/base.css
@@ -152,11 +152,7 @@ body[data-notebook='notebooks'] .jp-WindowedPanel-window {
 /* Notebook box shadow */
 
 body[data-notebook='notebooks'] .jp-Notebook > *:first-child:not(:last-child) {
-  box-shadow: 0px 0px 12px 1px var(--jp-shadow-umbra-color);
-}
-
-body[data-notebook='notebooks'] .jp-Notebook > *:first-child:not(:last-child) {
-  box-shadow: 0px 0px 12px 1px var(--jp-shadow-umbra-color);
+  box-shadow: var(--jp-elevation-z4);
 }
 
 body[data-notebook='notebooks']
diff --git a/ui-tests/test/settings.spec.ts-snapshots/top-hidden-chromium-linux.png b/ui-tests/test/settings.spec.ts-snapshots/top-hidden-chromium-linux.png
index 052adf19e0..2dfe2c9fbf 100644
Binary files a/ui-tests/test/settings.spec.ts-snapshots/top-hidden-chromium-linux.png and b/ui-tests/test/settings.spec.ts-snapshots/top-hidden-chromium-linux.png differ
diff --git a/ui-tests/test/settings.spec.ts-snapshots/top-hidden-firefox-linux.png b/ui-tests/test/settings.spec.ts-snapshots/top-hidden-firefox-linux.png
index fbf6416ba2..2235cea62d 100644
Binary files a/ui-tests/test/settings.spec.ts-snapshots/top-hidden-firefox-linux.png and b/ui-tests/test/settings.spec.ts-snapshots/top-hidden-firefox-linux.png differ
diff --git a/ui-tests/test/settings.spec.ts-snapshots/top-visible-chromium-linux.png b/ui-tests/test/settings.spec.ts-snapshots/top-visible-chromium-linux.png
index e550995d33..4bb0f4fb17 100644
Binary files a/ui-tests/test/settings.spec.ts-snapshots/top-visible-chromium-linux.png and b/ui-tests/test/settings.spec.ts-snapshots/top-visible-chromium-linux.png differ
diff --git a/ui-tests/test/settings.spec.ts-snapshots/top-visible-firefox-linux.png b/ui-tests/test/settings.spec.ts-snapshots/top-visible-firefox-linux.png
index 775dfc3551..29235bff7e 100644
Binary files a/ui-tests/test/settings.spec.ts-snapshots/top-visible-firefox-linux.png and b/ui-tests/test/settings.spec.ts-snapshots/top-visible-firefox-linux.png differ