diff --git a/chrome/icons/arrow-filled-down.svg b/chrome/icons/arrow-filled-down.svg
index ee09d02..c8b2fe2 100644
--- a/chrome/icons/arrow-filled-down.svg
+++ b/chrome/icons/arrow-filled-down.svg
@@ -1 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity"><path d="M-2.729 6.479-7.35 11.1a.92.92 0 0 1-1.3 0l-4.621-4.621a.72.72 0 0 1 .509-1.229h9.525a.72.72 0 0 1 .508 1.229" transform-origin="center"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 16 16">
+  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M15.69,5.33l-6.75,6.75c-.52.52-1.37.52-1.9,0L.31,5.33c-.41-.41-.41-1.08,0-1.49.2-.2.47-.31.75-.31h13.9c.59,0,1.05.47,1.05,1.05,0,.28-.11.55-.31.75"/>
+</svg>
\ No newline at end of file
diff --git a/chrome/icons/arrow-filled-up.svg b/chrome/icons/arrow-filled-up.svg
new file mode 100644
index 0000000..fa51177
--- /dev/null
+++ b/chrome/icons/arrow-filled-up.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 16 16">
+  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M.3,10.67L7.05,3.92c.52-.52,1.37-.52,1.9,0l6.74,6.75c.41.41.41,1.08,0,1.49-.2.2-.47.31-.75.31H1.05C.46,12.47,0,12,0,11.42c0-.28.11-.55.31-.75"/>
+</svg>
\ No newline at end of file
diff --git a/chrome/icons/icons.css b/chrome/icons/icons.css
index 9e9cb1b..0f233f2 100644
--- a/chrome/icons/icons.css
+++ b/chrome/icons/icons.css
@@ -1592,16 +1592,23 @@ menuitem[data-l10n-id="origin-controls-options"] .menu-text::after {
 .menu-right {
   opacity: 0 !important;
 }
+
 menu::after {
-  content: "";
-  margin-right: -1px !important;
+  content: "" !important;
+  margin-block: auto !important;
+  display: flex !important;
+  align-items: center !important;
+  margin-right: -6px !important;
   color: var(--textSecondary) !important;
   font-size: 10px !important;
+  opacity: 1 !important;
   font-family: 'Segoe Fluent Icons', 'Segoe MDL2 Assets' !important;
   background-size: 10px !important;
   background-repeat: no-repeat !important;
   background-position: center center !important;
+  background-image: none !important;
 }
+
 #protections-popup-mainView .subviewbutton-nav:not(.notFound), 
 .widget-overflow-list .subviewbutton-nav, 
 .PanelUI-subView .subviewbutton-nav {
@@ -1634,6 +1641,25 @@ menu::after {
   background-image: url(caret-right.svg) !important;
 }
 
+/* Bookmarks toolbar scroll arrows */
+
+#scrollbutton-up[part="scrollbutton-up"] {
+  background-image: var(--menu-arrow-icon-up, url(caret-left.svg)) !important;
+  background-repeat: no-repeat !important;
+  background-position: center center !important;
+  background-size: 8px !important;
+}
+#scrollbutton-down[part="scrollbutton-down"] {
+  background-image: var(--menu-arrow-icon-down, url(caret-right.svg)) !important;
+  background-repeat: no-repeat !important;
+  background-position: center center !important;
+  background-size: 8px !important;
+}
+.menupopup-arrowscrollbox {
+  --menu-arrow-icon-up: url(arrow-filled-up.svg);
+  --menu-arrow-icon-down: url(arrow-filled-down.svg);
+}
+
 /* Proper back icon inside panels */
 .panel-header {
   & > .subviewbutton-back {
@@ -2267,4 +2293,4 @@ img[srcset="chrome://browser/skin/qrcode.svg"] {
 
 #share-tab-button {
   list-style-image: url(share.svg) !important;
-}
\ No newline at end of file
+}
diff --git a/chrome/userChrome.css b/chrome/userChrome.css
index 88d0062..c27ce5e 100644
--- a/chrome/userChrome.css
+++ b/chrome/userChrome.css
@@ -4666,6 +4666,56 @@ menupopup menu[disabled="true"], menupopup menuitem[disabled="true"] {
   }
 }
 
+/* ========== Bookmarks toolbar ========== */
+
+#BMB_searchBookmarks,
+#BMB_viewBookmarksSidebar {
+  position: relative !important;
+}
+
+* {
+  --menu-clip-enable: 0;
+}
+
+.menupopup-arrowscrollbox {
+  --menu-clip-enable: 1;
+}
+
+scrollbox[part="scrollbox"] {
+  --clr-top: 0px;
+  --clr-bottom: 0px;
+  clip-path: inset(var(--clr-top) 0 var(--clr-bottom) 0) !important;
+  padding-top: var(--clr-top) !important;
+  padding-bottom: var(--clr-bottom) !important;
+}
+
+toolbarbutton#scrollbutton-up:not([disabled]) ~ scrollbox[part="scrollbox"] {
+  --clr-top: calc(26px * var(--menu-clip-enable, 0));
+}
+
+scrollbox[part="scrollbox"]:has(~ toolbarbutton#scrollbutton-down:not([disabled])) {
+  --clr-bottom: calc(26px * var(--menu-clip-enable, 0));
+}
+
+.menupopup-arrowscrollbox {
+  --menu-scrollbtn-shift-x: 2px;
+  --menu-scrollbtn-shift-up-y: 10px;
+  --menu-scrollbtn-shift-down-y: 6px;
+}
+
+#scrollbutton-up[part="scrollbutton-up"] {
+  position: relative;
+  z-index: 2;
+  top: calc(-8px + var(--menu-scrollbtn-shift-up-y, 0px)) !important;
+  left: calc(4px + var(--menu-scrollbtn-shift-x, 0px)) !important;
+}
+#scrollbutton-down[part="scrollbutton-down"] {
+  position: relative;
+  z-index: 2;
+  top: calc(-8px + var(--menu-scrollbtn-shift-down-y, 0px)) !important;
+  left: calc(4px + var(--menu-scrollbtn-shift-x, 0px)) !important;
+}
+
 /* ========== Dialog boxes ========== */
 
 dialog:not(#window-modal-dialog) {
@@ -8300,6 +8350,11 @@ tab-split-view-wrapper {
   margin-bottom: 0 !important;
 }
 
+#tabbrowser-arrowscrollbox {
+  --menu-scrollbtn-shift-up-y: 1px;
+  --menu-scrollbtn-shift-down-y: 1px;
+}
+
 @media (-moz-platform: windows) and (not (-moz-windows-accent-color-in-titlebar)) {
   :root[sizemode="normal"][customtitlebar]:not([inFullscreen]) #navigator-toolbox {
     padding-top: 0 !important;
@@ -8743,7 +8798,7 @@ tab-split-view-wrapper {
 
     /* Toolbar icons pinned to the tab area */
     #TabsToolbar .toolbarbutton-1 {
-      margin-bottom: 6px !important;
+      margin-bottom: 5px !important;
     }
 
     /* Tab gap up and down */
@@ -11738,4 +11793,4 @@ tab-split-view-wrapper {
       }
     }
   }
-}
\ No newline at end of file
+}