diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index b63ac83..e6c7e11 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -1422,6 +1422,7 @@
       /* or var(--lwt-sidebar-highlight-background-color)
            If this value is used, unset is required in the default theme.
         */
+      background-color: var(--menuitem-hover-background-color) !important;
     }
 
     /* Fallback background - Set to Legacy. It will be removed Next update
@@ -2940,7 +2941,9 @@
   #protections-popup-footer .protections-popup-footer-button,
   #protections-popup-multiView .panel-subview-footer-button,
   #identity-popup-clear-sitedata-button,
-  #identity-popup-more-info {
+  #identity-popup-more-info,
+  #unified-extensions-manage-extensions,
+  .unified-extensions-item-open-menu {
     cursor: pointer !important;
   }
 
@@ -3274,7 +3277,8 @@
     /* Original: 4px */
   }
 
-  button {
+  button,
+  findbar toolbarbutton {
     border-radius: 0 !important;
   }
 }
@@ -3318,6 +3322,11 @@
   html|input {
     border-radius: 0 !important;
   }
+
+  #urlbar-background,
+  #searchbar {
+    --toolbarbutton-border-radius: 0;
+  }
 }
 @supports -moz-bool-pref("userChrome.rounding.square_checklabel") {
   .checkbox-check,
@@ -6331,7 +6340,7 @@
 
   @supports not -moz-bool-pref("userChrome.tabbar.multi_row") {
     #TabsToolbar:not([multibar]) {
-      overflow: hidden;
+      overflow: clip;
       /* Prevent toolbar area over */
     }
   }
@@ -8543,10 +8552,15 @@
   or -moz-bool-pref("userChrome.autohide.infobar") {
   #navigator-toolbox {
     position: relative;
+  }
+  #navigator-toolbox:is(:hover, :focus-within) {
     z-index: 2;
   }
+  #navigator-toolbox:is(:hover, :focus-within) #PersonalToolbar {
+    z-index: -1;
+  }
 
-  #navigator-toolbox:not(:hover) {
+  #navigator-toolbox:not(:hover):not(:focus-within) {
     animation: 1s keepfront;
   }
 
@@ -8689,16 +8703,18 @@
         will-change: margin-bottom;
       }
 
+      #TabsToolbar:not([customizing]) {
+        will-change: opacity;
+      }
       @supports not -moz-bool-pref("userChrome.tabbar.on_bottom") {
-        #TabsToolbar:not([customizing]) {
+        #TabsToolbar:not([customizing]),
+        #TabsToolbar:not([customizing]) .titlebar-buttonbox-container {
           opacity: 0;
-          will-change: opacity;
         }
       }
       @supports -moz-bool-pref("userChrome.tabbar.on_bottom") {
         #TabsToolbar:not([customizing]) > *:not(.titlebar-buttonbox-container) {
           opacity: 0;
-          will-change: opacity;
         }
       }
 
@@ -8706,7 +8722,8 @@
         margin-bottom: 0px;
       }
       @supports not -moz-bool-pref("userChrome.tabbar.on_bottom") {
-        #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar {
+        #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar,
+        #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar .titlebar-buttonbox-container {
           opacity: 1;
         }
       }
@@ -8723,16 +8740,18 @@
           will-change: margin-bottom;
         }
 
+        #TabsToolbar:not([customizing]) {
+          will-change: opacity;
+        }
         @supports not -moz-bool-pref("userChrome.tabbar.on_bottom") {
-          #TabsToolbar:not([customizing]) {
+          #TabsToolbar:not([customizing]),
+          #TabsToolbar:not([customizing]) .titlebar-buttonbox-container {
             opacity: 0;
-            will-change: opacity;
           }
         }
         @supports -moz-bool-pref("userChrome.tabbar.on_bottom") {
           #TabsToolbar:not([customizing]) > *:not(.titlebar-buttonbox-container) {
             opacity: 0;
-            will-change: opacity;
           }
         }
 
