diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c5bd37e..4545552 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -42,14 +42,14 @@ jobs:
           - mode: "STANDARD"
             name: "Lepton-Proton-Style"
             branch: "proton-style"
-          - mode: "ESR"
-            name: "ESR-Lepton"
+          - mode: "LegacyV117"
+            name: "LegacyV117-Lepton"
             branch: "master"
-          - mode: "ESR"
-            name: "ESR-Lepton-Photon-Style"
+          - mode: "LegacyV117"
+            name: "LegacyV117-Lepton-Photon-Style"
             branch: "photon-style"
-          - mode: "ESR"
-            name: "ESR-Lepton-Proton-Style"
+          - mode: "LegacyV117"
+            name: "LegacyV117-Lepton-Proton-Style"
             branch: "proton-style"
     steps:
       - uses: actions/checkout@v4
@@ -75,8 +75,8 @@ jobs:
           rm css/leptonChromeESR.css
           rm css/leptonContentESR.css
 
-      - name: Processing for ESR
-        if: matrix.mode == 'ESR'
+      - name: Processing for LegacyV117
+        if: matrix.mode == 'LegacyV117'
         run: |
           sed -i "s/\.css/ESR\.css/g" userChrome.css
           sed -i "s/\.css/ESR\.css/g" userContent.css
diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index b41fdc3..2fbb895 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -3965,6 +3965,11 @@
     --tab-border-radius: 0 !important; /* Original: 4px */
   }
 }
+@media not -moz-pref("userChrome.rounding.square_tab") {
+  :root {
+    --tab-border-radius: 4px !important; /* Original: 4px */
+  }
+}
 @media -moz-pref("userChrome.rounding.square_button") {
   :root {
     --urlbar-icon-border-radius: 0 !important; /* Original: calc(var(--toolbarbutton-border-radius) - 1px); */
@@ -12469,6 +12474,9 @@
       .menupopup-arrowscrollbox {
         padding-inline: 0 !important; /* Original: padding: var(--panel-padding); --panel-padding-block: 4px; */
       }
+      menupopup[needsgutter] > :is(menu, menuitem) > .menu-icon {
+        display: none !important;
+      }
     }
     @media (-moz-platform: windows), (-moz-gtk-csd-available) {
       @media -moz-pref("userChrome.theme.non_native_menu") {
@@ -12543,6 +12551,9 @@
           .menupopup-arrowscrollbox {
             padding-inline: 0 !important; /* Original: padding: var(--panel-padding); --panel-padding-block: 4px; */
           }
+          menupopup[needsgutter] > :is(menu, menuitem) > .menu-icon {
+            display: none !important;
+          }
         }
       }
     }
