diff --git a/src/browser/base/content/ZenSidebarManager.mjs b/src/browser/base/content/ZenSidebarManager.mjs
index 3ce5cdbf6..5403ebda7 100644
--- a/src/browser/base/content/ZenSidebarManager.mjs
+++ b/src/browser/base/content/ZenSidebarManager.mjs
@@ -440,7 +440,7 @@ var gZenBrowserManagerSidebar = {
     let url = (browser == null) ? panel.url : browser.currentURI.spec;
     let tab = gBrowser.addTrustedTab(url);    
     gBrowser.selectedTab = tab;
-        this.close();
+    this.close();
   },
 
   contextToggleMuteAudio() {
diff --git a/src/browser/themes/shared/zen-browser-shared.css b/src/browser/themes/shared/zen-browser-shared.css
index 0bd22fc5f..3edabb290 100644
--- a/src/browser/themes/shared/zen-browser-shared.css
+++ b/src/browser/themes/shared/zen-browser-shared.css
@@ -206,7 +206,6 @@ button.popup-notification-dropmarker {
 
 #navigator-toolbox toolbar#TabsToolbar {
   margin: var(--zen-appcontent-separator-from-window);
-  background: var(--sidebar-background-color);
   overflow: hidden;
   transition: .2s;
   border-radius: var(--zen-appcontent-border-radius) !important;
@@ -513,3 +512,12 @@ panelmultiview {
     width: -moz-available;
   }
 }
+
+/* Screenshots */
+
+#screenshotsPagePanel {
+  position: absolute;
+  top: 3%;
+  right: 1.5%;
+}
+
diff --git a/src/toolkit/themes/shared/in-content/zen-common-shared-ui-override.css b/src/toolkit/themes/shared/in-content/zen-common-shared-ui-override.css
index b1163210c..7904020c9 100644
--- a/src/toolkit/themes/shared/in-content/zen-common-shared-ui-override.css
+++ b/src/toolkit/themes/shared/in-content/zen-common-shared-ui-override.css
@@ -9,6 +9,8 @@ xul|button {
   border-radius: var(--zen-button-border-radius) !important;
   padding: var(--zen-button-padding) !important;
   transition: .2s;
+  min-width: 150px !important;
+  font-weight: 500 !important;
 }
 
 button:active {
@@ -19,5 +21,6 @@ html|button:not(:is(
   .tab-button, .ghost-button
 )) {
   transition: .2s;
-  border-radius: 10px !important;
+  border-radius: 6px !important;
+  min-width: 150px !important;
 }
diff --git a/src/toolkit/themes/shared/in-content/zen-common-shared.css b/src/toolkit/themes/shared/in-content/zen-common-shared.css
index a993f06d7..d1adfd5c4 100644
--- a/src/toolkit/themes/shared/in-content/zen-common-shared.css
+++ b/src/toolkit/themes/shared/in-content/zen-common-shared.css
@@ -32,8 +32,14 @@
   --zen-dialog-background: var(--zen-colors-tertiary);
   --zen-urlbar-background: color-mix(in srgb, var(--zen-primary-color) 8%, #f1f1f1 92%);
 
-  --in-content-primary-button-background: var(--zen-primary-color) !important;          
-  --in-content-primary-button-background-hover: var(--zen-colors-hover-bg) !important;
+  --in-content-primary-button-background: light-dark(
+    color-mix(in srgb, var(--zen-primary-color) 35%, black 65%),
+    color-mix(in srgb, var(--zen-primary-color) 35%, white 65%)
+  ) !important;          
+  --in-content-primary-button-background-hover: light-dark(
+    color-mix(in srgb, var(--zen-primary-color) 40%, black 60%),
+    color-mix(in srgb, var(--zen-primary-color) 40%, white 60%)
+  ) !important;
   --in-content-primary-button-background-active: var(--zen-colors-hover-bg) !important;
   --in-content-primary-button-text-color: light-dark(white, black) !important;
   --in-content-primary-button-border-color: transparent !important;
@@ -44,8 +50,16 @@
   --in-content-accent-color: var(--zen-colors-primary) !important;
 
   /* This is like the secondary button */
-  --in-content-button-background: var(--zen-colors-secondary) !important;
+  --in-content-button-background: light-dark(
+    color-mix(in srgb, var(--zen-primary-color) 20%, transparent 80%),
+    color-mix(in srgb, var(--zen-primary-color) 10%, transparent 90%)
+  ) !important;
+  --in-content-button-background-hover: light-dark(
+    color-mix(in srgb, var(--zen-primary-color) 25%, transparent 75%),
+    color-mix(in srgb, var(--zen-primary-color) 15%, transparent 85%)
+  ) !important;
   --button-bgcolor: var(--in-content-button-background) !important;
+  --button-hover-bgcolor: var(--in-content-button-background-hover) !important;   
   --zen-secondary-btn-color: var(--zen-colors-primary-foreground);
   --focus-outline-color: var(--button-bgcolor) !important;
   --in-content-button-text-color: var(--zen-secondary-btn-color) !important;
@@ -58,8 +72,8 @@
   --in-content-page-background: var(--zen-colors-tertiary) !important;
   --zen-in-content-dialog-background: var(--zen-colors-tertiary);
 
-  --zen-button-border-radius: 7px;
-  --zen-button-padding: 10px 14px;
+  --zen-button-border-radius: 6px       ;
+  --zen-button-padding: .7rem 1.2rem;
 
   /* Other colors */
   --urlbar-box-bgcolor: light-dark(white, rgb(66, 65, 77)) !important;
diff --git a/src/toolkit/themes/shared/zen-popup.css b/src/toolkit/themes/shared/zen-popup.css
index 29ecbc78d..80f37dcbd 100644
--- a/src/toolkit/themes/shared/zen-popup.css
+++ b/src/toolkit/themes/shared/zen-popup.css
@@ -379,7 +379,8 @@ hbox.editBMPanel_folderRow {
 /* Context menu */
 menu, menuitem {
   &:where([_moz-menuactive]:not([disabled="true"])) {
-    background-color: var(--zen-colors-border) !important;
+    background-color: var(--button-hover-bgcolor);
+    color: light-dark(black, white);    
   }
 }