@@ -8740,7 +8759,8 @@
           margin-bottom: 0px;
         }
         @supports not -moz-bool-pref("userChrome.tabbar.on_bottom") {
-          #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar {
+          #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar,
+          #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar .titlebar-buttonbox-container {
             opacity: 1;
           }
         }
@@ -8756,16 +8776,18 @@
           will-change: margin-bottom;
         }
 
+        #TabsToolbar:not([customizing]) {
+          will-change: opacity;
+        }
         @supports not -moz-bool-pref("userChrome.tabbar.on_bottom") {
-          #TabsToolbar:not([customizing]) {
+          #TabsToolbar:not([customizing]),
+          #TabsToolbar:not([customizing]) .titlebar-buttonbox-container {
             opacity: 0;
-            will-change: opacity;
           }
         }
         @supports -moz-bool-pref("userChrome.tabbar.on_bottom") {
           #TabsToolbar:not([customizing]) > *:not(.titlebar-buttonbox-container) {
             opacity: 0;
-            will-change: opacity;
           }
         }
 
@@ -8773,7 +8795,8 @@
           margin-bottom: 0px;
         }
         @supports not -moz-bool-pref("userChrome.tabbar.on_bottom") {
-          #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar {
+          #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar,
+          #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar .titlebar-buttonbox-container {
             opacity: 1;
           }
         }
@@ -8792,7 +8815,8 @@
       }
 
       @supports not -moz-bool-pref("userChrome.tabbar.on_bottom") {
-        #TabsToolbar:not([customizing]) {
+        #TabsToolbar:not([customizing]),
+        #TabsToolbar:not([customizing]) .titlebar-buttonbox-container {
           transition: opacity var(--uc-autohide-toolbar-speed) var(--animation-easing-function)
             var(--uc-autohide-toolbar-delay) !important;
         }
@@ -8811,7 +8835,8 @@
         transition-delay: 0s !important;
       }
       @supports not -moz-bool-pref("userChrome.tabbar.on_bottom") {
-        #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar:not([customizing]) {
+        #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar:not([customizing]),
+        #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar:not([customizing]) .titlebar-buttonbox-container {
           transition-delay: 0s !important;
         }
       }
@@ -9631,7 +9656,7 @@
 
     @supports -moz-bool-pref("userChrome.icon.panel_full") {
       #appMenu-save-file-button2 {
-        list-style-image: url("chrome://browser/skin/save.svg");
+        list-style-image: url("../icons/toolbarButton-download.svg");
       }
 
       #appMenu-find-button2 {
@@ -10053,6 +10078,11 @@
     #sidebarMenu-popup > .subviewbutton[data-l10n-id="sidebar-menu-close"] {
       list-style-image: url("chrome://global/skin/icons/close.svg");
     }
+
+    /*= unified-extensions-view ===================================================*/
+    #unified-extensions-manage-extensions {
+      list-style-image: url("chrome://mozapps/skin/extensions/extension.svg");
+    }
   }
   /** Menu - Icons Layout *******************************************************/
   @supports -moz-bool-pref("userChrome.icon.menu") {
@@ -10706,7 +10736,7 @@
       }
 
       #context-savelink {
-        --menuitem-image: url("chrome://browser/skin/save.svg");
+        --menuitem-image: url("../icons/toolbarButton-download.svg");
       }
 
       #context-savelinktopocket {
@@ -10836,7 +10866,7 @@
       }
 
       #context-savepage {
-        --menuitem-image: url("chrome://browser/skin/save.svg");
+        --menuitem-image: url("../icons/toolbarButton-download.svg");
       }
 
       #context-pocket {
@@ -10948,7 +10978,7 @@
         /* iconic */
       }
 
-      @supports -moz-bool-pref("widget.macos.native-context-menus") or -moz-bool-pref("widget.gtk.native-context-menus") {
+      @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") {
         #context-back {
           --menuitem-image: url("chrome://browser/skin/back.svg");
         }