@@ -12676,10 +12687,14 @@
     /* Windows */
     @media (-moz-platform: windows) {
       /* Bookmark Popup - None icon menu */
-      menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
-      menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menu:not(.menu-iconic),
-      #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
-      #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) {
+      menupopup:is(#BMB_bookmarksPopup)[placespopup="true"]
+        menuitem:not(.menuitem-iconic, [disabled="true"]):not(:has(.menu-icon[aria-hidden="true"])),
+      menupopup:is(#BMB_bookmarksPopup)[placespopup="true"]
+        menu:not(.menu-iconic):not(:has(.menu-icon[aria-hidden="true"])),
+      #PersonalToolbar
+        menupopup[placespopup="true"]
+        menuitem:not(.menuitem-iconic, [disabled="true"]):not(:has(.menu-icon[aria-hidden="true"])),
+      #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic):not(:has(.menu-icon[aria-hidden="true"])) {
         margin-inline: var(--arrowpanel-menuitem-margin-inline) !important;
         padding-inline-start: var(--bookmark-menu-icon-text-padding) !important;
         background-position: var(--uc-menu-background-position) var(--bookmark-menu-icon-background-padding) center !important;
@@ -12698,26 +12713,44 @@
         margin-inline-start: -1px !important;
       }
       /* Bookmark Popup - None icon menu */
-      menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
-      menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menu:not(.menu-iconic),
-      #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
-      #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) {
+      menupopup:is(#BMB_bookmarksPopup)[placespopup="true"]
+        menuitem:not(.menuitem-iconic, [disabled="true"]):not(:has(.menu-icon[aria-hidden="true"])),
+      menupopup:is(#BMB_bookmarksPopup)[placespopup="true"]
+        menu:not(.menu-iconic):not(:has(.menu-icon[aria-hidden="true"])),
+      #PersonalToolbar
+        menupopup[placespopup="true"]
+        menuitem:not(.menuitem-iconic, [disabled="true"]):not(:has(.menu-icon[aria-hidden="true"])),
+      #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic):not(:has(.menu-icon[aria-hidden="true"])) {
         padding-inline-start: calc(var(--context-menu-background-padding) + 2px) !important;
       }
       @media -moz-pref("userChrome.theme.non_native_menu") {
-        menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
-        menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menu:not(.menu-iconic),
-        #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
-        #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) {
+        menupopup:is(#BMB_bookmarksPopup)[placespopup="true"]
+          menuitem:not(.menuitem-iconic, [disabled="true"]):not(:has(.menu-icon[aria-hidden="true"])),
+        menupopup:is(#BMB_bookmarksPopup)[placespopup="true"]
+          menu:not(.menu-iconic):not(:has(.menu-icon[aria-hidden="true"])),
+        #PersonalToolbar
+          menupopup[placespopup="true"]
+          menuitem:not(.menuitem-iconic, [disabled="true"]):not(:has(.menu-icon[aria-hidden="true"])),
+        #PersonalToolbar
+          menupopup[placespopup="true"]
+          menu:not(.menu-iconic):not(:has(.menu-icon[aria-hidden="true"])) {
           margin-inline: var(--arrowpanel-menuitem-margin-inline) !important;
         }
       }
       menupopup:is(#BMB_bookmarksPopup)[placespopup="true"]
-        menuitem:not(.menuitem-iconic, [disabled="true"])
+        menuitem:not(.menuitem-iconic, [disabled="true"]):not(:has(.menu-icon[aria-hidden="true"]))
         .menu-text,
-      menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menu:not(.menu-iconic) .menu-text,
-      #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]) .menu-text,
-      #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) .menu-text {
+      menupopup:is(#BMB_bookmarksPopup)[placespopup="true"]
+        menu:not(.menu-iconic):not(:has(.menu-icon[aria-hidden="true"]))
+        .menu-text,
+      #PersonalToolbar
+        menupopup[placespopup="true"]
+        menuitem:not(.menuitem-iconic, [disabled="true"]):not(:has(.menu-icon[aria-hidden="true"]))
+        .menu-text,
+      #PersonalToolbar
+        menupopup[placespopup="true"]
+        menu:not(.menu-iconic):not(:has(.menu-icon[aria-hidden="true"]))
+        .menu-text {
         margin-inline-start: var(--context-menu-text-padding) !important;
       }
     }
@@ -12728,20 +12761,32 @@
         padding-inline: var(--arrowpanel-menuitem-padding-inline) !important;
       }
       /* Bookmark Popup - None icon menu */
-      menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
-      menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menu:not(.menu-iconic) {
+      menupopup:is(#BMB_bookmarksPopup)[placespopup="true"]
+        menuitem:not(.menuitem-iconic, [disabled="true"]):not(:has(.menu-icon[aria-hidden="true"])),
+      menupopup:is(#BMB_bookmarksPopup)[placespopup="true"]
+        menu:not(.menu-iconic):not(:has(.menu-icon[aria-hidden="true"])) {
         padding-inline-start: calc(var(--arrowpanel-menuitem-padding-inline) + 3px) !important;
       }
-      #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
-      #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) {
+      #PersonalToolbar
+        menupopup[placespopup="true"]
+        menuitem:not(.menuitem-iconic, [disabled="true"]):not(:has(.menu-icon[aria-hidden="true"])),
+      #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic):not(:has(.menu-icon[aria-hidden="true"])) {
         padding-inline-start: calc(var(--arrowpanel-menuitem-padding-inline) + 1px) !important;
       }
       menupopup:is(#BMB_bookmarksPopup)[placespopup="true"]
-        menuitem:not(.menuitem-iconic, [disabled="true"])
+        menuitem:not(.menuitem-iconic, [disabled="true"]):not(:has(.menu-icon[aria-hidden="true"]))
         > .menu-text,
-      menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menu:not(.menu-iconic) > .menu-text,
-      #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]) > .menu-text,
-      #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) > .menu-text {
+      menupopup:is(#BMB_bookmarksPopup)[placespopup="true"]
+        menu:not(.menu-iconic):not(:has(.menu-icon[aria-hidden="true"]))
+        > .menu-text,
+      #PersonalToolbar
+        menupopup[placespopup="true"]
+        menuitem:not(.menuitem-iconic, [disabled="true"]):not(:has(.menu-icon[aria-hidden="true"]))
+        > .menu-text,
+      #PersonalToolbar
+        menupopup[placespopup="true"]
+        menu:not(.menu-iconic):not(:has(.menu-icon[aria-hidden="true"]))
+        > .menu-text {
         padding-inline-start: var(--context-menu-mac-padding) !important;
       }
     }
@@ -18452,6 +18497,11 @@
     --tab-border-radius: 0 !important; /* Original: 4px */
   }
 }
+@media not (-moz-bool-pref: "userChrome.rounding.square_tab") {
+  :root {
+    --tab-border-radius: 4px !important; /* Original: 4px */
+  }
+}
 @media (-moz-bool-pref: "userChrome.rounding.square_button") {
   :root {
     --urlbar-icon-border-radius: 0 !important; /* Original: calc(var(--toolbarbutton-border-radius) - 1px); */
@@ -28213,6 +28263,9 @@
   .menupopup-arrowscrollbox {
     padding-inline: 0 !important; /* Original: padding: var(--panel-padding); --panel-padding-block: 4px; */
   }
+  menupopup[needsgutter] > :is(menu, menuitem) > .menu-icon {
+    display: none !important;
+  }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-platform: windows) and (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available),
   (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
@@ -28282,6 +28335,9 @@
   .menupopup-arrowscrollbox {
     padding-inline: 0 !important; /* Original: padding: var(--panel-padding); --panel-padding-block: 4px; */
   }
+  menupopup[needsgutter] > :is(menu, menuitem) > .menu-icon {
+    display: none !important;
+  }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-platform: windows) {
   :root {
@@ -28409,10 +28465,14 @@
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-platform: windows) {
   /* Bookmark Popup - None icon menu */
-  menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
-  menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menu:not(.menu-iconic),
-  #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
-  #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) {
+  menupopup:is(#BMB_bookmarksPopup)[placespopup="true"]
+    menuitem:not(.menuitem-iconic, [disabled="true"]):not(:has(.menu-icon[aria-hidden="true"])),
+  menupopup:is(#BMB_bookmarksPopup)[placespopup="true"]
+    menu:not(.menu-iconic):not(:has(.menu-icon[aria-hidden="true"])),
+  #PersonalToolbar
+    menupopup[placespopup="true"]
+    menuitem:not(.menuitem-iconic, [disabled="true"]):not(:has(.menu-icon[aria-hidden="true"])),
+  #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic):not(:has(.menu-icon[aria-hidden="true"])) {
     margin-inline: var(--arrowpanel-menuitem-margin-inline) !important;
     padding-inline-start: var(--bookmark-menu-icon-text-padding) !important;
     background-position: var(--uc-menu-background-position) var(--bookmark-menu-icon-background-padding) center !important;
@@ -28429,26 +28489,44 @@
     margin-inline-start: -1px !important;
   }
   /* Bookmark Popup - None icon menu */
-  menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
-  menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menu:not(.menu-iconic),
-  #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
-  #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) {
+  menupopup:is(#BMB_bookmarksPopup)[placespopup="true"]
+    menuitem:not(.menuitem-iconic, [disabled="true"]):not(:has(.menu-icon[aria-hidden="true"])),
+  menupopup:is(#BMB_bookmarksPopup)[placespopup="true"]
+    menu:not(.menu-iconic):not(:has(.menu-icon[aria-hidden="true"])),
+  #PersonalToolbar
+    menupopup[placespopup="true"]
+    menuitem:not(.menuitem-iconic, [disabled="true"]):not(:has(.menu-icon[aria-hidden="true"])),
+  #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic):not(:has(.menu-icon[aria-hidden="true"])) {
     padding-inline-start: calc(var(--context-menu-background-padding) + 2px) !important;
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userChrome.theme.non_native_menu") {
-  menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
-  menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menu:not(.menu-iconic),
-  #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
-  #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) {
+  menupopup:is(#BMB_bookmarksPopup)[placespopup="true"]
+    menuitem:not(.menuitem-iconic, [disabled="true"]):not(:has(.menu-icon[aria-hidden="true"])),
+  menupopup:is(#BMB_bookmarksPopup)[placespopup="true"]
+    menu:not(.menu-iconic):not(:has(.menu-icon[aria-hidden="true"])),
+  #PersonalToolbar
+    menupopup[placespopup="true"]
+    menuitem:not(.menuitem-iconic, [disabled="true"]):not(:has(.menu-icon[aria-hidden="true"])),
+  #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic):not(:has(.menu-icon[aria-hidden="true"])) {
     margin-inline: var(--arrowpanel-menuitem-margin-inline) !important;
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-gtk-csd-available) {
-  menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]) .menu-text,
-  menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menu:not(.menu-iconic) .menu-text,
-  #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]) .menu-text,
-  #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) .menu-text {
+  menupopup:is(#BMB_bookmarksPopup)[placespopup="true"]
+    menuitem:not(.menuitem-iconic, [disabled="true"]):not(:has(.menu-icon[aria-hidden="true"]))
+    .menu-text,
+  menupopup:is(#BMB_bookmarksPopup)[placespopup="true"]
+    menu:not(.menu-iconic):not(:has(.menu-icon[aria-hidden="true"]))
+    .menu-text,
+  #PersonalToolbar
+    menupopup[placespopup="true"]
+    menuitem:not(.menuitem-iconic, [disabled="true"]):not(:has(.menu-icon[aria-hidden="true"]))
+    .menu-text,
+  #PersonalToolbar
+    menupopup[placespopup="true"]
+    menu:not(.menu-iconic):not(:has(.menu-icon[aria-hidden="true"]))
+    .menu-text {
     margin-inline-start: var(--context-menu-text-padding) !important;
   }
 }
@@ -28459,18 +28537,32 @@
     padding-inline: var(--arrowpanel-menuitem-padding-inline) !important;
   }
   /* Bookmark Popup - None icon menu */
-  menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
-  menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menu:not(.menu-iconic) {
+  menupopup:is(#BMB_bookmarksPopup)[placespopup="true"]
+    menuitem:not(.menuitem-iconic, [disabled="true"]):not(:has(.menu-icon[aria-hidden="true"])),
+  menupopup:is(#BMB_bookmarksPopup)[placespopup="true"]
+    menu:not(.menu-iconic):not(:has(.menu-icon[aria-hidden="true"])) {
     padding-inline-start: calc(var(--arrowpanel-menuitem-padding-inline) + 3px) !important;
   }
-  #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
-  #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) {
+  #PersonalToolbar
+    menupopup[placespopup="true"]
+    menuitem:not(.menuitem-iconic, [disabled="true"]):not(:has(.menu-icon[aria-hidden="true"])),
+  #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic):not(:has(.menu-icon[aria-hidden="true"])) {
     padding-inline-start: calc(var(--arrowpanel-menuitem-padding-inline) + 1px) !important;
   }
-  menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]) > .menu-text,
-  menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menu:not(.menu-iconic) > .menu-text,
-  #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]) > .menu-text,
-  #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) > .menu-text {
+  menupopup:is(#BMB_bookmarksPopup)[placespopup="true"]
+    menuitem:not(.menuitem-iconic, [disabled="true"]):not(:has(.menu-icon[aria-hidden="true"]))
+    > .menu-text,
+  menupopup:is(#BMB_bookmarksPopup)[placespopup="true"]
+    menu:not(.menu-iconic):not(:has(.menu-icon[aria-hidden="true"]))
+    > .menu-text,
+  #PersonalToolbar
+    menupopup[placespopup="true"]
+    menuitem:not(.menuitem-iconic, [disabled="true"]):not(:has(.menu-icon[aria-hidden="true"]))
+    > .menu-text,
+  #PersonalToolbar
+    menupopup[placespopup="true"]
+    menu:not(.menu-iconic):not(:has(.menu-icon[aria-hidden="true"]))
+    > .menu-text {
     padding-inline-start: var(--context-menu-mac-padding) !important;
   }
 }
diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css
index db45d93..bba6411 100644
--- a/css/leptonChromeESR.css
+++ b/css/leptonChromeESR.css
@@ -4286,6 +4286,11 @@
     --tab-border-radius: 0 !important; /* Original: 4px */
   }
 }
+@supports not -moz-bool-pref("userChrome.rounding.square_tab") {
+  :root {
+    --tab-border-radius: 4px !important; /* Original: 4px */
+  }
+}
 @supports -moz-bool-pref("userChrome.rounding.square_button") {
   :root {
     --urlbar-icon-border-radius: 0 !important; /* Original: calc(var(--toolbarbutton-border-radius) - 1px); */
@@ -12958,6 +12963,9 @@
       .menupopup-arrowscrollbox {
         padding-inline: 0 !important; /* Original: padding: var(--panel-padding); --panel-padding-block: 4px; */
       }
+      menupopup[needsgutter] > :is(menu, menuitem) > .menu-icon {
+        display: none !important;
+      }
     }
     @media (-moz-os-version: windows-win7),
       (-moz-os-version: windows-win8),
@@ -13039,6 +13047,9 @@
           .menupopup-arrowscrollbox {
             padding-inline: 0 !important; /* Original: padding: var(--panel-padding); --panel-padding-block: 4px; */
           }
+          menupopup[needsgutter] > :is(menu, menuitem) > .menu-icon {
+            display: none !important;
+          }
         }
       }
     }
@@ -13348,10 +13359,14 @@
       (-moz-os-version: windows-win10),
       (-moz-platform: windows) {
       /* Bookmark Popup - None icon menu */
-      menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
-      menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menu:not(.menu-iconic),
-      #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
-      #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) {
+      menupopup:is(#BMB_bookmarksPopup)[placespopup="true"]
+        menuitem:not(.menuitem-iconic, [disabled="true"]):not(:has(.menu-icon[aria-hidden="true"])),
+      menupopup:is(#BMB_bookmarksPopup)[placespopup="true"]
+        menu:not(.menu-iconic):not(:has(.menu-icon[aria-hidden="true"])),
+      #PersonalToolbar
+        menupopup[placespopup="true"]
+        menuitem:not(.menuitem-iconic, [disabled="true"]):not(:has(.menu-icon[aria-hidden="true"])),
+      #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic):not(:has(.menu-icon[aria-hidden="true"])) {
         margin-inline: var(--arrowpanel-menuitem-margin-inline) !important;
         padding-inline-start: var(--bookmark-menu-icon-text-padding) !important;
         background-position: var(--uc-menu-background-position) var(--bookmark-menu-icon-background-padding) center !important;
@@ -13379,26 +13394,44 @@
         margin-inline-start: -1px !important;
       }
       /* Bookmark Popup - None icon menu */
-      menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
-      menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menu:not(.menu-iconic),
-      #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
-      #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) {
+      menupopup:is(#BMB_bookmarksPopup)[placespopup="true"]
+        menuitem:not(.menuitem-iconic, [disabled="true"]):not(:has(.menu-icon[aria-hidden="true"])),
+      menupopup:is(#BMB_bookmarksPopup)[placespopup="true"]
+        menu:not(.menu-iconic):not(:has(.menu-icon[aria-hidden="true"])),
+      #PersonalToolbar
+        menupopup[placespopup="true"]
+        menuitem:not(.menuitem-iconic, [disabled="true"]):not(:has(.menu-icon[aria-hidden="true"])),
+      #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic):not(:has(.menu-icon[aria-hidden="true"])) {
         padding-inline-start: calc(var(--context-menu-background-padding) + 2px) !important;
       }
       @supports -moz-bool-pref("userChrome.theme.non_native_menu") {
-        menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
-        menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menu:not(.menu-iconic),
-        #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
-        #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) {
+        menupopup:is(#BMB_bookmarksPopup)[placespopup="true"]
+          menuitem:not(.menuitem-iconic, [disabled="true"]):not(:has(.menu-icon[aria-hidden="true"])),
+        menupopup:is(#BMB_bookmarksPopup)[placespopup="true"]
+          menu:not(.menu-iconic):not(:has(.menu-icon[aria-hidden="true"])),
+        #PersonalToolbar
+          menupopup[placespopup="true"]
+          menuitem:not(.menuitem-iconic, [disabled="true"]):not(:has(.menu-icon[aria-hidden="true"])),
+        #PersonalToolbar
+          menupopup[placespopup="true"]
+          menu:not(.menu-iconic):not(:has(.menu-icon[aria-hidden="true"])) {
           margin-inline: var(--arrowpanel-menuitem-margin-inline) !important;
         }
       }
       menupopup:is(#BMB_bookmarksPopup)[placespopup="true"]
-        menuitem:not(.menuitem-iconic, [disabled="true"])
+        menuitem:not(.menuitem-iconic, [disabled="true"]):not(:has(.menu-icon[aria-hidden="true"]))
         .menu-text,
-      menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menu:not(.menu-iconic) .menu-text,
-      #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]) .menu-text,
-      #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) .menu-text {
+      menupopup:is(#BMB_bookmarksPopup)[placespopup="true"]
+        menu:not(.menu-iconic):not(:has(.menu-icon[aria-hidden="true"]))
+        .menu-text,
+      #PersonalToolbar
+        menupopup[placespopup="true"]
+        menuitem:not(.menuitem-iconic, [disabled="true"]):not(:has(.menu-icon[aria-hidden="true"]))
+        .menu-text,
+      #PersonalToolbar
+        menupopup[placespopup="true"]
+        menu:not(.menu-iconic):not(:has(.menu-icon[aria-hidden="true"]))
+        .menu-text {
         margin-inline-start: var(--context-menu-text-padding) !important;
       }
     }
@@ -13409,20 +13442,32 @@
         padding-inline: var(--arrowpanel-menuitem-padding-inline) !important;
       }
       /* Bookmark Popup - None icon menu */
-      menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
-      menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menu:not(.menu-iconic) {
+      menupopup:is(#BMB_bookmarksPopup)[placespopup="true"]
+        menuitem:not(.menuitem-iconic, [disabled="true"]):not(:has(.menu-icon[aria-hidden="true"])),
+      menupopup:is(#BMB_bookmarksPopup)[placespopup="true"]
+        menu:not(.menu-iconic):not(:has(.menu-icon[aria-hidden="true"])) {
         padding-inline-start: calc(var(--arrowpanel-menuitem-padding-inline) + 3px) !important;
       }
-      #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
-      #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) {
+      #PersonalToolbar
+        menupopup[placespopup="true"]
+        menuitem:not(.menuitem-iconic, [disabled="true"]):not(:has(.menu-icon[aria-hidden="true"])),
+      #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic):not(:has(.menu-icon[aria-hidden="true"])) {
         padding-inline-start: calc(var(--arrowpanel-menuitem-padding-inline) + 1px) !important;
       }
       menupopup:is(#BMB_bookmarksPopup)[placespopup="true"]
-        menuitem:not(.menuitem-iconic, [disabled="true"])
+        menuitem:not(.menuitem-iconic, [disabled="true"]):not(:has(.menu-icon[aria-hidden="true"]))
         > .menu-text,
-      menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menu:not(.menu-iconic) > .menu-text,
-      #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]) > .menu-text,
-      #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) > .menu-text {
+      menupopup:is(#BMB_bookmarksPopup)[placespopup="true"]
+        menu:not(.menu-iconic):not(:has(.menu-icon[aria-hidden="true"]))
+        > .menu-text,
+      #PersonalToolbar
+        menupopup[placespopup="true"]
+        menuitem:not(.menuitem-iconic, [disabled="true"]):not(:has(.menu-icon[aria-hidden="true"]))
+        > .menu-text,
+      #PersonalToolbar
+        menupopup[placespopup="true"]
+        menu:not(.menu-iconic):not(:has(.menu-icon[aria-hidden="true"]))
+        > .menu-text {
         padding-inline-start: var(--context-menu-mac-padding) !important;
       }
     }
diff --git a/src/icons/layout/_bookmark_menu.scss b/src/icons/layout/_bookmark_menu.scss
index 2c4cfbb..3f2e2c7 100644
--- a/src/icons/layout/_bookmark_menu.scss
+++ b/src/icons/layout/_bookmark_menu.scss
@@ -17,8 +17,8 @@ menupopup menupopup[emptyplacesresult] .menu-text,
 
 //-- Mixin ---------------------------------------------------------------------
 // Items
-$_bookmarkMenuitem: "menuitem:not(.menuitem-iconic, [disabled=\"true\"])";
-$_bookmarkMenu: "menu:not(.menu-iconic)";
+$_bookmarkMenuitem: "menuitem:not(.menuitem-iconic, [disabled=\"true\"]):not(:has(.menu-icon[aria-hidden=\"true\"]))";
+$_bookmarkMenu: "menu:not(.menu-iconic):not(:has(.menu-icon[aria-hidden=\"true\"]))";
 
 // Components
 $_bookmarkPopup: "menupopup:is(#BMB_bookmarksPopup)[placespopup=\"true\"]";
diff --git a/src/icons/layout/_menu.scss b/src/icons/layout/_menu.scss
index 64e5867..1807962 100644
--- a/src/icons/layout/_menu.scss
+++ b/src/icons/layout/_menu.scss
@@ -108,6 +108,11 @@ $_layoutCommonMenus: (
     .menupopup-arrowscrollbox {
       padding-inline: 0 !important; /* Original: padding: var(--panel-padding); --panel-padding-block: 4px; */
     }
+
+    // FF v141 #1128
+    menupopup[needsgutter] > :is(menu, menuitem) > .menu-icon {
+      display: none !important;
+    }
   }
 }
 
diff --git a/src/rounding/_square.scss b/src/rounding/_square.scss
index 5722402..3140184 100644
--- a/src/rounding/_square.scss
+++ b/src/rounding/_square.scss
@@ -3,6 +3,11 @@
     --tab-border-radius: 0 !important; /* Original: 4px */
   }
 }
+@include NotOption("userChrome.rounding.square_tab") {
+  :root {
+    --tab-border-radius: 4px !important; /* Original: 4px */
+  }
+}
 @include Option("userChrome.rounding.square_button") {
   :root {
     --urlbar-icon-border-radius: 0 !important; /* Original: calc(var(--toolbarbutton-border-radius) - 1px); */