@@ -11379,6 +11409,19 @@
       #treestyletab_piro_sakura_ne_jp-menuitem-_context_sendTabsToDevice\:manage {
         --menuitem-image: url("chrome://global/skin/icons/settings.svg");
       }
+
+      /*= unified-extensions-context-menu ==========================================*/
+      .unified-extensions-context-menu-manage-extension {
+        --menuitem-image: url("chrome://global/skin/icons/settings.svg");
+      }
+
+      .unified-extensions-context-menu-remove-extension {
+        --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+      }
+
+      .unified-extensions-context-menu-report-extension {
+        --menuitem-image: url("../icons/send.svg");
+      }
     }
     @supports -moz-bool-pref("userChrome.icon.global_menubar") {
       /*= main-menubar =============================================================*/
@@ -11434,7 +11477,7 @@
       }
 
       #menu_savePage {
-        --menuitem-image: url("chrome://browser/skin/save.svg");
+        --menuitem-image: url("../icons/toolbarButton-download.svg");
       }
 
       #menu_sendLink {
@@ -11802,7 +11845,7 @@
       }
 
       #fileImport {
-        --menuitem-image: url("chrome://browser/skin/save.svg");
+        --menuitem-image: url("../icons/toolbarButton-download.svg");
       }
 
       #fileExport {
diff --git a/css/leptonContent.css b/css/leptonContent.css
index 03b4729..09697f5 100644
--- a/css/leptonContent.css
+++ b/css/leptonContent.css
@@ -3403,7 +3403,7 @@
         }
 
         #fileImport {
-          --menuitem-image: url("chrome://browser/skin/save.svg");
+          --menuitem-image: url("../icons/toolbarButton-download.svg");
         }
 
         #fileExport {
diff --git a/icons/toolbarButton-download.svg b/icons/toolbarButton-download.svg
new file mode 100644
index 0000000..6d64757
--- /dev/null
+++ b/icons/toolbarButton-download.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg">
+  <path d="M9.709 7.344h-1.84a.477.477 0 0 0-.337.813l2.555 2.554a.477.477 0 0 0 .673 0l2.554-2.554c.3-.3.088-.813-.337-.813h-1.84V4.548h.002v-1.19h-.002v-.786H9.71v.785h-.003v1.19h.004v2.797z"/>
+  <path d="M13.714 3.357h-1.146v1.19h1.146c.329 0 .596.267.596.596v7.619a.595.595 0 0 1-.596.595H2.286a.595.595 0 0 1-.596-.595V3.238c0-.328.267-.595.596-.595h3.47a.6.6 0 0 1 .442.197l1.36 1.51A.593.593 0 0 0 8 4.548h.277v-1.19h-.012L7.082 2.042a1.79 1.79 0 0 0-1.328-.59H2.286C1.3 1.452.5 2.252.5 3.237v9.524c0 .985.801 1.786 1.786 1.786h11.428c.985 0 1.786-.801 1.786-1.786v-7.62c0-.984-.801-1.785-1.786-1.785z"/>
+</svg>
diff --git a/src/autohide/_common.scss b/src/autohide/_common.scss
index a34b0f8..1fde6d6 100644
--- a/src/autohide/_common.scss
+++ b/src/autohide/_common.scss
@@ -31,9 +31,15 @@
 @include Option("userChrome.autohide.tabbar", "userChrome.autohide.navbar", "userChrome.autohide.bookmarkbar", "userChrome.autohide.infobar") {
   #navigator-toolbox {
     position: relative;
-    z-index: 2;
+    &:is(:hover, :focus-within) {
+      z-index: 2;
+
+      #PersonalToolbar {
+        z-index: -1;
+      }
+    }
   }
-  #navigator-toolbox:not(:hover) {
+  #navigator-toolbox:not(:hover):not(:focus-within) {
     animation: 1s keepfront;
   }
   @keyframes keepfront {
diff --git a/src/autohide/_tabbar.scss b/src/autohide/_tabbar.scss
index 3f2bda9..fe377cb 100644
--- a/src/autohide/_tabbar.scss
+++ b/src/autohide/_tabbar.scss
@@ -1,7 +1,10 @@
 //-- Mixin ---------------------------------------------------------------------
 @mixin _autohide_tabbar() {
   @include NotOption("userChrome.tabbar.on_bottom") {
-    @content;
+    &,
+    & .titlebar-buttonbox-container {
+      @content;
+    }
   }
   @include Option("userChrome.tabbar.on_bottom") {
     > *:not(.titlebar-buttonbox-container) {
@@ -20,8 +23,8 @@
   #TabsToolbar:not([customizing]) {
     @include _autohide_tabbar {
       opacity: 0;
-      will-change: opacity;
     }
+    will-change: opacity;
   }
 
   #navigator-toolbox:is(:hover, :focus-within) {
diff --git a/src/decoration/_cursor.scss b/src/decoration/_cursor.scss
index 7166ca9..74aec7c 100644
--- a/src/decoration/_cursor.scss
+++ b/src/decoration/_cursor.scss
@@ -21,7 +21,9 @@ menuitem.openintabs-menuitem,
 #protections-popup-footer .protections-popup-footer-button,
 #protections-popup-multiView .panel-subview-footer-button,
 #identity-popup-clear-sitedata-button,
-#identity-popup-more-info {
+#identity-popup-more-info,
+#unified-extensions-manage-extensions,
+.unified-extensions-item-open-menu {
   cursor: pointer !important;
 }
 
diff --git a/src/icons/_global_menu.scss b/src/icons/_global_menu.scss
index fc6d034..0c20225 100644
--- a/src/icons/_global_menu.scss
+++ b/src/icons/_global_menu.scss
@@ -27,7 +27,7 @@
 }
 
 #menu_savePage {
-  --menuitem-image: url("chrome://browser/skin/save.svg");
+  --menuitem-image: url("../icons/toolbarButton-download.svg");
 }
 #menu_sendLink {
   --menuitem-image: url("chrome://browser/skin/mail.svg");
diff --git a/src/icons/_library.scss b/src/icons/_library.scss
index fc2b57b..a65d505 100644
--- a/src/icons/_library.scss
+++ b/src/icons/_library.scss
@@ -55,7 +55,7 @@
 }
 
 #fileImport {
-  --menuitem-image: url("chrome://browser/skin/save.svg");
+  --menuitem-image: url("../icons/toolbarButton-download.svg");
 }
 #fileExport {
   --menuitem-image: url("chrome://browser/skin/open.svg");
diff --git a/src/icons/_panel.scss b/src/icons/_panel.scss
index cad45e4..575208c 100644
--- a/src/icons/_panel.scss
+++ b/src/icons/_panel.scss
@@ -88,7 +88,7 @@
 }
 @include Option("userChrome.icon.panel_full") {
   #appMenu-save-file-button2 {
-    list-style-image: url("chrome://browser/skin/save.svg");
+    list-style-image: url("../icons/toolbarButton-download.svg");
   }
   #appMenu-find-button2 {
     list-style-image: url("chrome://global/skin/icons/search-glass.svg");
@@ -473,3 +473,8 @@ panelMenuBookmarkThisPage[starred] {
 #sidebarMenu-popup > .subviewbutton[data-l10n-id="sidebar-menu-close"] {
   list-style-image: url("chrome://global/skin/icons/close.svg");
 }
+
+/*= unified-extensions-view ===================================================*/
+#unified-extensions-manage-extensions {
+  list-style-image: url("chrome://mozapps/skin/extensions/extension.svg");
+}
diff --git a/src/icons/context_menu/_content_area.scss b/src/icons/context_menu/_content_area.scss
index c74e829..8655845 100644
--- a/src/icons/context_menu/_content_area.scss
+++ b/src/icons/context_menu/_content_area.scss
@@ -45,7 +45,7 @@
   --menuitem-image: url("chrome://browser/skin/bookmark.svg");
 }
 #context-savelink {
-  --menuitem-image: url("chrome://browser/skin/save.svg");
+  --menuitem-image: url("../icons/toolbarButton-download.svg");
 }
 #context-savelinktopocket {
   --menuitem-image: url("../icons/pocket-outline.svg");
@@ -148,7 +148,7 @@
 }
 
 #context-savepage {
-  --menuitem-image: url("chrome://browser/skin/save.svg");
+  --menuitem-image: url("../icons/toolbarButton-download.svg");
 }
 #context-pocket {
   --menuitem-image: url("../icons/pocket-outline.svg");
@@ -243,7 +243,7 @@
   /* iconic */
 }
 
-@include NativeMenu {
+@include OS($mac) {
   #context-back {
     --menuitem-image: url("chrome://browser/skin/back.svg");
   }
diff --git a/src/icons/context_menu/_others.scss b/src/icons/context_menu/_others.scss
index 25f28d8..04c48cc 100644
--- a/src/icons/context_menu/_others.scss
+++ b/src/icons/context_menu/_others.scss
@@ -213,3 +213,14 @@ menuitem.searchbar-clear-history {
 #treestyletab_piro_sakura_ne_jp-menuitem-_context_sendTabsToDevice\:manage {
   --menuitem-image: url("chrome://global/skin/icons/settings.svg");
 }
+
+/*= unified-extensions-context-menu ==========================================*/
+.unified-extensions-context-menu-manage-extension {
+  --menuitem-image: url("chrome://global/skin/icons/settings.svg");
+}
+.unified-extensions-context-menu-remove-extension {
+  --menuitem-image: url("chrome://global/skin/icons/delete.svg");
+}
+.unified-extensions-context-menu-report-extension {
+  --menuitem-image: url("../icons/send.svg");
+}
diff --git a/src/rounding/_square.scss b/src/rounding/_square.scss
index 139f7bb..fa92deb 100644
--- a/src/rounding/_square.scss
+++ b/src/rounding/_square.scss
@@ -7,7 +7,9 @@
   :root {
     --toolbarbutton-border-radius: 0 !important;  /* Original: 4px */
   }
-  button {
+
+  button,
+  findbar toolbarbutton {
     border-radius: 0 !important;
   }
 }
@@ -54,6 +56,11 @@
   html|input {
     border-radius: 0 !important;
   }
+
+  #urlbar-background,
+  #searchbar {
+    --toolbarbutton-border-radius: 0;
+  }
 }
 
 @include Option("userChrome.rounding.square_checklabel") {
diff --git a/src/tab/_connect_to_window.scss b/src/tab/_connect_to_window.scss
index a7ebe5c..24ed9a4 100644
--- a/src/tab/_connect_to_window.scss
+++ b/src/tab/_connect_to_window.scss
@@ -18,7 +18,7 @@
 }
 @include NotOption("userChrome.tabbar.multi_row") {
   #TabsToolbar:not([multibar]) {
-    overflow: hidden;   /* Prevent toolbar area over */
+    overflow: clip; /* Prevent toolbar area over */
   }
 }
 
diff --git a/src/theme/_fully_color.scss b/src/theme/_fully_color.scss
index 3f230c7..fc20cf7 100644
--- a/src/theme/_fully_color.scss
+++ b/src/theme/_fully_color.scss
@@ -84,6 +84,8 @@ html#main-window menupopup:not(.in-menulist) {
     /* or var(--lwt-sidebar-highlight-background-color)
          If this value is used, unset is required in the default theme.
       */
+
+    background-color: var(--menuitem-hover-background-color) !important;
   }
 
   /* Fallback background - Set to Legacy. It will be removed Next update