From 1bf6025854d5bc26b3307d339280cad7e14a6b15 Mon Sep 17 00:00:00 2001
From: 2641a40fd44383320adde4b027a1d0b03bd550
 <58827198+2641a40fd44383320adde4b027a1d0b03bd550@users.noreply.github.com>
Date: Sun, 12 Feb 2023 09:07:45 +0500
Subject: [PATCH 01/46] Fix: Rounding - Web appearance choice Fixes #617

---
 css/leptonContent.css       | 1 +
 src/contents/_rounding.scss | 1 +
 2 files changed, 2 insertions(+)

diff --git a/css/leptonContent.css b/css/leptonContent.css
index 0535be6..892379b 100644
--- a/css/leptonContent.css
+++ b/css/leptonContent.css
@@ -2763,6 +2763,7 @@
     button,
     .close-icon,
     .action-icon::before,
+    .web-appearance-choice,
     #categories > .category,
     .sidebar-footer-link {
       border-radius: 0 !important;
diff --git a/src/contents/_rounding.scss b/src/contents/_rounding.scss
index e7bdde3..b577d6e 100644
--- a/src/contents/_rounding.scss
+++ b/src/contents/_rounding.scss
@@ -3,6 +3,7 @@
     button,
     .close-icon,
     .action-icon::before,
+    .web-appearance-choice,
     #categories > .category,
     .sidebar-footer-link {
       border-radius: 0 !important;

From 2e9ebfb3a1b62e9d94b71cee10dbe2473d9aa6ae Mon Sep 17 00:00:00 2001
From: 2641a40fd44383320adde4b027a1d0b03bd550
 <58827198+2641a40fd44383320adde4b027a1d0b03bd550@users.noreply.github.com>
Date: Sun, 12 Feb 2023 09:13:53 +0500
Subject: [PATCH 02/46] Fix: Rounding - Logins and addons menu popup Fixes
 #614, fixes #619

---
 css/leptonContent.css       | 10 ++++++++++
 src/contents/_rounding.scss | 12 ++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/css/leptonContent.css b/css/leptonContent.css
index 892379b..d00c8bb 100644
--- a/css/leptonContent.css
+++ b/css/leptonContent.css
@@ -2843,6 +2843,16 @@
       --panel-border-radius: 0 !important;
     }
   }
+  @-moz-document url-prefix("about:addons") {
+    panel-list {
+      border-radius: 0 !important;
+    }
+  }
+  @-moz-document url-prefix("about:logins") {
+    .menu {
+      border-radius: 0 !important;
+    }
+  }
   @-moz-document url("about:home"), url("about:newtab") {
     .context-menu {
       border-radius: 0 !important;
diff --git a/src/contents/_rounding.scss b/src/contents/_rounding.scss
index b577d6e..d1d6b5d 100644
--- a/src/contents/_rounding.scss
+++ b/src/contents/_rounding.scss
@@ -92,6 +92,18 @@
     }
   }
 
+  @include moz-document(url-prefix "about:addons") {
+    panel-list {
+      border-radius: 0 !important;
+    }
+  }
+
+  @include moz-document(url-prefix "about:logins") {
+    .menu {
+      border-radius: 0 !important;
+    }
+  }
+
   @include moz-document(url "about:home", url "about:newtab") {
     .context-menu {
       border-radius: 0 !important;

From 4c24691494a8182be034c544015e3e498e5c017c Mon Sep 17 00:00:00 2001
From: 2641a40fd44383320adde4b027a1d0b03bd550
 <58827198+2641a40fd44383320adde4b027a1d0b03bd550@users.noreply.github.com>
Date: Sun, 12 Feb 2023 09:22:57 +0500
Subject: [PATCH 03/46] Fix: Rounding - Content dialogs Fixes #621

---
 css/leptonContent.css       |  6 +++---
 src/contents/_rounding.scss | 18 +++++++++++++++---
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/css/leptonContent.css b/css/leptonContent.css
index d00c8bb..d9014f7 100644
--- a/css/leptonContent.css
+++ b/css/leptonContent.css
@@ -2758,7 +2758,7 @@
 }
 /** Rounding ******************************************************************/
 @supports -moz-bool-pref("userChrome.rounding.square_button") {
-  @-moz-document url-prefix("about:"), url-prefix("chrome://browser/content/preferences/dialogs")
+  @-moz-document url-prefix("about:"), url-prefix("chrome://browser/content/"), url-prefix("chrome://pippki/content/")
   {
     button,
     .close-icon,
@@ -2805,7 +2805,7 @@
   }
 }
 @supports -moz-bool-pref("userChrome.rounding.square_checklabel") {
-  @-moz-document url-prefix("about:"), url-prefix("chrome://browser/content/preferences/dialogs")
+  @-moz-document url-prefix("about:"), url-prefix("chrome://browser/content/"), url-prefix("chrome://pippki/content/")
   {
     input[type="checkbox"]:not(.toggle-button),
     .checkbox-check {
@@ -2814,7 +2814,7 @@
   }
 }
 @supports -moz-bool-pref("userChrome.rounding.square_field") {
-  @-moz-document url-prefix("about:"), url-prefix("chrome://browser/content/preferences/dialogs")
+  @-moz-document url-prefix("about:"), url-prefix("chrome://browser/content/"), url-prefix("chrome://pippki/content/")
   {
     input:is([type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]),
     textarea,
diff --git a/src/contents/_rounding.scss b/src/contents/_rounding.scss
index d1d6b5d..971b82e 100644
--- a/src/contents/_rounding.scss
+++ b/src/contents/_rounding.scss
@@ -1,5 +1,9 @@
 @include Option("userChrome.rounding.square_button") {
-  @include moz-document(url-prefix "about:", url-prefix "chrome://browser/content/preferences/dialogs") {
+  @include moz-document(
+    url-prefix "about:",
+    url-prefix "chrome://browser/content/",
+    url-prefix "chrome://pippki/content/"
+  ) {
     button,
     .close-icon,
     .action-icon::before,
@@ -50,7 +54,11 @@
 }
 
 @include Option("userChrome.rounding.square_checklabel") {
-  @include moz-document(url-prefix "about:", url-prefix "chrome://browser/content/preferences/dialogs") {
+  @include moz-document(
+    url-prefix "about:",
+    url-prefix "chrome://browser/content/",
+    url-prefix "chrome://pippki/content/"
+  ) {
     input[type="checkbox"]:not(.toggle-button),
     .checkbox-check {
       border-radius: 0 !important;
@@ -59,7 +67,11 @@
 }
 
 @include Option("userChrome.rounding.square_field") {
-  @include moz-document(url-prefix "about:", url-prefix "chrome://browser/content/preferences/dialogs") {
+  @include moz-document(
+    url-prefix "about:",
+    url-prefix "chrome://browser/content/",
+    url-prefix "chrome://pippki/content/"
+  ) {
     input:is([type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]),
     textarea,
     select,

From 998095f01cb54790f14c7346cfc4bcb45daa08c2 Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Thu, 16 Feb 2023 02:48:02 +0900
Subject: [PATCH 04/46] Fix: Padding - Protection popup menu #627

---
 css/leptonChrome.css          | 7 +++++--
 src/padding/_popup_panel.scss | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index d9efbf7..0ebc404 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -3879,12 +3879,15 @@
   }
   /* not cut off for Protection popup Footer on windows */
   :root[uidensity="compact"] #protections-popup-multiView #protections-popup-footer {
-    padding: 0 !important;
+    padding-block-start: 0 !important;
+    padding-block-end: 4px !important;
+  }
+  :root[uidensity="compact"] #protections-popup-content {
+    margin-block: 0 !important;
   }
   /* Button and disabled category in Protection popup */
   :root[uidensity="compact"] #protections-popup-multiView .protections-popup-footer-button,
   :root[uidensity="compact"] #protections-popup-multiView .protections-popup-category {
-    height: 20px !important;
     min-height: 20px !important;
   }
   /* Footer Button in Tracking Content Panel */
diff --git a/src/padding/_popup_panel.scss b/src/padding/_popup_panel.scss
index 8725396..9bf47ee 100644
--- a/src/padding/_popup_panel.scss
+++ b/src/padding/_popup_panel.scss
@@ -25,12 +25,15 @@
 }
 /* not cut off for Protection popup Footer on windows */
 :root[uidensity="compact"] #protections-popup-multiView #protections-popup-footer {
-  padding: 0 !important;
+  padding-block-start: 0 !important;
+  padding-block-end: 4px !important;
+}
+:root[uidensity="compact"] #protections-popup-content {
+  margin-block: 0 !important;
 }
 /* Button and disabled category in Protection popup */
 :root[uidensity="compact"] #protections-popup-multiView .protections-popup-footer-button,
 :root[uidensity="compact"] #protections-popup-multiView .protections-popup-category {
-  height: 20px !important;
   min-height: 20px !important;
 }
 /* Footer Button in Tracking Content Panel */

From ae8858004055e98546e1c862d1cc8be095fcdc36 Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Thu, 16 Feb 2023 02:49:46 +0900
Subject: [PATCH 05/46] Clean: Padding - Popup menu #627

---
 css/leptonChrome.css          | 24 ++++-------
 src/padding/_popup_panel.scss | 77 +++++++++++++++++++----------------
 2 files changed, 49 insertions(+), 52 deletions(-)

diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index 0ebc404..6cac2f1 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -3869,40 +3869,32 @@
     height: unset !important;
   }
   /** Popup panel - Compact mode  */
-  /* Footer Button Height */
-  :root[uidensity="compact"] .panel-footer.panel-footer-menulike > button {
-    padding: 3px 8px !important;
+  :root[uidensity="compact"] #protections-popup-content {
+    margin-block: 0 !important;
   }
-  /* Footer Button Height */
-  :root[uidensity="compact"] #protections-popup-trackersView-settings-button {
-    margin: 4px 8px 0 !important;
-  }
-  /* not cut off for Protection popup Footer on windows */
   :root[uidensity="compact"] #protections-popup-multiView #protections-popup-footer {
     padding-block-start: 0 !important;
     padding-block-end: 4px !important;
   }
-  :root[uidensity="compact"] #protections-popup-content {
-    margin-block: 0 !important;
-  }
-  /* Button and disabled category in Protection popup */
   :root[uidensity="compact"] #protections-popup-multiView .protections-popup-footer-button,
   :root[uidensity="compact"] #protections-popup-multiView .protections-popup-category {
     min-height: 20px !important;
   }
-  /* Footer Button in Tracking Content Panel */
   :root[uidensity="compact"] #protections-popup-multiView .panel-footer.panel-footer-menulike {
     margin: 0 0 3px !important;
   }
-  /* Identity popup header padding */
+  :root[uidensity="compact"] #protections-popup-multiView .panel-footer.panel-footer-menulike > button {
+    padding: 3px 8px !important;
+  }
+  :root[uidensity="compact"] #protections-popup-trackersView-settings-button {
+    margin: 4px 8px 0 !important;
+  }
   :root[uidensity="compact"] #identity-popup-multiView #identity-popup-mainView-panel-header {
     padding: 2px 5px !important;
   }
-  /* Text When There is no trackers */
   :root[uidensity="compact"] #protections-popup-no-trackers-found-description {
     margin: 2em 4em !important;
   }
-  /* Download Item margin */
   :root[uidensity="compact"] #downloadsListBox {
     margin: 0 !important;
   }
diff --git a/src/padding/_popup_panel.scss b/src/padding/_popup_panel.scss
index 9bf47ee..4a27d8f 100644
--- a/src/padding/_popup_panel.scss
+++ b/src/padding/_popup_panel.scss
@@ -15,40 +15,45 @@
 }
 
 /** Popup panel - Compact mode  */
-/* Footer Button Height */
-:root[uidensity="compact"] .panel-footer.panel-footer-menulike > button {
-  padding: 3px 8px !important;
-}
-/* Footer Button Height */
-:root[uidensity="compact"] #protections-popup-trackersView-settings-button {
-  margin: 4px 8px 0 !important;
-}
-/* not cut off for Protection popup Footer on windows */
-:root[uidensity="compact"] #protections-popup-multiView #protections-popup-footer {
-  padding-block-start: 0 !important;
-  padding-block-end: 4px !important;
-}
-:root[uidensity="compact"] #protections-popup-content {
-  margin-block: 0 !important;
-}
-/* Button and disabled category in Protection popup */
-:root[uidensity="compact"] #protections-popup-multiView .protections-popup-footer-button,
-:root[uidensity="compact"] #protections-popup-multiView .protections-popup-category {
-  min-height: 20px !important;
-}
-/* Footer Button in Tracking Content Panel */
-:root[uidensity="compact"] #protections-popup-multiView .panel-footer.panel-footer-menulike {
-  margin: 0 0 3px !important;
-}
-/* Identity popup header padding */
-:root[uidensity="compact"] #identity-popup-multiView #identity-popup-mainView-panel-header {
-  padding: 2px 5px !important;
-}
-/* Text When There is no trackers */
-:root[uidensity="compact"] #protections-popup-no-trackers-found-description {
-  margin: 2em 4em !important;
-}
-/* Download Item margin */
-:root[uidensity="compact"] #downloadsListBox {
-  margin: 0 !important;
+:root[uidensity="compact"] {
+  #protections-popup-content {
+    // not cut off for Protection popup Footer on windows
+    margin-block: 0 !important;
+  }
+  #protections-popup-multiView {
+    #protections-popup-footer {
+      padding-block-start: 0 !important;
+      padding-block-end: 4px !important;
+    }
+
+    .protections-popup-footer-button,
+    .protections-popup-category {
+      // Button and disabled category in Protection popup
+      min-height: 20px !important;
+    }
+    .panel-footer.panel-footer-menulike {
+      // Footer Button in Tracking Content Panel
+      margin: 0 0 3px !important;
+      > button {
+        padding: 3px 8px !important;
+      }
+    }
+  }
+
+  #protections-popup-trackersView-settings-button {
+    // Footer Button Height
+    margin: 4px 8px 0 !important;
+  }
+  #identity-popup-multiView #identity-popup-mainView-panel-header {
+    // Identity popup header padding
+    padding: 2px 5px !important;
+  }
+  // Text When There is no trackers
+  #protections-popup-no-trackers-found-description {
+    margin: 2em 4em !important;
+  }
+  // Download Item margin
+  #downloadsListBox {
+    margin: 0 !important;
+  }
 }

From 0c4691318ac3839a056a356b992636540f5f8774 Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Thu, 16 Feb 2023 03:13:49 +0900
Subject: [PATCH 06/46] Fix: Rounding - Sidebar search field #626

---
 css/leptonChrome.css        | 1 -
 src/theme/_fully_color.scss | 1 -
 2 files changed, 2 deletions(-)

diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index 6cac2f1..bee3e1a 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -1474,7 +1474,6 @@
     appearance: none !important;
     padding: 5px 8px !important;
     border: 1px solid var(--input-bgcolor) !important;
-    border-radius: 4px;
     background-color: var(--lwt-sidebar-background-color, Field) !important;
     color: var(--lwt-sidebar-text-color, FieldText) !important;
   }
diff --git a/src/theme/_fully_color.scss b/src/theme/_fully_color.scss
index ccbae21..9e6f1cb 100644
--- a/src/theme/_fully_color.scss
+++ b/src/theme/_fully_color.scss
@@ -186,7 +186,6 @@ xul|search-textbox.tabsFilter {
   appearance: none !important;
   padding: 5px 8px !important;
   border: 1px solid var(--input-bgcolor) !important;
-  border-radius: 4px;
 
   background-color: var(--lwt-sidebar-background-color, Field) !important;
   color: var(--lwt-sidebar-text-color, FieldText) !important;

From 8f93dcdb356bdac260a5600bb27c3ea4a8f9a3ad Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Thu, 16 Feb 2023 11:45:33 +0900
Subject: [PATCH 07/46] Fix: Tab - Replace `[first-visible-tab]`,
 `[last-visible-tab]` #628

---
 css/leptonChrome.css                          | 24 +++++++++----------
 src/padding/_tabbar_width.scss                |  2 +-
 .../_bottom_rounded_corner_others.scss        |  4 ++--
 .../unselected_tab/_dynamic_separator.scss    | 14 +++++------
 src/tab/unselected_tab/_static_separator.scss |  2 +-
 5 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index bee3e1a..32b962d 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -3363,7 +3363,7 @@
       }
     }
     @supports not -moz-bool-pref("userChrome.tabbar.multi_row") {
-      #TabsToolbar:not([multibar]) .tabbrowser-tab:not([last-visible-tab]) {
+      #TabsToolbar:not([multibar]) .tabbrowser-tab:not(:last-child) {
         margin-inline-end: -1px !important;
       }
     }
@@ -6483,11 +6483,11 @@
       }
     }
     #tabbrowser-tabs[positionpinnedtabs],
-    #tabbrowser-tabs:not([overflow]) .tabbrowser-tab[first-visible-tab],
+    #tabbrowser-tabs:not([overflow]) .tabbrowser-tab:first-child,
     #tabbrowser-tabs[overflow] .tabbrowser-tab[first-visible-unpinned-tab] {
       margin-left: var(--uc-tab-corner-half-size) !important;
     }
-    .tabbrowser-tab[last-visible-tab] {
+    .tabbrowser-tab:last-child {
       margin-right: var(--uc-tab-corner-half-size) !important;
     }
   }
@@ -6618,7 +6618,7 @@
   @supports not -moz-bool-pref("userChrome.tab.newtab_button_like_tab") {
     .tab-stack::before,
     #tabbrowser-arrowscrollbox:not([overflowing])
-      .tabbrowser-tab:not([visuallyselected], [multiselected], :hover)[last-visible-tab]
+      .tabbrowser-tab:not([visuallyselected], [multiselected], :hover):last-child
       .tab-stack::after {
       /* Box Model */
       content: "";
@@ -6636,7 +6636,7 @@
     @supports -moz-bool-pref("userChrome.compatibility.dynamic_separator") {
       .tab-stack::before,
       #tabbrowser-arrowscrollbox:not([overflowing])
-        .tabbrowser-tab:not([visuallyselected], [multiselected], :hover)[last-visible-tab]
+        .tabbrowser-tab:not([visuallyselected], [multiselected], :hover):last-child
         .tab-stack::after {
         background-color: var(--tabs-border-color);
       }
@@ -6644,7 +6644,7 @@
     .tab-stack::before {
       transform: translateX(var(--tab-separator-position-x)) translateY(var(--tab-separator-position-y)) !important;
     }
-    .tabbrowser-tab[last-visible-tab] .tab-stack::after {
+    .tabbrowser-tab:last-child .tab-stack::after {
       right: 0;
       transform: translateX(var(--end-tab-separator-position-x)) translateY(var(--tab-separator-position-y)) !important;
     }
@@ -6677,7 +6677,7 @@
   }
   @supports not -moz-bool-pref("userChrome.tab.newtab_button_like_tab") {
     #tabbrowser-arrowscrollbox:not([overflowing])
-      .tabbrowser-tab:not([visuallyselected], [multiselected], :hover)[last-visible-tab]
+      .tabbrowser-tab:not([visuallyselected], [multiselected], :hover):last-child
       .tab-stack::after {
       opacity: var(--tab-separator-opacity);
     }
@@ -6701,10 +6701,10 @@
       ~ .tabbrowser-tab[afterhovered]
       .tab-stack::before,
     #navigator-toolbox:not([movingtab])
-      .tabbrowser-tab[last-visible-tab]:is([visuallyselected], [multiselected], :hover)
+      .tabbrowser-tab:last-child:is([visuallyselected], [multiselected], :hover)
       ~ #tabs-newtab-button::before,
     #navigator-toolbox:not([movingtab])
-      .tabbrowser-tab[last-visible-tab]:is([visuallyselected], [multiselected], :hover)
+      .tabbrowser-tab:last-child:is([visuallyselected], [multiselected], :hover)
       ~ #tabbrowser-arrowscrollbox-periphery
       #tabs-newtab-button::before {
       opacity: 0 !important;
@@ -6735,14 +6735,14 @@
     }
     @supports not -moz-bool-pref("userChrome.tab.newtab_button_like_tab") {
       #tabbrowser-arrowscrollbox:not([overflowing])
-        .tabbrowser-tab:not([visuallyselected], [multiselected], :hover)[last-visible-tab]
+        .tabbrowser-tab:not([visuallyselected], [multiselected], :hover):last-child
         .tab-stack::after {
         transition: opacity 0.2s var(--animation-easing-function); /* cubic-bezier(.07, .95, 0, 1) */
       }
     }
   }
   /* Latest Tab & New tab margin */
-  #tabbrowser-arrowscrollbox:not([overflowing]) .tabbrowser-tab[last-visible-tab] {
+  #tabbrowser-arrowscrollbox:not([overflowing]) .tabbrowser-tab:last-child {
     margin-inline-end: 1px !important;
   }
 }
@@ -6751,7 +6751,7 @@
   #TabsToolbar {
     --toolbarseparator-color: color-mix(in srgb, currentColor 30%, transparent);
   }
-  .tabbrowser-tab[first-visible-tab="true"] .tab-stack::before,
+  .tabbrowser-tab:first-child .tab-stack::before,
   .tab-stack::after {
     content: "";
   }
diff --git a/src/padding/_tabbar_width.scss b/src/padding/_tabbar_width.scss
index 5c3047c..08d049a 100644
--- a/src/padding/_tabbar_width.scss
+++ b/src/padding/_tabbar_width.scss
@@ -96,7 +96,7 @@
     }
   }
   @include NotOption("userChrome.tabbar.multi_row") {
-    #TabsToolbar:not([multibar]) .tabbrowser-tab:not([last-visible-tab]) {
+    #TabsToolbar:not([multibar]) .tabbrowser-tab:not(:last-child) {
       margin-inline-end: -1px !important;
     }
   }
diff --git a/src/tab/selected_tab/_bottom_rounded_corner_others.scss b/src/tab/selected_tab/_bottom_rounded_corner_others.scss
index 8e46083..9e1aa5e 100644
--- a/src/tab/selected_tab/_bottom_rounded_corner_others.scss
+++ b/src/tab/selected_tab/_bottom_rounded_corner_others.scss
@@ -217,11 +217,11 @@
 
 #tabbrowser-tabs {
   &[positionpinnedtabs],
-  &:not([overflow]) .tabbrowser-tab[first-visible-tab],
+  &:not([overflow]) .tabbrowser-tab:first-child ,
   &[overflow] .tabbrowser-tab[first-visible-unpinned-tab] {
     margin-left: var(--uc-tab-corner-half-size) !important;
   }
 }
-.tabbrowser-tab[last-visible-tab] {
+.tabbrowser-tab:last-child {
   margin-right: var(--uc-tab-corner-half-size) !important;
 }
diff --git a/src/tab/unselected_tab/_dynamic_separator.scss b/src/tab/unselected_tab/_dynamic_separator.scss
index b55384a..73af227 100644
--- a/src/tab/unselected_tab/_dynamic_separator.scss
+++ b/src/tab/unselected_tab/_dynamic_separator.scss
@@ -52,7 +52,7 @@
 @include NotOption("userChrome.tab.newtab_button_like_tab") {
   .tab-stack::before,
   #tabbrowser-arrowscrollbox:not([overflowing])
-    .tabbrowser-tab:not([visuallyselected], [multiselected], :hover)[last-visible-tab]
+    .tabbrowser-tab:not([visuallyselected], [multiselected], :hover):last-child
     .tab-stack::after {
     @include _dynamicSeparatorShape;
   }
@@ -60,7 +60,7 @@
   .tab-stack::before {
     transform: translateX(var(--tab-separator-position-x)) translateY(var(--tab-separator-position-y)) !important;
   }
-  .tabbrowser-tab[last-visible-tab] .tab-stack::after {
+  .tabbrowser-tab:last-child .tab-stack::after {
     right: 0;
     transform: translateX(var(--end-tab-separator-position-x)) translateY(var(--tab-separator-position-y)) !important;
   }
@@ -86,7 +86,7 @@
 }
 @include NotOption("userChrome.tab.newtab_button_like_tab") {
   #tabbrowser-arrowscrollbox:not([overflowing])
-    .tabbrowser-tab:not([visuallyselected], [multiselected], :hover)[last-visible-tab]
+    .tabbrowser-tab:not([visuallyselected], [multiselected], :hover):last-child
     .tab-stack::after {
     opacity: var(--tab-separator-opacity);
   }
@@ -111,10 +111,10 @@
     ~ .tabbrowser-tab[afterhovered]
     .tab-stack::before,
   #navigator-toolbox:not([movingtab])
-    .tabbrowser-tab[last-visible-tab]:is([visuallyselected], [multiselected], :hover)
+    .tabbrowser-tab:last-child:is([visuallyselected], [multiselected], :hover)
     ~ #tabs-newtab-button::before, /* Legacy - v103 */
   #navigator-toolbox:not([movingtab])
-    .tabbrowser-tab[last-visible-tab]:is([visuallyselected], [multiselected], :hover)
+    .tabbrowser-tab:last-child:is([visuallyselected], [multiselected], :hover)
     ~ #tabbrowser-arrowscrollbox-periphery #tabs-newtab-button::before {
     opacity: 0 !important;
   }
@@ -146,7 +146,7 @@
   }
   @include NotOption("userChrome.tab.newtab_button_like_tab") {
     #tabbrowser-arrowscrollbox:not([overflowing])
-      .tabbrowser-tab:not([visuallyselected], [multiselected], :hover)[last-visible-tab]
+      .tabbrowser-tab:not([visuallyselected], [multiselected], :hover):last-child
       .tab-stack::after {
       transition: opacity 0.2s var(--animation-easing-function); /* cubic-bezier(.07, .95, 0, 1) */
     }
@@ -154,6 +154,6 @@
 }
 
 /* Latest Tab & New tab margin */
-#tabbrowser-arrowscrollbox:not([overflowing]) .tabbrowser-tab[last-visible-tab] {
+#tabbrowser-arrowscrollbox:not([overflowing]) .tabbrowser-tab:last-child {
   margin-inline-end: 1px !important;
 }
diff --git a/src/tab/unselected_tab/_static_separator.scss b/src/tab/unselected_tab/_static_separator.scss
index e0bafd8..dedc6b0 100644
--- a/src/tab/unselected_tab/_static_separator.scss
+++ b/src/tab/unselected_tab/_static_separator.scss
@@ -2,7 +2,7 @@
   --toolbarseparator-color: color-mix(in srgb, currentColor 30%, transparent);
 }
 
-.tabbrowser-tab[first-visible-tab="true"] .tab-stack::before,
+.tabbrowser-tab:first-child .tab-stack::before,
 .tab-stack::after {
   content: "";
 }

From 0dc6a1c26e6ff12d84f00fda5741f1f6b652b61e Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Thu, 16 Feb 2023 11:53:17 +0900
Subject: [PATCH 08/46] Fix: Tab - Replace `[afterhovered]` #628

---
 css/leptonChrome.css                           | 4 ----
 src/tab/unselected_tab/_dynamic_separator.scss | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index 32b962d..78b38ac 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -6696,10 +6696,6 @@
       .tabbrowser-tab:is([visuallyselected], [multiselected], :hover)
       + .tabbrowser-tab
       .tab-stack::before,
-    #navigator-toolbox:not([movingtab])
-      .tabbrowser-tab:is([visuallyselected], [multiselected], :hover)
-      ~ .tabbrowser-tab[afterhovered]
-      .tab-stack::before,
     #navigator-toolbox:not([movingtab])
       .tabbrowser-tab:last-child:is([visuallyselected], [multiselected], :hover)
       ~ #tabs-newtab-button::before,
diff --git a/src/tab/unselected_tab/_dynamic_separator.scss b/src/tab/unselected_tab/_dynamic_separator.scss
index 73af227..109f889 100644
--- a/src/tab/unselected_tab/_dynamic_separator.scss
+++ b/src/tab/unselected_tab/_dynamic_separator.scss
@@ -106,10 +106,6 @@
     .tabbrowser-tab:is([visuallyselected], [multiselected], :hover)
     + .tabbrowser-tab
     .tab-stack::before,
-  #navigator-toolbox:not([movingtab])
-    .tabbrowser-tab:is([visuallyselected], [multiselected], :hover)
-    ~ .tabbrowser-tab[afterhovered]
-    .tab-stack::before,
   #navigator-toolbox:not([movingtab])
     .tabbrowser-tab:last-child:is([visuallyselected], [multiselected], :hover)
     ~ #tabs-newtab-button::before, /* Legacy - v103 */

From d2d27cd144fd39cb7c8779e545fdaba4d1383102 Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Fri, 17 Feb 2023 04:21:33 +0900
Subject: [PATCH 09/46] Fix: Tab - `*-child` -> `*-of-type` #628

---
 css/leptonChrome.css                          | 30 +++++++++----------
 src/padding/_tabbar_width.scss                |  2 +-
 .../_bottom_rounded_corner_others.scss        |  4 +--
 .../unselected_tab/_dynamic_separator.scss    | 18 +++++------
 src/tab/unselected_tab/_static_separator.scss |  2 +-
 5 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index 78b38ac..9bd12a6 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -3363,7 +3363,7 @@
       }
     }
     @supports not -moz-bool-pref("userChrome.tabbar.multi_row") {
-      #TabsToolbar:not([multibar]) .tabbrowser-tab:not(:last-child) {
+      #TabsToolbar:not([multibar]) .tabbrowser-tab:not(:last-of-type) {
         margin-inline-end: -1px !important;
       }
     }
@@ -6483,11 +6483,11 @@
       }
     }
     #tabbrowser-tabs[positionpinnedtabs],
-    #tabbrowser-tabs:not([overflow]) .tabbrowser-tab:first-child,
+    #tabbrowser-tabs:not([overflow]) .tabbrowser-tab:first-of-type,
     #tabbrowser-tabs[overflow] .tabbrowser-tab[first-visible-unpinned-tab] {
       margin-left: var(--uc-tab-corner-half-size) !important;
     }
-    .tabbrowser-tab:last-child {
+    .tabbrowser-tab:last-of-type {
       margin-right: var(--uc-tab-corner-half-size) !important;
     }
   }
@@ -6618,7 +6618,7 @@
   @supports not -moz-bool-pref("userChrome.tab.newtab_button_like_tab") {
     .tab-stack::before,
     #tabbrowser-arrowscrollbox:not([overflowing])
-      .tabbrowser-tab:not([visuallyselected], [multiselected], :hover):last-child
+      .tabbrowser-tab:not([visuallyselected], [multiselected], :hover):last-of-type
       .tab-stack::after {
       /* Box Model */
       content: "";
@@ -6636,7 +6636,7 @@
     @supports -moz-bool-pref("userChrome.compatibility.dynamic_separator") {
       .tab-stack::before,
       #tabbrowser-arrowscrollbox:not([overflowing])
-        .tabbrowser-tab:not([visuallyselected], [multiselected], :hover):last-child
+        .tabbrowser-tab:not([visuallyselected], [multiselected], :hover):last-of-type
         .tab-stack::after {
         background-color: var(--tabs-border-color);
       }
@@ -6644,25 +6644,25 @@
     .tab-stack::before {
       transform: translateX(var(--tab-separator-position-x)) translateY(var(--tab-separator-position-y)) !important;
     }
-    .tabbrowser-tab:last-child .tab-stack::after {
+    .tabbrowser-tab:last-of-type .tab-stack::after {
       right: 0;
       transform: translateX(var(--end-tab-separator-position-x)) translateY(var(--tab-separator-position-y)) !important;
     }
   }
-  .tabbrowser-tab:not([visuallyselected], [multiselected], :hover, :first-child) .tab-stack::before {
+  .tabbrowser-tab:not([visuallyselected], [multiselected], :hover, :first-of-type) .tab-stack::before {
     opacity: var(--tab-separator-opacity);
   }
   @supports -moz-bool-pref("userChrome.tabbar.one_liner") {
     @supports not -moz-bool-pref("userChrome.tabbar.one_liner.tabbar_first") {
       @supports not -moz-bool-pref("userChrome.tabbar.one_liner.responsive") {
-        .tabbrowser-tab:not([visuallyselected], [multiselected], :hover):first-child .tab-stack::before {
+        .tabbrowser-tab:not([visuallyselected], [multiselected], :hover):first-of-type .tab-stack::before {
           opacity: var(--tab-separator-opacity);
           transform: translateX(var(--start-tab-separator-position-x)) translateY(var(--tab-separator-position-y));
         }
       }
       @supports -moz-bool-pref("userChrome.tabbar.one_liner.responsive") {
         @media screen and (min-width: 1100px) {
-          .tabbrowser-tab:not([visuallyselected], [multiselected], :hover):first-child .tab-stack::before {
+          .tabbrowser-tab:not([visuallyselected], [multiselected], :hover):first-of-type .tab-stack::before {
             opacity: var(--tab-separator-opacity);
             transform: translateX(var(--start-tab-separator-position-x)) translateY(var(--tab-separator-position-y));
           }
@@ -6677,7 +6677,7 @@
   }
   @supports not -moz-bool-pref("userChrome.tab.newtab_button_like_tab") {
     #tabbrowser-arrowscrollbox:not([overflowing])
-      .tabbrowser-tab:not([visuallyselected], [multiselected], :hover):last-child
+      .tabbrowser-tab:not([visuallyselected], [multiselected], :hover):last-of-type
       .tab-stack::after {
       opacity: var(--tab-separator-opacity);
     }
@@ -6697,10 +6697,10 @@
       + .tabbrowser-tab
       .tab-stack::before,
     #navigator-toolbox:not([movingtab])
-      .tabbrowser-tab:last-child:is([visuallyselected], [multiselected], :hover)
+      .tabbrowser-tab:last-of-type:is([visuallyselected], [multiselected], :hover)
       ~ #tabs-newtab-button::before,
     #navigator-toolbox:not([movingtab])
-      .tabbrowser-tab:last-child:is([visuallyselected], [multiselected], :hover)
+      .tabbrowser-tab:last-of-type:is([visuallyselected], [multiselected], :hover)
       ~ #tabbrowser-arrowscrollbox-periphery
       #tabs-newtab-button::before {
       opacity: 0 !important;
@@ -6731,14 +6731,14 @@
     }
     @supports not -moz-bool-pref("userChrome.tab.newtab_button_like_tab") {
       #tabbrowser-arrowscrollbox:not([overflowing])
-        .tabbrowser-tab:not([visuallyselected], [multiselected], :hover):last-child
+        .tabbrowser-tab:not([visuallyselected], [multiselected], :hover):last-of-type
         .tab-stack::after {
         transition: opacity 0.2s var(--animation-easing-function); /* cubic-bezier(.07, .95, 0, 1) */
       }
     }
   }
   /* Latest Tab & New tab margin */
-  #tabbrowser-arrowscrollbox:not([overflowing]) .tabbrowser-tab:last-child {
+  #tabbrowser-arrowscrollbox:not([overflowing]) .tabbrowser-tab:last-of-type {
     margin-inline-end: 1px !important;
   }
 }
@@ -6747,7 +6747,7 @@
   #TabsToolbar {
     --toolbarseparator-color: color-mix(in srgb, currentColor 30%, transparent);
   }
-  .tabbrowser-tab:first-child .tab-stack::before,
+  .tabbrowser-tab:first-of-type .tab-stack::before,
   .tab-stack::after {
     content: "";
   }
diff --git a/src/padding/_tabbar_width.scss b/src/padding/_tabbar_width.scss
index 08d049a..5535a03 100644
--- a/src/padding/_tabbar_width.scss
+++ b/src/padding/_tabbar_width.scss
@@ -96,7 +96,7 @@
     }
   }
   @include NotOption("userChrome.tabbar.multi_row") {
-    #TabsToolbar:not([multibar]) .tabbrowser-tab:not(:last-child) {
+    #TabsToolbar:not([multibar]) .tabbrowser-tab:not(:last-of-type) {
       margin-inline-end: -1px !important;
     }
   }
diff --git a/src/tab/selected_tab/_bottom_rounded_corner_others.scss b/src/tab/selected_tab/_bottom_rounded_corner_others.scss
index 9e1aa5e..4863f51 100644
--- a/src/tab/selected_tab/_bottom_rounded_corner_others.scss
+++ b/src/tab/selected_tab/_bottom_rounded_corner_others.scss
@@ -217,11 +217,11 @@
 
 #tabbrowser-tabs {
   &[positionpinnedtabs],
-  &:not([overflow]) .tabbrowser-tab:first-child ,
+  &:not([overflow]) .tabbrowser-tab:first-of-type,
   &[overflow] .tabbrowser-tab[first-visible-unpinned-tab] {
     margin-left: var(--uc-tab-corner-half-size) !important;
   }
 }
-.tabbrowser-tab:last-child {
+.tabbrowser-tab:last-of-type {
   margin-right: var(--uc-tab-corner-half-size) !important;
 }
diff --git a/src/tab/unselected_tab/_dynamic_separator.scss b/src/tab/unselected_tab/_dynamic_separator.scss
index 109f889..3477d6a 100644
--- a/src/tab/unselected_tab/_dynamic_separator.scss
+++ b/src/tab/unselected_tab/_dynamic_separator.scss
@@ -52,7 +52,7 @@
 @include NotOption("userChrome.tab.newtab_button_like_tab") {
   .tab-stack::before,
   #tabbrowser-arrowscrollbox:not([overflowing])
-    .tabbrowser-tab:not([visuallyselected], [multiselected], :hover):last-child
+    .tabbrowser-tab:not([visuallyselected], [multiselected], :hover):last-of-type
     .tab-stack::after {
     @include _dynamicSeparatorShape;
   }
@@ -60,19 +60,19 @@
   .tab-stack::before {
     transform: translateX(var(--tab-separator-position-x)) translateY(var(--tab-separator-position-y)) !important;
   }
-  .tabbrowser-tab:last-child .tab-stack::after {
+  .tabbrowser-tab:last-of-type .tab-stack::after {
     right: 0;
     transform: translateX(var(--end-tab-separator-position-x)) translateY(var(--tab-separator-position-y)) !important;
   }
 }
 
-.tabbrowser-tab:not([visuallyselected], [multiselected], :hover, :first-child) .tab-stack::before {
+.tabbrowser-tab:not([visuallyselected], [multiselected], :hover, :first-of-type) .tab-stack::before {
   opacity: var(--tab-separator-opacity);
 }
 @include Option("userChrome.tabbar.one_liner") {
   @include NotOption("userChrome.tabbar.one_liner.tabbar_first") {
     @include OneLinerContent {
-      .tabbrowser-tab:not([visuallyselected], [multiselected], :hover):first-child .tab-stack::before {
+      .tabbrowser-tab:not([visuallyselected], [multiselected], :hover):first-of-type .tab-stack::before {
         opacity: var(--tab-separator-opacity);
         transform: translateX(var(--start-tab-separator-position-x)) translateY(var(--tab-separator-position-y));
       }
@@ -86,7 +86,7 @@
 }
 @include NotOption("userChrome.tab.newtab_button_like_tab") {
   #tabbrowser-arrowscrollbox:not([overflowing])
-    .tabbrowser-tab:not([visuallyselected], [multiselected], :hover):last-child
+    .tabbrowser-tab:not([visuallyselected], [multiselected], :hover):last-of-type
     .tab-stack::after {
     opacity: var(--tab-separator-opacity);
   }
@@ -107,10 +107,10 @@
     + .tabbrowser-tab
     .tab-stack::before,
   #navigator-toolbox:not([movingtab])
-    .tabbrowser-tab:last-child:is([visuallyselected], [multiselected], :hover)
+    .tabbrowser-tab:last-of-type:is([visuallyselected], [multiselected], :hover)
     ~ #tabs-newtab-button::before, /* Legacy - v103 */
   #navigator-toolbox:not([movingtab])
-    .tabbrowser-tab:last-child:is([visuallyselected], [multiselected], :hover)
+    .tabbrowser-tab:last-of-type:is([visuallyselected], [multiselected], :hover)
     ~ #tabbrowser-arrowscrollbox-periphery #tabs-newtab-button::before {
     opacity: 0 !important;
   }
@@ -142,7 +142,7 @@
   }
   @include NotOption("userChrome.tab.newtab_button_like_tab") {
     #tabbrowser-arrowscrollbox:not([overflowing])
-      .tabbrowser-tab:not([visuallyselected], [multiselected], :hover):last-child
+      .tabbrowser-tab:not([visuallyselected], [multiselected], :hover):last-of-type
       .tab-stack::after {
       transition: opacity 0.2s var(--animation-easing-function); /* cubic-bezier(.07, .95, 0, 1) */
     }
@@ -150,6 +150,6 @@
 }
 
 /* Latest Tab & New tab margin */
-#tabbrowser-arrowscrollbox:not([overflowing]) .tabbrowser-tab:last-child {
+#tabbrowser-arrowscrollbox:not([overflowing]) .tabbrowser-tab:last-of-type {
   margin-inline-end: 1px !important;
 }
diff --git a/src/tab/unselected_tab/_static_separator.scss b/src/tab/unselected_tab/_static_separator.scss
index dedc6b0..6aa29cd 100644
--- a/src/tab/unselected_tab/_static_separator.scss
+++ b/src/tab/unselected_tab/_static_separator.scss
@@ -2,7 +2,7 @@
   --toolbarseparator-color: color-mix(in srgb, currentColor 30%, transparent);
 }
 
-.tabbrowser-tab:first-child .tab-stack::before,
+.tabbrowser-tab:first-of-type .tab-stack::before,
 .tab-stack::after {
   content: "";
 }

From e8060a59452e7b0b4e3e17d3587afbe19138a31c Mon Sep 17 00:00:00 2001
From: 2641a40fd44383320adde4b027a1d0b03bd550
 <58827198+2641a40fd44383320adde4b027a1d0b03bd550@users.noreply.github.com>
Date: Fri, 17 Feb 2023 05:50:44 +0500
Subject: [PATCH 10/46] Fix: Rounding - Missing content fields Fixes #621

---
 css/leptonContent.css       | 6 +++++-
 src/contents/_rounding.scss | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/css/leptonContent.css b/css/leptonContent.css
index d9014f7..92829f7 100644
--- a/css/leptonContent.css
+++ b/css/leptonContent.css
@@ -2816,10 +2816,14 @@
 @supports -moz-bool-pref("userChrome.rounding.square_field") {
   @-moz-document url-prefix("about:"), url-prefix("chrome://browser/content/"), url-prefix("chrome://pippki/content/")
   {
-    input:is([type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]),
+    input:is([type="color"], [type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]),
     textarea,
     select,
     menulist,
+    tree,
+    treecols,
+    listheader,
+    richlistbox,
     search-textbox {
       border-radius: 0 !important;
     }
diff --git a/src/contents/_rounding.scss b/src/contents/_rounding.scss
index 971b82e..b46afcf 100644
--- a/src/contents/_rounding.scss
+++ b/src/contents/_rounding.scss
@@ -72,10 +72,14 @@
     url-prefix "chrome://browser/content/",
     url-prefix "chrome://pippki/content/"
   ) {
-    input:is([type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]),
+    input:is([type="color"], [type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]),
     textarea,
     select,
     menulist,
+    tree,
+    treecols,
+    listheader,
+    richlistbox,
     search-textbox {
       border-radius: 0 !important;
     }

From 0f246b6e3352b8e3412b30d03367a86d77519e53 Mon Sep 17 00:00:00 2001
From: 2641a40fd44383320adde4b027a1d0b03bd550
 <58827198+2641a40fd44383320adde4b027a1d0b03bd550@users.noreply.github.com>
Date: Fri, 17 Feb 2023 18:36:52 +0500
Subject: [PATCH 11/46] Add: Icons - Warning icon Fixes #632

---
 css/leptonContent.css                         | 21 +++++++++++++++++++
 src/contents/_proton_contents.scss            |  3 +++
 .../proton_contents/_about_preferences.scss   | 17 +++++++++++++++
 3 files changed, 41 insertions(+)
 create mode 100644 src/contents/proton_contents/_about_preferences.scss

diff --git a/css/leptonContent.css b/css/leptonContent.css
index 92829f7..9453ed6 100644
--- a/css/leptonContent.css
+++ b/css/leptonContent.css
@@ -1997,6 +1997,27 @@
       vertical-align: bottom !important;
     }
   }
+  /*= about:preferences ========================================================*/
+  @-moz-document url-prefix("chrome://browser/content")
+  {
+    #sanitizeEverythingWarningIcon {
+      list-style-image: url("chrome://global/skin/icons/warning.svg") !important;
+      -moz-context-properties: fill;
+      fill: #ffa436;
+      width: 48px;
+      height: 48px;
+    }
+    @media (-moz-toolbar-prefers-color-scheme: dark), (prefers-color-scheme: dark) {
+      #sanitizeEverythingWarningIcon {
+        fill: #ffbd4f;
+      }
+    }
+    @media (prefers-contrast) {
+      #sanitizeEverythingWarningIcon {
+        fill: var(--in-content-page-color);
+      }
+    }
+  }
   /*= chrome://browser/content/places/places.xhtml =============================*/
   @-moz-document url("chrome://browser/content/places/places.xhtml")
   {
diff --git a/src/contents/_proton_contents.scss b/src/contents/_proton_contents.scss
index 95df40b..cefc4d6 100644
--- a/src/contents/_proton_contents.scss
+++ b/src/contents/_proton_contents.scss
@@ -26,5 +26,8 @@
 /*= about:memory =============================================================*/
 @import "proton_contents/about_memory";
 
+/*= about:preferences ========================================================*/
+@import "proton_contents/about_preferences";
+
 /*= chrome://browser/content/places/places.xhtml =============================*/
 @import "../library/contents";
diff --git a/src/contents/proton_contents/_about_preferences.scss b/src/contents/proton_contents/_about_preferences.scss
new file mode 100644
index 0000000..9e29172
--- /dev/null
+++ b/src/contents/proton_contents/_about_preferences.scss
@@ -0,0 +1,17 @@
+@include moz-document(url-prefix "chrome://browser/content") {
+  #sanitizeEverythingWarningIcon {
+    list-style-image: url("chrome://global/skin/icons/warning.svg") !important;
+    -moz-context-properties: fill;
+    // chrome://global/skin/aboutNetError.css
+    fill: #ffa436;
+    width: 48px;
+    height: 48px;
+
+    @include Dark {
+      fill: #ffbd4f;
+    }
+    @include Contrast {
+      fill: var(--in-content-page-color);
+    }
+  }
+}

From 9ed67a0870fdd0e92c9b44532142ed1aa7ae2ea4 Mon Sep 17 00:00:00 2001
From: 2641a40fd44383320adde4b027a1d0b03bd550
 <58827198+2641a40fd44383320adde4b027a1d0b03bd550@users.noreply.github.com>
Date: Sat, 18 Feb 2023 12:11:21 +0500
Subject: [PATCH 12/46] Fix: Rounding - Missing chrome elements Fixes #636,
 #637, #638, #639

---
 css/leptonChrome.css      | 20 ++++++++++++++------
 src/rounding/_square.scss | 20 ++++++++++++++------
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index bee3e1a..a9e3e65 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -3102,12 +3102,14 @@
   .urlbarView-button,
   .urlbarView-tip-button,
   .urlbarView-action,
-  .tab-close-button,
   toolbarbutton.bookmark-item:not(.subviewbutton),
   #sidebar-switcher-target {
     --toolbarbutton-border-radius: 0; /* Original: 4px */
   }
   button,
+  .close-icon,
+  input[type="number"].photon-number::-moz-number-spin-box,
+  .toggle-group-label,
   findbar toolbarbutton,
   .notification-button,
   #main-menubar > menu {
@@ -3151,11 +3153,16 @@
   }
 }
 @supports -moz-bool-pref("userChrome.rounding.square_field") {
-  html|select[size][multiple],
-  xul|listheader,
-  xul|richlistbox,
-  xul|menulist,
-  html|input {
+  input:is([type="color"], [type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]),
+  textarea,
+  select,
+  menulist,
+  tree,
+  treecols,
+  listheader,
+  richlistbox,
+  search-textbox,
+  .subviewradio {
     border-radius: 0 !important;
   }
   #urlbar-input-container,
@@ -3170,6 +3177,7 @@
   }
 }
 @supports -moz-bool-pref("userChrome.rounding.square_checklabel") {
+  input[type="checkbox"],
   .checkbox-check {
     border-radius: 0 !important;
   }
diff --git a/src/rounding/_square.scss b/src/rounding/_square.scss
index d2dd19e..0c055c1 100644
--- a/src/rounding/_square.scss
+++ b/src/rounding/_square.scss
@@ -15,13 +15,15 @@
   .urlbarView-button,
   .urlbarView-tip-button,
   .urlbarView-action,
-  .tab-close-button,
   toolbarbutton.bookmark-item:not(.subviewbutton),
   #sidebar-switcher-target {
     --toolbarbutton-border-radius: 0;  /* Original: 4px */
   }
 
   button,
+  .close-icon,
+  input[type="number"].photon-number::-moz-number-spin-box,
+  .toggle-group-label,
   findbar toolbarbutton,
   .notification-button,
   #main-menubar > menu {
@@ -69,11 +71,16 @@
 }
 
 @include Option("userChrome.rounding.square_field") {
-  html|select[size][multiple],
-  xul|listheader,
-  xul|richlistbox,
-  xul|menulist,
-  html|input {
+  input:is([type="color"], [type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]),
+  textarea,
+  select,
+  menulist,
+  tree,
+  treecols,
+  listheader,
+  richlistbox,
+  search-textbox,
+  .subviewradio {
     border-radius: 0 !important;
   }
 
@@ -91,6 +98,7 @@
 }
 
 @include Option("userChrome.rounding.square_checklabel") {
+  input[type="checkbox"],
   .checkbox-check {
     border-radius: 0 !important;
   }

From 6dc755d4fe99645f10e5d65fc226abf750330135 Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Sat, 18 Feb 2023 11:13:22 +0900
Subject: [PATCH 13/46] Fix: Tab - Replace `[beforeselected-visible]` #628

---
 css/leptonChrome.css                              | 15 ++++++++-------
 .../_bottom_rounded_corner_others.scss            |  2 +-
 src/tab/unselected_tab/_static_separator.scss     |  9 +++++----
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index 9bd12a6..e383102 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -6430,7 +6430,7 @@
       background-image: var(--uc-tab-corner-right-side-svg), var(--uc-tab-corner-bgimage);
       clip-path: var(--uc-tab-corner-right-side-clipPath);
     }
-    .tabbrowser-tab[beforeselected-visible] .tab-background::after {
+    .tabbrowser-tab:has(+ .tabbrowser-tab[visuallyselected]) .tab-background::after {
       --uc-tab-corner-right-side-svg: var(--uc-tab-corner-right-side-svg-clipped);
     }
     .tabbrowser-tab[visuallyselected] + .tabbrowser-tab .tab-background::before {
@@ -6747,8 +6747,8 @@
   #TabsToolbar {
     --toolbarseparator-color: color-mix(in srgb, currentColor 30%, transparent);
   }
-  .tabbrowser-tab:first-of-type .tab-stack::before,
-  .tab-stack::after {
+  .tab-stack::before,
+  .tabbrowser-tab:last-of-type .tab-stack::after {
     content: "";
   }
   .tab-stack::before,
@@ -6759,6 +6759,7 @@
     /* Position */
     top: 50%;
     transform: translateY(-50%);
+    z-index: 1;
     /* Bar shape */
     width: 0px;
     height: 100%;
@@ -6770,15 +6771,15 @@
   }
   @supports -moz-bool-pref("userChrome.tab.static_separator.selected_accent") {
     .tabbrowser-tab[visuallyselected] .tab-stack::before,
-    .tabbrowser-tab[visuallyselected] .tab-stack::after,
-    .tabbrowser-tab[beforeselected-visible] .tab-stack::after {
+    .tabbrowser-tab[visuallyselected] + .tabbrowser-tab .tab-stack::before,
+    .tabbrowser-tab[visuallyselected] .tab-stack::after {
       --toolbarseparator-color: var(--tab-line-color, var(--lwt-tab-line-color, rgb(10, 132, 255)));
     }
   }
   @supports not -moz-bool-pref("userChrome.tab.static_separator.selected_accent") {
     .tabbrowser-tab[visuallyselected] .tab-stack::before,
-    .tabbrowser-tab[visuallyselected] .tab-stack::after,
-    .tabbrowser-tab[beforeselected-visible] .tab-stack::after {
+    .tabbrowser-tab[visuallyselected] + .tabbrowser-tab .tab-stack::before,
+    .tabbrowser-tab[visuallyselected] .tab-stack::after {
       opacity: 0;
     }
   }
diff --git a/src/tab/selected_tab/_bottom_rounded_corner_others.scss b/src/tab/selected_tab/_bottom_rounded_corner_others.scss
index 4863f51..1bb55a5 100644
--- a/src/tab/selected_tab/_bottom_rounded_corner_others.scss
+++ b/src/tab/selected_tab/_bottom_rounded_corner_others.scss
@@ -153,7 +153,7 @@
     }
   }
 
-  &[beforeselected-visible] .tab-background::after {
+  &:has(+ .tabbrowser-tab[visuallyselected]) .tab-background::after {
     --uc-tab-corner-right-side-svg: var(--uc-tab-corner-right-side-svg-clipped);
   }
   &[visuallyselected] + .tabbrowser-tab .tab-background::before {
diff --git a/src/tab/unselected_tab/_static_separator.scss b/src/tab/unselected_tab/_static_separator.scss
index 6aa29cd..4107155 100644
--- a/src/tab/unselected_tab/_static_separator.scss
+++ b/src/tab/unselected_tab/_static_separator.scss
@@ -2,8 +2,8 @@
   --toolbarseparator-color: color-mix(in srgb, currentColor 30%, transparent);
 }
 
-.tabbrowser-tab:first-of-type .tab-stack::before,
-.tab-stack::after {
+.tab-stack::before,
+.tabbrowser-tab:last-of-type .tab-stack::after {
   content: "";
 }
 
@@ -16,6 +16,7 @@
   /* Position */
   top: 50%;
   transform:  translateY(-50%);
+  z-index: 1;
 
   /* Bar shape */
   width: 0px;
@@ -29,8 +30,8 @@
 }
 
 .tabbrowser-tab[visuallyselected] .tab-stack::before,
-.tabbrowser-tab[visuallyselected] .tab-stack::after,
-.tabbrowser-tab[beforeselected-visible] .tab-stack::after {
+.tabbrowser-tab[visuallyselected] + .tabbrowser-tab .tab-stack::before,
+.tabbrowser-tab[visuallyselected] .tab-stack::after {
   @include Option("userChrome.tab.static_separator.selected_accent") {
     --toolbarseparator-color: var(--tab-line-color, var(--lwt-tab-line-color, rgb(10, 132, 255)));
   }

From 113c453f1752f1b0906d1221cc8ca770d3b713fd Mon Sep 17 00:00:00 2001
From: Dusk Banks <me@bb010g.com>
Date: Sat, 4 Feb 2023 15:16:25 -0800
Subject: [PATCH 14/46] Clean: GitHub - Mark `/css/*` as generated

---
 .gitattributes | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitattributes b/.gitattributes
index b203438..0b86b5a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,8 +1,9 @@
 /.gitattributes export-ignore
-/.gitignore export-ignore
 /.github export-ignore
+/.gitignore export-ignore
 /.prettierignore export-ignore
 /.prettierrc.json export-ignore
 /CODE_OF_CONDUCT.md export-ignore
 /CONTRIBUTING.md export-ignore
 /README.org export-ignore
+/css/* linguist-generated

From fe1de3074f83b5053c8b574e8c179b8e3ae70e86 Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Sun, 19 Feb 2023 19:29:04 +0900
Subject: [PATCH 15/46] Doc: CREDITS - Add contributor #606

---
 CREDITS | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CREDITS b/CREDITS
index 9b18c90..62fdfd5 100644
--- a/CREDITS
+++ b/CREDITS
@@ -80,6 +80,10 @@ N: dr460nf1r3
 E: njcrypted@protonmail.com
 W: https://dr460nf1r3.me/
 
+N: Dusk Banks
+E: me@bb010g.com
+W: https://static.bb010g.com/
+
 N: Filip Š
 E: filip.stamcar@hotmail.com
 W: https://www.filips.si/

From 9d52bd0736538cff47b56c01b129f009ae0ab969 Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Wed, 22 Feb 2023 21:37:06 +0900
Subject: [PATCH 16/46] Fix: Icons - Stroke color #635

---
 css/leptonChrome.css               | 1 +
 css/leptonContent.css              | 2 ++
 src/icons/layout/_menu_common.scss | 1 +
 3 files changed, 4 insertions(+)

diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index 73c436e..51af43e 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -10456,6 +10456,7 @@
       /* Color */
       -moz-context-properties: fill, fill-opacity, stroke !important;
       fill: currentColor !important;
+      stroke: transparent;
       /* Layout */
       background-size: 16px !important;
       background-repeat: no-repeat !important;
diff --git a/css/leptonContent.css b/css/leptonContent.css
index 9453ed6..18222c0 100644
--- a/css/leptonContent.css
+++ b/css/leptonContent.css
@@ -252,6 +252,7 @@
       /* Color */
       -moz-context-properties: fill, fill-opacity, stroke !important;
       fill: currentColor !important;
+      stroke: transparent;
       /* Layout */
       background-size: 16px !important;
       background-repeat: no-repeat !important;
@@ -2931,6 +2932,7 @@
         /* Color */
         -moz-context-properties: fill, fill-opacity, stroke !important;
         fill: currentColor !important;
+        stroke: transparent;
         /* Layout */
         background-size: 16px !important;
         background-repeat: no-repeat !important;
diff --git a/src/icons/layout/_menu_common.scss b/src/icons/layout/_menu_common.scss
index eb3af6c..8da4b92 100644
--- a/src/icons/layout/_menu_common.scss
+++ b/src/icons/layout/_menu_common.scss
@@ -46,6 +46,7 @@ $_initialMenus: selector.append(
   /* Color */
   -moz-context-properties: fill, fill-opacity, stroke !important;
   fill: currentColor !important;
+  stroke: transparent;
 
   /* Layout */
   background-size: 16px !important;

From 60e60f98c0137bd4bc9a3126570400a9b58f8e3b Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Sat, 25 Feb 2023 22:20:59 +0900
Subject: [PATCH 17/46] Add: Error Page - Preferences' no search result #654

---
 css/leptonContent.css         |  9 +++++++++
 icons/no-search-results.svg   | 36 +++++++++++++++++++++++++++++++++++
 src/contents/_error_page.scss | 10 ++++++++++
 3 files changed, 55 insertions(+)
 create mode 100644 icons/no-search-results.svg

diff --git a/css/leptonContent.css b/css/leptonContent.css
index 18222c0..2c51762 100644
--- a/css/leptonContent.css
+++ b/css/leptonContent.css
@@ -554,6 +554,15 @@
       }
     }
   }
+  @-moz-document url-prefix("about:preferences") {
+    #no-results-message::after {
+      content: url("../icons/no-search-results.svg");
+      width: 380px;
+      height: 293px;
+      margin-top: 64px;
+      margin-inline: auto;
+    }
+  }
 }
 /** Fully Dark Mode ***********************************************************/
 /*= Fully Dark Mode - Dark Mode Colors =======================================*/
diff --git a/icons/no-search-results.svg b/icons/no-search-results.svg
new file mode 100644
index 0000000..fcb214e
--- /dev/null
+++ b/icons/no-search-results.svg
@@ -0,0 +1,36 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 380 293"><script xmlns=""/>
+  <path fill="#FFFFFF" d="M2.72 39.24h40.9s-12.8-28.6 14.37-32.3c24.22-3.3 33.8 21.6 33.8 21.6s2.87-14.36 17.29-11.61c14.2 2.7 24.7 25.56 24.7 25.56h35.6"/>
+  <path fill="#E1E1E6" d="M170.09 35.84h-35.62c-.4 0-.75-.22-.93-.57-.1-.2-10.43-20.33-23.96-22.9-13.2-2.53-15.95 10.24-16.06 10.79-.1.45-.48.8-.94.83-.47.05-.9-.23-1.07-.66a41.04 41.04 0 0 0-7.65-11.75c-6.94-7.41-15.36-10.5-25.04-9.2-7.04.97-11.89 3.74-14.4 8.26-5.06 9.1.8 22.45.85 22.58a1.06 1.06 0 0 1-.96 1.48H3.41a1.05 1.05 0 0 1 0-2.1h39.35C41.3 28.68 38 17.86 42.58 9.63 45.43 4.5 50.8 1.36 58.54.3c20.08-2.73 30.5 13.43 33.77 19.78 1.72-4.25 6.43-11.93 17.66-9.79 13.37 2.55 23.28 19.96 25.14 23.44h34.98a1.05 1.05 0 0 1 0 2.1"/>
+  <path fill="#FFFFFF" d="M171.26 43.2H2.71a2.1 2.1 0 1 1 0-4.2h168.55a2.1 2.1 0 0 1 0 4.2"/>
+  <path fill="#E1E1E6" d="M338.53 124.92H211.12a2.1 2.1 0 1 1 0-4.2h127.41a2.1 2.1 0 0 1 0 4.2M121.81 99.33H55.02a2.1 2.1 0 1 1 0-4.2h66.8a2.1 2.1 0 0 1 0 4.2m-32.54-9.76H70.34a1.05 1.05 0 0 1 0-2.1h18.94a1.05 1.05 0 0 1 0 2.1m47.26 95.55H2.1a2.1 2.1 0 1 1 0-4.2h134.44a2.1 2.1 0 0 1 0 4.2m-21.96-9.57H50.03a1.05 1.05 0 0 1 0-2.1h64.55a1.05 1.05 0 0 1 0 2.1m206.66-61.59h-56.42a1.05 1.05 0 0 1 0-2.1h56.42a1.05 1.05 0 0 1 0 2.1m50.17 19.83H179.66a1.05 1.05 0 0 1 0-2.1H371.4a1.05 1.05 0 0 1 0 2.1"/>
+  <path fill="#FFFFFF" d="M283.11 65.18h22.75s-7.12-15.9 7.99-17.96c13.48-1.84 18.8 12.01 18.8 12.01s1.6-7.99 9.61-6.46c7.9 1.5 13.74 14.21 13.74 14.21h19.8"/>
+  <path fill="#E1E1E6" d="M306.56 62.73h-22.74a1.05 1.05 0 1 1 0-2.1h21.21c-.88-2.61-2.26-8.18.16-12.53 1.66-2.99 4.76-4.81 9.22-5.42 10.6-1.44 16.48 6.34 18.78 10.37 1.42-2.86 4.5-5.84 9.97-4.8 7.32 1.39 12.8 9.82 14.14 12.09h19.2a1.05 1.05 0 0 1 0 2.1h-19.8c-.39 0-.74-.2-.92-.55-.06-.1-5.7-10.19-13.01-11.58-6.93-1.33-8.33 5.35-8.4 5.63a1.05 1.05 0 0 1-2 .17c-.2-.53-5.2-13.06-17.68-11.35-3.77.52-6.35 1.98-7.67 4.36-2.7 4.86.46 12.06.5 12.14.14.32.11.7-.08 1-.2.3-.53.47-.88.47"/>
+  <path fill="#FFFFFF" d="M377.27 69.19h-93.74a2.1 2.1 0 1 1 0-4.2h93.74a2.1 2.1 0 1 1 0 4.2"/>
+  <path fill="#E1E1E6" d="M117.87 251.41H9.4a2.1 2.1 0 1 1 0-4.2h108.47a2.1 2.1 0 0 1 0 4.2m242.44 0H241.8a2.1 2.1 0 1 1 0-4.2h118.5a2.1 2.1 0 0 1 0 4.2m-232.88-32.15a4.2 4.2 0 0 1-4.16-3.62l-4.55-32.19a4.2 4.2 0 0 1 8.32-1.17l4.55 32.19a4.2 4.2 0 0 1-4.16 4.79"/>
+  <path fill="#E1E1E6" d="M125.24 205.61c-.47-.94-10.5-16.8-13.65-16.8-3.15 0-11.55 7-11.55 8.05 0 1.05 2.45 5.25 8.05 3.85l5.6-1.4s8.05 15.05 9.8 17.15c1.75 2.1 8.4 2.45 1.75-10.85"/>
+  <path fill="#0A84FF" d="M105.66 197.3c-.4 0-.8-.11-1.17-.35l-5.24-3.5a2.1 2.1 0 0 1 2.33-3.5l5.25 3.5a2.1 2.1 0 0 1-1.17 3.85"/>
+  <path fill="#5CE6E6" d="M122.9 182l5.64 1.3"/>
+  <path fill="#E1E1E6" d="M128.54 187.5c-.32 0-.64-.03-.96-.1l-5.64-1.32a4.2 4.2 0 0 1 1.9-8.18l5.65 1.31a4.2 4.2 0 0 1-.95 8.3m106.4 31.75a4.2 4.2 0 0 1-4.17-4.7l3.7-30.92a4.2 4.2 0 1 1 8.33 1l-3.7 30.91a4.2 4.2 0 0 1-4.16 3.7"/>
+  <path fill="#E1E1E6" d="M236.5 205.61c.48-.94 10.5-16.8 13.65-16.8 3.15 0 11.55 7 11.55 8.05 0 1.05-2.45 5.25-8.05 3.85l-5.6-1.4s-8.04 15.05-9.8 17.15c-1.74 2.1-8.4 2.45-1.74-10.85"/>
+  <path fill="#E1E1E6" d="M257.07 198.18a2.1 2.1 0 0 1-.35-4.17l6.12-1.05a2.1 2.1 0 1 1 .7 4.14l-6.11 1.04c-.12.03-.24.04-.36.04"/>
+  <path fill="#E1E1E6" d="M253.75 196.08a2.1 2.1 0 0 1-.73-4.07l6.65-2.45a2.1 2.1 0 0 1 1.45 3.94l-6.64 2.45a2.1 2.1 0 0 1-.73.13m-21.1-6.57a4.2 4.2 0 0 1-.96-8.29l5.64-1.31a4.2 4.2 0 0 1 1.9 8.18l-5.63 1.31c-.32.07-.64.1-.96.1m-82.18-33.66c-3.22 0-6.44-1.23-8.9-3.7l-19.6-19.58a12.6 12.6 0 1 1 17.82-17.82l19.6 19.6a12.6 12.6 0 0 1-8.92 21.5m59.48.7a12.6 12.6 0 0 1-8.9-21.5l19.58-19.6a12.6 12.6 0 0 1 17.82 17.81l-19.6 19.6a12.56 12.56 0 0 1-8.9 3.69"/>
+  <path fill="#EDEDF2" d="M121.36 283.07c0-5.1 27.22-9.24 60.8-9.24s60.8 4.13 60.8 9.24c0 5.1-27.22 9.23-60.8 9.23s-60.8-4.13-60.8-9.23"/>
+  <path fill="#E1E1E6" d="M130.06 129.95c-6.4 4.08-4.99 121.7 8.65 130.86 9.37 6.3 75.64 8.4 85.73-1.4 2.97-2.88 17.29-74.88 10.08-125.96-1.88-13.34-81.4-18.2-104.46-3.5"/>
+  <path fill="#E1E1E6" d="M132.23 229.32s2.1 25.64 6.3 37.6c4.2 11.96 9.1 17.95 11.2 16.24 2.1-1.71 0-39.31 0-39.31l-17.5-14.53zm97.51 0s-2.1 25.64-6.3 37.6c-4.2 11.96-9.1 17.95-11.2 16.24-2.1-1.71 0-39.31 0-39.31l17.5-14.53zM138.71 120.5s26.24-7.87 33.59-8.92c7.35-1.05 23.1-8.92 23.1-8.92l-3.68 8.4 8.92-2.63v4.72l21.52 5.78-4.72 6.3h-69.81l-8.92-4.73z"/>
+  <path fill="#F5F5F7" d="M142.82 129.42c-15.06 9.98-5.7 104.71 3.93 116.52 15.84 19.42 63.87 17.85 73.07-3.67 1.52-3.57 15.91-71.38 5-108.65-3.58-12.28-45.7-28.25-82-4.2"/>
+  <path fill="#7A7B7E" d="M149.28 141.48a2.27 2.27 0 0 1 2.27 2.27v5.1a2.27 2.27 0 0 1-4.55 0v-5.1a2.26 2.26 0 0 1 2.28-2.27m56.4 0a2.27 2.27 0 0 1 2.26 2.27v5.1a2.27 2.27 0 0 1-4.54 0v-5.1a2.27 2.27 0 0 1 2.27-2.27"/>
+  <path fill="#C8C8CC" d="M149.27 161.44a9.75 9.75 0 0 1-7.88-4.1 2.1 2.1 0 0 1 3.51-2.3 5.5 5.5 0 0 0 4.37 2.2 5.52 5.52 0 0 0 4.37-2.2 2.1 2.1 0 0 1 3.52 2.28c-.1.18-2.72 4.12-7.89 4.12m56.4 0a9.75 9.75 0 0 1-7.88-4.1 2.1 2.1 0 0 1 3.51-2.3 5.5 5.5 0 0 0 4.37 2.2 5.52 5.52 0 0 0 4.37-2.2 2.1 2.1 0 0 1 3.52 2.28c-.11.18-2.72 4.12-7.89 4.12m-26 10.75a2.1 2.1 0 0 1-.6-4.11c.18-.05 3.7-1.18 4.6-4.8.7-2.76-.1-6.02-.11-6.05a2.1 2.1 0 0 1 3.95-1.37c.75 1.66 2.3 4.32 3.41 5.03 2 1.28 3.68.7 3.76.68a2.12 2.12 0 0 1 2.69 1.23c.4 1.07-.1 2.26-1.17 2.68a8.71 8.71 0 0 1-8.34-1.66l-.11.48c-1.5 6-7.24 7.74-7.49 7.8-.2.07-.39.1-.58.1"/>
+  <path fill="#7A7B7E" d="M175.69 155.33c-1.31 1.4 8.6 3.75 9.86 3.48 1.9-.4 10-6.46 8.92-9.38-.58-1.57-13.61.37-18.78 5.9"/>
+  <path fill="#7A7B7E" d="M178.95 155.28a31 31 0 0 0 6.23 1.45c1.54-.54 5.53-3.76 6.85-5.73-2.86.13-9.1 1.46-13.08 4.28m6.54 5.62c-2.45 0-10.34-1.68-11.69-4.05a2.47 2.47 0 0 1 .35-2.95c4.91-5.25 16.2-7.72 19.97-6.95 1.5.3 2.08 1.12 2.32 1.76.43 1.18.25 2.5-.54 3.93-1.9 3.43-7.72 7.75-9.9 8.22-.13.03-.3.04-.51.04"/>
+  <path fill="#E1E1E6" d="M231.08 178.78s-1.05 8.4-6.3 13.12c-5.24 4.72 6.83 11.54 6.3 22.04-.52 10.5 0-35.16 0-35.16m-98.93-4.73s1.05 8.4 6.3 13.12c5.25 4.73-6.82 11.55-6.3 22.05.52 10.5 0-35.17 0-35.17"/>
+  <path fill="#C8C8CC" d="M195.5 105.2h.01-.01zm0-4.2c-.32 0-.64.07-.94.21-.15.08-15.5 7.73-22.42 8.72-5.1.73-18.85 4.6-27.37 7.07l-3.32-3.32a14.57 14.57 0 0 0-10.37-4.3 14.7 14.7 0 0 0-10.38 25.05l5.08 5.09c-.96 8.47-1.4 21.64-1.24 36.66a6.26 6.26 0 0 0-7.69 6.47c-.05.51-.04.97.02 1.42l1.05 7.45c-3.8-4.5-5.22-4.5-6.1-4.5-1.59 0-3.83 1-6.66 2.94l-2.17-1.44a4.2 4.2 0 0 0-6.49 2.96 4.19 4.19 0 0 0-.9 8.26l4.46 1.14a8.3 8.3 0 0 0 6.1 2.5c.86 0 1.77-.1 2.68-.34l4-1c2.04 3.78 7.16 13.17 8.98 15.68a6.29 6.29 0 0 0 5.02 3.85c1.27 12.93 3.54 29.01 7.42 36.75a75.23 75.23 0 0 0 2.49 9.5c1.47 4.2 6.72 17.9 12.35 17.9.78 0 1.52-.26 2.13-.76.97-.79 1.97-1.6 1.65-18.26 8.4 1.12 19.07 1.75 29.79 1.75 7.3 0 17.6-.3 26.69-1.65-.32 16.56.68 17.37 1.64 18.16.61.5 1.35.76 2.13.76 5.64 0 10.88-13.7 12.36-17.9 1.3-3.72 2.53-9.04 3.65-15.82 1.89-7.91 3.84-18.87 5.43-30.39l.42.01a6.29 6.29 0 0 0 6.23-5.46 355.82 355.82 0 0 0 7.94-14.12l4 1c.92.23 1.82.35 2.68.35a8.38 8.38 0 0 0 7.1-3.76l.97-.17a4.17 4.17 0 0 0 3.43-4.84 4.18 4.18 0 0 0-2.76-3.26 4.21 4.21 0 0 0-5.62-3.46l-3.38 1.24c-3.38-2.11-4.88-2.11-5.4-2.11-.86 0-2.27 0-6 4.37l.74-6.2a6.3 6.3 0 0 0-4.2-6.69c-.74-.3-1.5-.46-2.28-.48.53-14.85.12-28.34-1.25-40.13l2.77-2.77a14.58 14.58 0 0 0 4.3-10.38c0-3.92-1.52-7.6-4.3-10.38a14.58 14.58 0 0 0-10.37-4.3c-3.92 0-7.61 1.53-10.38 4.3l-1.56 1.57-14.81-3.97v-3.11a2.1 2.1 0 0 0-2.7-2.02l-4.58 1.35 1.86-4.26a2.1 2.1 0 0 0-1.92-2.94zm0 2.1l-3.67 8.38 8.91-2.62v4.71l17.53 4.7 2.42-2.41a12.54 12.54 0 0 1 17.79 0 12.58 12.58 0 0 1 0 17.79l-3.49 3.49c1.66 13.68 1.88 28.68 1.25 43.36l1.14-.27a4.12 4.12 0 0 1 2.6.25 4.2 4.2 0 0 1 2.86 4.48l-1.66 13.86c3.2-4.58 7.21-9.7 9-9.7 1.2 0 3.17 1.03 5.15 2.35l4.35-1.6a2.1 2.1 0 0 1 2.7 1.24c.32.88 0 1.8-.7 2.35l1.17-.2.36-.03a2.1 2.1 0 0 1 .35 4.16l-2 .35a6.07 6.07 0 0 1-5.72 3.55 9 9 0 0 1-2.17-.28l-5.59-1.4s-6.2 11.6-8.9 15.83l-.04.39a4.2 4.2 0 0 1-6.32 3.08c-1.83 13.82-4 25.42-5.74 32.68-.94 5.73-2.13 11.43-3.57 15.53-3.72 10.6-8 16.5-10.38 16.5-.3 0-.57-.1-.8-.29-1-.81-1.05-9.82-.82-19-7.97 1.4-18.37 2.02-28.84 2.02-11.66 0-23.4-.77-31.95-2.08.23 9.2.2 18.24-.81 19.06-.24.2-.51.29-.81.29-2.38 0-6.65-5.9-10.37-16.5a74.98 74.98 0 0 1-2.47-9.5c-3.48-6.7-5.95-21.27-7.52-38.26-.17.04-.33.1-.5.12a4.2 4.2 0 0 1-4.55-2.79c-1.8-2.19-9.77-17.08-9.77-17.08l-5.59 1.4c-.78.2-1.5.28-2.17.28a6.24 6.24 0 0 1-4.96-2.29l-5.07-1.3a2.1 2.1 0 1 1 1.04-4.05l3.52.9-1.19-.8a2.1 2.1 0 0 1 2.33-3.49l3.37 2.26c2.42-1.79 5.12-3.4 6.63-3.4 1.84 0 6.05 5.46 9.31 10.16l-2.2-15.5a4.08 4.08 0 0 1 .02-1.09c-.05-.43-.04-.88.07-1.33a4.2 4.2 0 0 1 5.03-3.13l2.6.6c-.24-16.38.23-31.22 1.32-40.08l-5.8-5.8a12.58 12.58 0 0 1 17.79-17.79l4.2 4.2c8.04-2.35 23-6.6 28.27-7.36 7.34-1.05 23.06-8.9 23.06-8.9zM52.65 141.37a25.41 25.41 0 0 1 38.25 33.29l3.91 3.91-4.96 4.96-3.91-3.9a25.42 25.42 0 0 1-33.29-38.26"/>
+  <path fill="#F5F5F7" d="M70.62 138.63a20.72 20.72 0 1 1 0 41.45 20.72 20.72 0 0 1 0-41.45"/>
+  <path fill="#C8C8CC" d="M71.95 141.08a20.72 20.72 0 0 0-18.74 29.58 20.72 20.72 0 0 1 36.2-20.02 20.7 20.7 0 0 0-17.46-9.56"/>
+  <path fill="#7A7B7E" d="M115.81 204.54c2.38-2.38 3.3-5.36 2.03-6.63L95.7 177.6c-1.27-1.27-3.34-1.26-5.72 1.12s-2.39 4.46-1.12 5.72l20.31 22.13c1.27 1.26 4.25.35 6.63-2.03"/>
+  <polygon fill="#626366" points="113.396 193.835 105.106 202.128 95.104 191.234 102.502 183.834"/>
+  <path fill="#E1E1E6" d="M101.75 189.01s-9.1 2.1-8.75 4.9c.35 2.8 5.39 11.38 8.75 9.8 3.36-1.58 8.75-13.3 0-14.7"/>
+  <path fill="#C8C8CC" d="M134.37 128.24c-.1 0-.2-.02-.3-.05a1.04 1.04 0 0 1-.71-1.29c.08-.29 2.1-7.15 11.74-9.9.55-.16 1.14.16 1.3.71.16.56-.17 1.14-.73 1.3-8.45 2.42-10.22 8.22-10.3 8.47-.13.45-.55.76-1 .76m95.52-.26c-.37 0-.73-.2-.92-.55-4.4-8.07-11.78-9.43-11.85-9.44a1.05 1.05 0 0 1 .35-2.07c.34.05 8.43 1.5 13.34 10.5a1.04 1.04 0 0 1-.92 1.56m-76.1 139.08h-.1c-5.5-.55-11.09-5.03-11.32-5.22a1.05 1.05 0 1 1 1.32-1.63c.05.04 5.33 4.27 10.2 4.76a1.05 1.05 0 0 1-.1 2.1m56.42-.27a1.05 1.05 0 0 1-.22-2.07c3.53-.76 9.45-3.33 9.5-3.35a1.05 1.05 0 0 1 .85 1.92c-.25.11-6.18 2.68-9.91 3.48a.99.99 0 0 1-.22.02m23.35-45.4c-.85 0-1.58-.37-2.12-1.07-2.52-3.29-.2-14.94 1.29-21.2l-1.08 1a1.05 1.05 0 0 1-1.42-1.54l3.67-3.41a1.05 1.05 0 0 1 1.73 1.04c-2.01 7.48-4.47 20.29-2.53 22.83.16.2.3.25.46.25a1.05 1.05 0 0 1 0 2.1m-105.5.26a1.05 1.05 0 0 1-.04-2.1c.16 0 .36-.05.6-.36 2.4-3.08.3-18.67-1.58-27.76a1.05 1.05 0 0 1 1.77-.96l2.89 2.88c.4.42.4 1.08 0 1.5-.41.4-1.08.4-1.49 0l-.46-.47c1.27 7.02 3.58 22.18.52 26.1a2.84 2.84 0 0 1-2.16 1.17h-.04M100.6 205.1c-.79 0-1.73-.23-2.77-.92-3.5-2.34-6.98-6.52-6.35-10.18.26-1.48 1.3-3.43 4.84-4.31a1.05 1.05 0 0 1 .5 2.03c-1.95.5-3.05 1.38-3.27 2.64-.4 2.27 1.95 5.74 5.44 8.07.86.57 1.62.7 2.34.43 2.25-.88 3.8-5.46 4.2-7.15.13-.56.7-.9 1.26-.78.57.14.91.7.78 1.27-.17.73-1.8 7.17-5.48 8.61-.4.16-.9.29-1.49.29"/>
+</svg>
\ No newline at end of file
diff --git a/src/contents/_error_page.scss b/src/contents/_error_page.scss
index 73a1706..39cf4aa 100644
--- a/src/contents/_error_page.scss
+++ b/src/contents/_error_page.scss
@@ -119,3 +119,13 @@
 @include moz-document(url "about:welcomeBack", url "chrome://browser/content/aboutWelcomeBack.xhtml") {
   @include _errorTitleImage("../icons/welcome-back.svg");
 }
+
+@include moz-document(url-prefix "about:preferences") {
+  #no-results-message::after {
+    content: url("../icons/no-search-results.svg");
+    width: 380px;
+    height: 293px;
+    margin-top: 64px;
+    margin-inline: auto;
+  }
+}

From 5844cb4bd2f90796027c91e2c79f5cef76f39e18 Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Sun, 26 Feb 2023 15:43:25 +0900
Subject: [PATCH 18/46] Add: Icons - Addon page menu #634

---
 css/leptonContent.css           | 33 +++++++++++++++++++++++++++
 src/contents/_context_menu.scss |  6 +++++
 src/icons/_addon_page.scss      | 40 +++++++++++++++++++++++++++++++++
 3 files changed, 79 insertions(+)
 create mode 100644 src/icons/_addon_page.scss

diff --git a/css/leptonContent.css b/css/leptonContent.css
index 2c51762..89ffdd5 100644
--- a/css/leptonContent.css
+++ b/css/leptonContent.css
@@ -3313,6 +3313,39 @@
         }
       }
     }
+    @-moz-document url-prefix("about:addons") {
+      @supports -moz-bool-pref("userChrome.icon.context_menu") {
+        button[role="menuitem"][part="button"] {
+          background-image: var(
+            --menuitem-image,
+            url("../icons/blank.svg")
+          ); /* Don't use !important. because of [checked] */
+        }
+        panel-item[action="check-for-updates"] {
+          --menuitem-image: url("../icons/refresh-cw.svg");
+        }
+        panel-item[action="view-recent-updates"] {
+          --menuitem-image: url("chrome://global/skin/icons/info.svg");
+        }
+        panel-item[action="install-from-file"] {
+          --menuitem-image: url("chrome://devtools/skin/images/import.svg");
+        }
+        panel-item[action="debug-addons"] {
+          --menuitem-image: url("../icons/bug.svg");
+        }
+        panel-item[action="set-update-automatically"] {
+          --menuitem-image: url("chrome://devtools/skin/images/profiler-stopwatch.svg");
+        }
+        panel-item[action="reset-update-states"] {
+          --menuitem-image: url("chrome://devtools/skin/images/debugging-workers.svg");
+        }
+        panel-item[action="manage-shortcuts"],
+        panel-item[data-l10n-id="preferences-addon-button"],
+        panel-item[data-l10n-id="manage-addon-button"] {
+          --menuitem-image: url("chrome://global/skin/icons/settings.svg");
+        }
+      }
+    }
   }
 }
 /** Download Panel ************************************************************/
diff --git a/src/contents/_context_menu.scss b/src/contents/_context_menu.scss
index e219505..b182c50 100644
--- a/src/contents/_context_menu.scss
+++ b/src/contents/_context_menu.scss
@@ -14,3 +14,9 @@
     @import "../icons/library";
   }
 }
+
+@include moz-document(url-prefix "about:addons") {
+  @include Option("userChrome.icon.context_menu") {
+    @import "../icons/addon_page";
+  }
+}
diff --git a/src/icons/_addon_page.scss b/src/icons/_addon_page.scss
new file mode 100644
index 0000000..420be05
--- /dev/null
+++ b/src/icons/_addon_page.scss
@@ -0,0 +1,40 @@
+button[role="menuitem"][part="button"] {
+  background-image: var(--menuitem-image, url("../icons/blank.svg")); /* Don't use !important. because of [checked] */
+}
+
+panel-item {
+  &[action="check-for-updates"] {
+    // --menuitem-image: url("chrome://global/skin/icons/update-icon.svg");
+    // --menuitem-image: url("chrome://mozapps/skin/extensions/category-recent.svg");
+    // --menuitem-image: url("chrome://browser/skin/sync.svg");
+    --menuitem-image: url("../icons/refresh-cw.svg");
+  }
+
+  &[action="view-recent-updates"] {
+    // --menuitem-image: url("chrome://browser/skin/controlcenter/dashboard.svg");
+    --menuitem-image: url("chrome://global/skin/icons/info.svg");
+  }
+
+  &[action="install-from-file"] {
+    // --menuitem-image: url("chrome://browser/skin/import.svg");
+    --menuitem-image: url("chrome://devtools/skin/images/import.svg");
+  }
+
+  &[action="debug-addons"] {
+    --menuitem-image: url("../icons/bug.svg");
+  }
+
+  &[action="set-update-automatically"] {
+    --menuitem-image: url("chrome://devtools/skin/images/profiler-stopwatch.svg");
+  }
+
+  &[action="reset-update-states"] {
+    --menuitem-image: url("chrome://devtools/skin/images/debugging-workers.svg");
+  }
+
+  &[action="manage-shortcuts"],
+  &[data-l10n-id="preferences-addon-button"],
+  &[data-l10n-id="manage-addon-button"] {
+    --menuitem-image: url("chrome://global/skin/icons/settings.svg");
+  }
+}

From 29ac9b639fa248204f50692a088bab6f71e084b8 Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Sun, 26 Feb 2023 21:44:54 +0900
Subject: [PATCH 19/46] Fix: Icons - Addon page menu compatibility for FF v102
 #634

---
 css/leptonContent.css      | 21 +++++++++------------
 src/icons/_addon_page.scss | 29 +++++++++++++++--------------
 2 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/css/leptonContent.css b/css/leptonContent.css
index 89ffdd5..2956e61 100644
--- a/css/leptonContent.css
+++ b/css/leptonContent.css
@@ -3315,34 +3315,31 @@
     }
     @-moz-document url-prefix("about:addons") {
       @supports -moz-bool-pref("userChrome.icon.context_menu") {
-        button[role="menuitem"][part="button"] {
-          background-image: var(
-            --menuitem-image,
-            url("../icons/blank.svg")
-          ); /* Don't use !important. because of [checked] */
+        button[role="menuitem"] {
+          background-image: var(--icon, url("../icons/blank.svg")); /* Don't use !important. because of [checked] */
         }
         panel-item[action="check-for-updates"] {
-          --menuitem-image: url("../icons/refresh-cw.svg");
+          --icon: url("../icons/refresh-cw.svg");
         }
         panel-item[action="view-recent-updates"] {
-          --menuitem-image: url("chrome://global/skin/icons/info.svg");
+          --icon: url("chrome://global/skin/icons/info.svg");
         }
         panel-item[action="install-from-file"] {
-          --menuitem-image: url("chrome://devtools/skin/images/import.svg");
+          --icon: url("chrome://devtools/skin/images/import.svg");
         }
         panel-item[action="debug-addons"] {
-          --menuitem-image: url("../icons/bug.svg");
+          --icon: url("../icons/bug.svg");
         }
         panel-item[action="set-update-automatically"] {
-          --menuitem-image: url("chrome://devtools/skin/images/profiler-stopwatch.svg");
+          --icon: url("chrome://devtools/skin/images/profiler-stopwatch.svg");
         }
         panel-item[action="reset-update-states"] {
-          --menuitem-image: url("chrome://devtools/skin/images/debugging-workers.svg");
+          --icon: url("chrome://devtools/skin/images/debugging-workers.svg");
         }
         panel-item[action="manage-shortcuts"],
         panel-item[data-l10n-id="preferences-addon-button"],
         panel-item[data-l10n-id="manage-addon-button"] {
-          --menuitem-image: url("chrome://global/skin/icons/settings.svg");
+          --icon: url("chrome://global/skin/icons/settings.svg");
         }
       }
     }
diff --git a/src/icons/_addon_page.scss b/src/icons/_addon_page.scss
index 420be05..f8b0a5b 100644
--- a/src/icons/_addon_page.scss
+++ b/src/icons/_addon_page.scss
@@ -1,40 +1,41 @@
-button[role="menuitem"][part="button"] {
-  background-image: var(--menuitem-image, url("../icons/blank.svg")); /* Don't use !important. because of [checked] */
+// https://github.com/mozilla/gecko-dev/commit/260e4270fca18f2f6f59a1ffe4deccb5080a15f7
+button[role="menuitem"] {
+  background-image: var(--icon, url("../icons/blank.svg")); /* Don't use !important. because of [checked] */
 }
 
 panel-item {
   &[action="check-for-updates"] {
-    // --menuitem-image: url("chrome://global/skin/icons/update-icon.svg");
-    // --menuitem-image: url("chrome://mozapps/skin/extensions/category-recent.svg");
-    // --menuitem-image: url("chrome://browser/skin/sync.svg");
-    --menuitem-image: url("../icons/refresh-cw.svg");
+    // --icon: url("chrome://global/skin/icons/update-icon.svg");
+    // --icon: url("chrome://mozapps/skin/extensions/category-recent.svg");
+    // --icon: url("chrome://browser/skin/sync.svg");
+    --icon: url("../icons/refresh-cw.svg");
   }
 
   &[action="view-recent-updates"] {
-    // --menuitem-image: url("chrome://browser/skin/controlcenter/dashboard.svg");
-    --menuitem-image: url("chrome://global/skin/icons/info.svg");
+    // --icon: url("chrome://browser/skin/controlcenter/dashboard.svg");
+    --icon: url("chrome://global/skin/icons/info.svg");
   }
 
   &[action="install-from-file"] {
-    // --menuitem-image: url("chrome://browser/skin/import.svg");
-    --menuitem-image: url("chrome://devtools/skin/images/import.svg");
+    // --icon: url("chrome://browser/skin/import.svg");
+    --icon: url("chrome://devtools/skin/images/import.svg");
   }
 
   &[action="debug-addons"] {
-    --menuitem-image: url("../icons/bug.svg");
+    --icon: url("../icons/bug.svg");
   }
 
   &[action="set-update-automatically"] {
-    --menuitem-image: url("chrome://devtools/skin/images/profiler-stopwatch.svg");
+    --icon: url("chrome://devtools/skin/images/profiler-stopwatch.svg");
   }
 
   &[action="reset-update-states"] {
-    --menuitem-image: url("chrome://devtools/skin/images/debugging-workers.svg");
+    --icon: url("chrome://devtools/skin/images/debugging-workers.svg");
   }
 
   &[action="manage-shortcuts"],
   &[data-l10n-id="preferences-addon-button"],
   &[data-l10n-id="manage-addon-button"] {
-    --menuitem-image: url("chrome://global/skin/icons/settings.svg");
+    --icon: url("chrome://global/skin/icons/settings.svg");
   }
 }

From b28c6c6512f50e7fde8355fd4bed5462920651ad Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Tue, 28 Feb 2023 03:16:40 +0900
Subject: [PATCH 20/46] Fix: Rounding - Findbar #655

---
 css/leptonChrome.css      | 2 +-
 src/rounding/_square.scss | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index 51af43e..9804670 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -3153,7 +3153,7 @@
   }
 }
 @supports -moz-bool-pref("userChrome.rounding.square_field") {
-  input:is([type="color"], [type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]),
+  input:not([type="radio"], [type="checkbox"]),
   textarea,
   select,
   menulist,
diff --git a/src/rounding/_square.scss b/src/rounding/_square.scss
index 0c055c1..f978e11 100644
--- a/src/rounding/_square.scss
+++ b/src/rounding/_square.scss
@@ -71,7 +71,7 @@
 }
 
 @include Option("userChrome.rounding.square_field") {
-  input:is([type="color"], [type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]),
+  input:not([type="radio"], [type="checkbox"]),
   textarea,
   select,
   menulist,

From 6d4b50192e69dceaede4c29f1d8300c963137ff8 Mon Sep 17 00:00:00 2001
From: 2641a40fd44383320adde4b027a1d0b03bd550
 <58827198+2641a40fd44383320adde4b027a1d0b03bd550@users.noreply.github.com>
Date: Wed, 1 Mar 2023 17:48:15 +0500
Subject: [PATCH 21/46] Fix: Rounding - PDF #647

---
 css/leptonContent.css       | 25 +++++++++++++++++++++++++
 src/contents/_rounding.scss | 29 +++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+)

diff --git a/css/leptonContent.css b/css/leptonContent.css
index 2956e61..fadb650 100644
--- a/css/leptonContent.css
+++ b/css/leptonContent.css
@@ -2822,6 +2822,14 @@
       border-radius: 0 !important;
     }
   }
+  @-moz-document regexp(".*.pdf$") {
+    .toolbarButton,
+    .dropdownToolbarButton,
+    .secondaryToolbarButton,
+    .dialogButton {
+      border-radius: 0 !important;
+    }
+  }
 }
 @supports -moz-bool-pref("userChrome.rounding.square_dialog") {
   @-moz-document url-prefix("about:") {
@@ -2834,6 +2842,11 @@
       border-radius: 0 !important;
     }
   }
+  @-moz-document regexp(".*.pdf$") {
+    dialog {
+      border-radius: 0 !important;
+    }
+  }
 }
 @supports -moz-bool-pref("userChrome.rounding.square_checklabel") {
   @-moz-document url-prefix("about:"), url-prefix("chrome://browser/content/"), url-prefix("chrome://pippki/content/")
@@ -2870,6 +2883,12 @@
       border-radius: 0 !important;
     }
   }
+  @-moz-document regexp(".*.pdf$") {
+    .toolbarField,
+    .thumbnailSelectionRing {
+      border-radius: 0 !important;
+    }
+  }
 }
 @supports -moz-bool-pref("userChrome.rounding.square_menupopup") {
   @-moz-document url-prefix("about:"), url-prefix("chrome://")
@@ -2893,6 +2912,12 @@
       border-radius: 0 !important;
     }
   }
+  @-moz-document regexp(".*.pdf$") {
+    .doorHanger,
+    .doorHangerRight {
+      border-radius: 0 !important;
+    }
+  }
 }
 @-moz-document url("chrome://browser/content/places/places.xhtml")
 {
diff --git a/src/contents/_rounding.scss b/src/contents/_rounding.scss
index b46afcf..fb5fff7 100644
--- a/src/contents/_rounding.scss
+++ b/src/contents/_rounding.scss
@@ -37,6 +37,15 @@
       border-radius: 0 !important;
     }
   }
+
+  @include moz-document(regexp ".*\.pdf$") {
+    .toolbarButton,
+    .dropdownToolbarButton,
+    .secondaryToolbarButton,
+    .dialogButton {
+      border-radius: 0 !important;
+    }
+  }
 }
 
 @include Option("userChrome.rounding.square_dialog") {
@@ -51,6 +60,12 @@
       border-radius: 0 !important;
     }
   }
+
+  @include moz-document(regexp ".*\.pdf$") {
+    dialog {
+      border-radius: 0 !important;
+    }
+  }
 }
 
 @include Option("userChrome.rounding.square_checklabel") {
@@ -99,6 +114,13 @@
       }
     }
   }
+
+  @include moz-document(regexp ".*\.pdf$") {
+    .toolbarField,
+    .thumbnailSelectionRing {
+      border-radius: 0 !important;
+    }
+  }
 }
 
 @include Option("userChrome.rounding.square_menupopup") {
@@ -125,4 +147,11 @@
       border-radius: 0 !important;
     }
   }
+
+  @include moz-document(regexp ".*\.pdf$") {
+    .doorHanger,
+    .doorHangerRight {
+      border-radius: 0 !important;
+    }
+  }
 }

From ef7b96d749cab1d28606881e3fc3fcc0d1e0c2d7 Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Wed, 1 Mar 2023 22:32:53 +0900
Subject: [PATCH 22/46] Doc: Compatibility Notice - Firefox ESR accent color
 #627

---
 README.org | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.org b/README.org
index c09c47a..936cfb3 100644
--- a/README.org
+++ b/README.org
@@ -30,6 +30,12 @@ Some settings [[https://github.com/black7375/Firefox-UI-Fix/wiki/Options#using-u
 
 -----
 
+🔔🔔 Is your Firefox version =v102= or lower?
+
+You [[https://github.com/black7375/Firefox-UI-Fix/wiki/Compatibility-Issues-Solution#accent-color-at-v102-or-lower][have to set]] =userChrome.compatibility.accent_color= to =true= additionally.
+
+-----
+
 ** Introduction
   [[https://wiki.mozilla.org/Firefox/Proton][Proton]] is Firefox's new design, starting from Firefox 89. \\
   [[https://design.firefox.com/photon/][Photon]] is the old design of Firefox which was used until version 88.

From 2fcd7d308cb745f7a01fc9030b431e693db62cf2 Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Thu, 2 Mar 2023 02:45:34 +0900
Subject: [PATCH 23/46] Fix: Icons - Windows10/11 Bookmark Menu Padding

---
 css/leptonChrome.css                 | 7 ++-----
 src/icons/layout/_bookmark_menu.scss | 6 ++----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index 9804670..84d5dd8 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -10745,14 +10745,11 @@
       menupopup:is(#BMB_bookmarksPopup) menu:not(.menu-iconic),
       #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
       #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) {
-        --arrowpanel-bookmark-menuicon-padding: calc(
-          var(--arrowpanel-menuicon-padding) - var(--arrowpanel-menuitem-margin-inline)
-        );
         margin-inline-start: var(--arrowpanel-menuitem-margin-inline) !important;
         padding-inline-start: calc(
-          var(--arrowpanel-bookmark-menuicon-padding) + var(--context-menu-text-padding)
+          var(--arrowpanel-menuitem-padding-inline) + var(--context-menu-text-padding)
         ) !important;
-        background-position: var(--uc-menu-background-position) var(--arrowpanel-bookmark-menuicon-padding) center !important;
+        background-position: var(--uc-menu-background-position) var(--arrowpanel-menuitem-padding-inline) center !important;
       }
     }
     /* Linux */
diff --git a/src/icons/layout/_bookmark_menu.scss b/src/icons/layout/_bookmark_menu.scss
index 78cc127..8f950c4 100644
--- a/src/icons/layout/_bookmark_menu.scss
+++ b/src/icons/layout/_bookmark_menu.scss
@@ -80,11 +80,9 @@ $_bookmarkToolbarMenus: selector.nest(
 @include OS($win10) {
   /* Bookmark Popup - None icon menu */
   @include _layoutBookmarkMenu() {
-    --arrowpanel-bookmark-menuicon-padding: calc(var(--arrowpanel-menuicon-padding) - var(--arrowpanel-menuitem-margin-inline));
-
     margin-inline-start: var(--arrowpanel-menuitem-margin-inline) !important;
-    padding-inline-start: calc(var(--arrowpanel-bookmark-menuicon-padding) + var(--context-menu-text-padding)) !important;
-    background-position: var(--uc-menu-background-position) var(--arrowpanel-bookmark-menuicon-padding) center !important;
+    padding-inline-start: calc(var(--arrowpanel-menuitem-padding-inline) + var(--context-menu-text-padding)) !important;
+    background-position: var(--uc-menu-background-position) var(--arrowpanel-menuitem-padding-inline) center !important;
   }
 }
 

From ad6bf5d379b70d0194c0464b3bcf39569daeb4bd Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Sat, 4 Mar 2023 21:45:55 +0900
Subject: [PATCH 24/46] Fix: Error Page - Restart required to prefix

---
 css/leptonContent.css         | 4 ++--
 src/contents/_error_page.scss | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/css/leptonContent.css b/css/leptonContent.css
index fadb650..2986b09 100644
--- a/css/leptonContent.css
+++ b/css/leptonContent.css
@@ -460,7 +460,7 @@
 }
 /** Error Page - Restore illustrations ****************************************/
 @supports -moz-bool-pref("userContent.page.illustration") {
-  @-moz-document url-prefix("about:neterror"), url("about:restartrequired"), url("chrome://browser/content/aboutRestartRequired.xhtml"), url("about:sessionrestore"), url("chrome://browser/content/aboutSessionRestore.xhtml")
+  @-moz-document url-prefix("about:neterror"), url-prefix("about:restartrequired"), url("chrome://browser/content/aboutRestartRequired.xhtml"), url("about:sessionrestore"), url("chrome://browser/content/aboutSessionRestore.xhtml")
   {
     /* Illustrations Position */
     #errorPageContainer,
@@ -490,7 +490,7 @@
       padding-inline-start: 38%;
     }
   }
-  @-moz-document url-prefix("about:neterror?e=connectionFailure"), url-prefix("about:neterror?e=netInterrupt"), url-prefix("about:neterror?e=netReset"), url-prefix("about:neterror?e=netTimeout"), url-prefix("about:neterror?e=netOffline"), url("about:restartrequired"), url("chrome://browser/content/aboutRestartRequired.xhtml")
+  @-moz-document url-prefix("about:neterror?e=connectionFailure"), url-prefix("about:neterror?e=netInterrupt"), url-prefix("about:neterror?e=netReset"), url-prefix("about:neterror?e=netTimeout"), url-prefix("about:neterror?e=netOffline"), url-prefix("about:restartrequired"), url("chrome://browser/content/aboutRestartRequired.xhtml")
   {
     :root {
       --uc-error-llustration: url(../icons/error-connection-failure.svg);
diff --git a/src/contents/_error_page.scss b/src/contents/_error_page.scss
index 39cf4aa..1a27c17 100644
--- a/src/contents/_error_page.scss
+++ b/src/contents/_error_page.scss
@@ -1,6 +1,6 @@
 @include moz-document(
   url-prefix "about:neterror",
-  url "about:restartrequired",
+  url-prefix "about:restartrequired",
   url "chrome://browser/content/aboutRestartRequired.xhtml",
   url "about:sessionrestore",
   url "chrome://browser/content/aboutSessionRestore.xhtml"
@@ -75,7 +75,7 @@
   url-prefix "about:neterror?e=netReset",
   url-prefix "about:neterror?e=netTimeout",
   url-prefix "about:neterror?e=netOffline",
-  url "about:restartrequired",
+  url-prefix "about:restartrequired",
   url "chrome://browser/content/aboutRestartRequired.xhtml"
 ) {
   @include _errorContainerImage("../icons/error-connection-failure.svg");

From c919e83f244d6b41d6f31f3b2ce3f5b05d58c706 Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Sun, 5 Mar 2023 04:29:35 +0900
Subject: [PATCH 25/46] Fix: Theme - Warning Icon #657

---
 css/leptonChrome.css                          | 15 ++++++++++++++
 css/leptonContent.css                         | 20 +++++++++----------
 .../proton_contents/_about_preferences.scss   | 16 +--------------
 src/theme/_proton_chrome.scss                 |  1 +
 src/theme/_proton_color.scss                  | 17 ++++++++++++----
 .../proton_chrome/_sanitize_everything.scss   |  8 ++++++++
 6 files changed, 47 insertions(+), 30 deletions(-)
 create mode 100644 src/theme/proton_chrome/_sanitize_everything.scss

diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index 84d5dd8..820b514 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -1186,6 +1186,7 @@
     --card-shadow: var(--shadow-10);
     --card-outline-color: var(--grey-30);
     --card-shadow-hover: var(--card-shadow), 0 0 0 5px var(--card-outline-color);
+    --uc-warning-icon-bgcolor: #ffa436;
   }
   @media (-moz-toolbar-prefers-color-scheme: dark), (prefers-color-scheme: dark) {
     :host,
@@ -1222,6 +1223,13 @@
       --in-content-link-color-visited: var(--in-content-link-color);
       --card-outline-color: var(--grey-60);
       --dialog-warning-text-color: var(--red-40);
+      --uc-warning-icon-bgcolor: #ffbd4f;
+    }
+  }
+  @media (prefers-contrast) {
+    :host,
+    :root {
+      --uc-warning-icon-bgcolor: var(--in-content-page-color);
     }
   }
   @supports -moz-bool-pref("userChrome.theme.proton_color.dark_blue_accent") {
@@ -2742,6 +2750,13 @@
       }
     }
   }
+  #sanitizeEverythingWarningIcon {
+    list-style-image: url("chrome://global/skin/icons/warning.svg") !important;
+    -moz-context-properties: fill;
+    fill: var(--uc-warning-icon-bgcolor);
+    width: 48px;
+    height: 48px;
+  }
 }
 /*= Monospace ================================================================*/
 @supports -moz-bool-pref("userChrome.theme.monospace") {
diff --git a/css/leptonContent.css b/css/leptonContent.css
index 2986b09..38d02a5 100644
--- a/css/leptonContent.css
+++ b/css/leptonContent.css
@@ -674,6 +674,7 @@
       --card-shadow: var(--shadow-10);
       --card-outline-color: var(--grey-30);
       --card-shadow-hover: var(--card-shadow), 0 0 0 5px var(--card-outline-color);
+      --uc-warning-icon-bgcolor: #ffa436;
     }
     @media (-moz-toolbar-prefers-color-scheme: dark), (prefers-color-scheme: dark) {
       :host,
@@ -710,6 +711,13 @@
         --in-content-link-color-visited: var(--in-content-link-color);
         --card-outline-color: var(--grey-60);
         --dialog-warning-text-color: var(--red-40);
+        --uc-warning-icon-bgcolor: #ffbd4f;
+      }
+    }
+    @media (prefers-contrast) {
+      :host,
+      :root {
+        --uc-warning-icon-bgcolor: var(--in-content-page-color);
       }
     }
     @supports -moz-bool-pref("userContent.page.proton_color.dark_blue_accent") {
@@ -2013,20 +2021,10 @@
     #sanitizeEverythingWarningIcon {
       list-style-image: url("chrome://global/skin/icons/warning.svg") !important;
       -moz-context-properties: fill;
-      fill: #ffa436;
+      fill: var(--uc-warning-icon-bgcolor);
       width: 48px;
       height: 48px;
     }
-    @media (-moz-toolbar-prefers-color-scheme: dark), (prefers-color-scheme: dark) {
-      #sanitizeEverythingWarningIcon {
-        fill: #ffbd4f;
-      }
-    }
-    @media (prefers-contrast) {
-      #sanitizeEverythingWarningIcon {
-        fill: var(--in-content-page-color);
-      }
-    }
   }
   /*= chrome://browser/content/places/places.xhtml =============================*/
   @-moz-document url("chrome://browser/content/places/places.xhtml")
diff --git a/src/contents/proton_contents/_about_preferences.scss b/src/contents/proton_contents/_about_preferences.scss
index 9e29172..20e6894 100644
--- a/src/contents/proton_contents/_about_preferences.scss
+++ b/src/contents/proton_contents/_about_preferences.scss
@@ -1,17 +1,3 @@
 @include moz-document(url-prefix "chrome://browser/content") {
-  #sanitizeEverythingWarningIcon {
-    list-style-image: url("chrome://global/skin/icons/warning.svg") !important;
-    -moz-context-properties: fill;
-    // chrome://global/skin/aboutNetError.css
-    fill: #ffa436;
-    width: 48px;
-    height: 48px;
-
-    @include Dark {
-      fill: #ffbd4f;
-    }
-    @include Contrast {
-      fill: var(--in-content-page-color);
-    }
-  }
+  @import "../../theme/proton_chrome/sanitize_everything";
 }
diff --git a/src/theme/_proton_chrome.scss b/src/theme/_proton_chrome.scss
index 1babec1..c06a6a0 100644
--- a/src/theme/_proton_chrome.scss
+++ b/src/theme/_proton_chrome.scss
@@ -2,3 +2,4 @@
 @import "proton_chrome/cert";
 @import "proton_chrome/page_info";
 @import "proton_chrome/library_popup";
+@import "proton_chrome/sanitize_everything";
diff --git a/src/theme/_proton_color.scss b/src/theme/_proton_color.scss
index 27f547a..b1e9d6c 100644
--- a/src/theme/_proton_color.scss
+++ b/src/theme/_proton_color.scss
@@ -107,11 +107,13 @@
   --card-shadow: var(--shadow-10);
   --card-outline-color: var(--grey-30);
   --card-shadow-hover: var(--card-shadow), 0 0 0 5px var(--card-outline-color);
-}
 
-@include Dark {
-  :host,
-  :root {
+  // Lepton color
+  // https://github.com/mozilla/gecko-dev/blob/master/browser/themes/shared/toolbarbutton-icons.css
+  // https://github.com/mozilla/gecko-dev/blob/master/toolkit/themes/shared/aboutNetError.css
+  --uc-warning-icon-bgcolor: #ffa436; // or #fcd100
+
+  @include Dark {
     /* Keep these in sync with layout/base/PresShell.cpp, and plaintext.css */
     --in-content-page-background: rgb(28, 27, 34);
     --in-content-page-color: rgb(251, 251, 254);
@@ -154,5 +156,12 @@
     --card-outline-color: var(--grey-60);
 
     --dialog-warning-text-color: var(--red-40);
+
+    // Lepton color
+    --uc-warning-icon-bgcolor: #ffbd4f;
+  }
+
+  @include Contrast {
+    --uc-warning-icon-bgcolor: var(--in-content-page-color);
   }
 }
diff --git a/src/theme/proton_chrome/_sanitize_everything.scss b/src/theme/proton_chrome/_sanitize_everything.scss
new file mode 100644
index 0000000..288ce1c
--- /dev/null
+++ b/src/theme/proton_chrome/_sanitize_everything.scss
@@ -0,0 +1,8 @@
+#sanitizeEverythingWarningIcon {
+  list-style-image: url("chrome://global/skin/icons/warning.svg") !important;
+  -moz-context-properties: fill;
+  fill: var(--uc-warning-icon-bgcolor);
+
+  width: 48px;
+  height: 48px;
+}

From aea8634fc7fc71418e80c1dfc76f09610ab2a68d Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Sun, 5 Mar 2023 21:58:11 +0900
Subject: [PATCH 26/46] Fix: Proton Color - Provide for `chrome://` #659

---
 css/leptonContent.css           | 4 ++--
 src/contents/_monospace.scss    | 4 ++--
 src/contents/_proton_color.scss | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/css/leptonContent.css b/css/leptonContent.css
index 38d02a5..cd543f9 100644
--- a/css/leptonContent.css
+++ b/css/leptonContent.css
@@ -567,7 +567,7 @@
 /** Fully Dark Mode ***********************************************************/
 /*= Fully Dark Mode - Dark Mode Colors =======================================*/
 @supports -moz-bool-pref("userContent.page.proton_color") {
-  @-moz-document url-prefix("about:"), url-prefix("chrome://browser/content/places/places.xhtml"), url-prefix("https://addons.mozilla.org"), url-prefix("https://support.mozilla.org"), url-prefix("https://accounts.firefox.com"), url-prefix("view-source"), regexp("^(((jar:)?file:///)|(chrome://)).*/$")
+  @-moz-document url-prefix("about:"), url-prefix("chrome://"), url-prefix("https://addons.mozilla.org"), url-prefix("https://support.mozilla.org"), url-prefix("https://accounts.firefox.com"), url-prefix("view-source"), regexp("^((jar:)?file:///).*/$")
   {
     /*= Default Colors - Hard Coded ==============================================*/
     /* Based on chrome://global/skin/in-content/common.css */
@@ -2938,7 +2938,7 @@
 }
 /** Monospace *****************************************************************/
 @supports -moz-bool-pref("userContent.page.monospace") {
-  @-moz-document url-prefix("about:"), url-prefix("chrome://browser/content/places/places.xhtml"), regexp("^(((jar:)?file:///)|(chrome://)).*/$")
+  @-moz-document url-prefix("about:"), url-prefix("chrome://"), regexp("^((jar:)?file:///).*/$")
   {
     * {
       font-family: -moz-fixed;
diff --git a/src/contents/_monospace.scss b/src/contents/_monospace.scss
index ddd32d8..c8499b2 100644
--- a/src/contents/_monospace.scss
+++ b/src/contents/_monospace.scss
@@ -1,7 +1,7 @@
 @include moz-document(
   url-prefix "about:",
-  url-prefix "chrome://browser/content/places/places.xhtml",
-  regexp "^(((jar:)?file:\/\/\/)|(chrome:\/\/)).*\/$"
+  url-prefix "chrome://",
+  regexp "^((jar:)?file:\/\/\/).*\/$"
 ) {
   @import "../theme/monospace";
 }
diff --git a/src/contents/_proton_color.scss b/src/contents/_proton_color.scss
index 97adcaf..62dfe9c 100644
--- a/src/contents/_proton_color.scss
+++ b/src/contents/_proton_color.scss
@@ -1,11 +1,11 @@
 @include moz-document(
   url-prefix "about:",
-  url-prefix "chrome://browser/content/places/places.xhtml",
+  url-prefix "chrome://",
   url-prefix "https://addons.mozilla.org",
   url-prefix "https://support.mozilla.org",
   url-prefix "https://accounts.firefox.com",
   url-prefix "view-source",
-  regexp "^(((jar:)?file:\/\/\/)|(chrome:\/\/)).*\/$"
+  regexp "^((jar:)?file:\/\/\/).*\/$"
 ) {
   @import "../theme/proton_color";
 

From 7d1a086121630db3e04ec385599a370a3a5a69b8 Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Mon, 6 Mar 2023 07:30:50 +0900
Subject: [PATCH 27/46] Fix: Icons - Linux Bookmark padding #658

---
 css/leptonChrome.css                 | 7 ++++---
 css/leptonContent.css                | 1 +
 src/icons/layout/_bookmark_menu.scss | 8 +++-----
 src/icons/layout/_menu_common.scss   | 4 ++++
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index 820b514..be695ee 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -10667,6 +10667,7 @@
     @media (-moz-gtk-csd-available) {
       :root {
         --context-menu-background-padding-default: 6px;
+        --context-menu-text-padding: 21px;
       }
       #main-menubar > menu > .menubar-text {
         padding-inline-start: 3px;
@@ -10776,20 +10777,20 @@
       /* Bookmark Popup - Iconic menu */
       #BMB_bookmarksPopup .menu-iconic-text,
       #PersonalToolbar menupopup[placespopup="true"] .bookmark-item .menu-iconic-text {
-        padding-inline-start: 1px !important;
+        margin-inline-start: -1px !important;
       }
       /* Bookmark Popup - None icon menu */
       menupopup:is(#BMB_bookmarksPopup) menuitem:not(.menuitem-iconic, [disabled="true"]),
       menupopup:is(#BMB_bookmarksPopup) menu:not(.menu-iconic),
       #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
       #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) {
-        padding-inline-start: calc(var(--arrowpanel-menuitem-padding-inline) + 1px) !important;
+        padding-inline-start: calc(var(--context-menu-background-padding) + 2px) !important;
       }
       menupopup:is(#BMB_bookmarksPopup) menuitem:not(.menuitem-iconic, [disabled="true"]) .menu-text,
       menupopup:is(#BMB_bookmarksPopup) 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 {
-        margin-inline-start: 21px !important;
+        margin-inline-start: var(--context-menu-text-padding) !important;
       }
     }
     @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") {
diff --git a/css/leptonContent.css b/css/leptonContent.css
index cd543f9..adf594c 100644
--- a/css/leptonContent.css
+++ b/css/leptonContent.css
@@ -3097,6 +3097,7 @@
       @media (-moz-gtk-csd-available) {
         :root {
           --context-menu-background-padding-default: 6px;
+          --context-menu-text-padding: 21px;
         }
         /* Contextmenu Checkbox Unset */
         menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) menuitem[type="checkbox"] {
diff --git a/src/icons/layout/_bookmark_menu.scss b/src/icons/layout/_bookmark_menu.scss
index 8f950c4..1c801b4 100644
--- a/src/icons/layout/_bookmark_menu.scss
+++ b/src/icons/layout/_bookmark_menu.scss
@@ -96,16 +96,14 @@ $_bookmarkToolbarMenus: selector.nest(
   /* Bookmark Popup - Iconic menu */
   #BMB_bookmarksPopup .menu-iconic-text,
   #PersonalToolbar menupopup[placespopup="true"] .bookmark-item .menu-iconic-text {
-    padding-inline-start: 1px !important;
+    margin-inline-start: -1px !important;
   }
   /* Bookmark Popup - None icon menu */
   @include _layoutBookmarkMenu() {
-    padding-inline-start: calc(var(--arrowpanel-menuitem-padding-inline) + 1px) !important;
+    padding-inline-start: calc(var(--context-menu-background-padding) + 2px) !important;
 
     .menu-text {
-      // https://github.com/mozilla/gecko-dev/commit/e54707888510dec75db59a170b287d1db031505a
-      // https://github.com/mozilla/gecko-dev/blob/e54707888510dec75db59a170b287d1db031505a/toolkit/themes/linux/global/menu.css#L103
-      margin-inline-start: 21px !important;
+      margin-inline-start: var(--context-menu-text-padding) !important;
     }
   }
 }
diff --git a/src/icons/layout/_menu_common.scss b/src/icons/layout/_menu_common.scss
index 8da4b92..80325e4 100644
--- a/src/icons/layout/_menu_common.scss
+++ b/src/icons/layout/_menu_common.scss
@@ -143,6 +143,10 @@ $_initialMenus: selector.append(
 @mixin _layout_root_linux() {
   :root {
     --context-menu-background-padding-default: 6px;
+
+    // https://github.com/mozilla/gecko-dev/commit/e54707888510dec75db59a170b287d1db031505a
+    // https://github.com/mozilla/gecko-dev/blob/e54707888510dec75db59a170b287d1db031505a/toolkit/themes/linux/global/menu.css#L103
+    --context-menu-text-padding: 21px;
   }
 }
 @mixin _layout_init_linux() {

From 1c9a000049fe01d845ce6c6ca873a41fa207b28f Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Tue, 7 Mar 2023 13:54:26 +0900
Subject: [PATCH 28/46] Fix: Icons - Windows Bookmark Padding #658

---
 __tests__/native_menu.test.scss      |  6 ++
 css/leptonChrome.css                 | 86 ++++++++++++++++------------
 css/leptonContent.css                | 18 +++++-
 src/icons/layout/_bookmark_menu.scss | 36 ++++--------
 src/icons/layout/_menu.scss          |  1 +
 src/icons/layout/_menu_common.scss   | 32 +++++++++--
 src/utils/_native_menu.scss          |  6 ++
 7 files changed, 115 insertions(+), 70 deletions(-)

diff --git a/__tests__/native_menu.test.scss b/__tests__/native_menu.test.scss
index ba7189b..e0c7901 100644
--- a/__tests__/native_menu.test.scss
+++ b/__tests__/native_menu.test.scss
@@ -15,6 +15,9 @@
         @include native_menu.Win10_NativeMenu {
           @include example;
         }
+        @include native_menu.Win10_NonNativeMenu {
+          @include example;
+        }
       }
       @include expect {
         @supports -moz-bool-pref("widget.macos.native-context-menus") or -moz-bool-pref("widget.gtk.native-context-menus") {
@@ -27,6 +30,9 @@
         @media not (-moz-windows-non-native-menus) {
           @include example;
         }
+        @media (-moz-windows-non-native-menus) {
+          @include example;
+        }
       }
     }
   }
diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index be695ee..af1806a 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -10545,6 +10545,30 @@
       }
     }
     /* Padding - Windows */
+    @media (-moz-os-version: windows-win7),
+      (-moz-platform: windows-win7),
+      (-moz-os-version: windows-win8),
+      (-moz-platform: windows-win8),
+      (-moz-os-version: windows-win10),
+      (-moz-platform: windows-win10) {
+      :root {
+        --bookmark-menu-icon-text-padding: calc(
+          var(--context-menu-text-padding) + var(--arrowpanel-menuitem-padding-inline)
+        );
+        --bookmark-menu-icon-background-padding: calc(
+          var(--arrowpanel-menuitem-padding-inline) + var(--bookmark-menu-icon-align-padding)
+        );
+      }
+    }
+    @media (-moz-os-version: windows-win7),
+      (-moz-platform: windows-win7),
+      (-moz-os-version: windows-win8),
+      (-moz-platform: windows-win8) {
+      :root {
+        --context-menu-text-padding: calc(1.45em + 8px);
+        --bookmark-menu-icon-align-padding: calc((1.45em - 16px) / 2 + 1px);
+      }
+    }
     @media (-moz-os-version: windows-win7), (-moz-platform: windows-win7) {
       :root {
         --context-menu-background-padding-default: 2px;
@@ -10590,15 +10614,22 @@
     @media (-moz-os-version: windows-win10), (-moz-platform: windows-win10) {
       :root {
         --context-menu-background-padding: 1em;
-        --context-menu-text-padding: 24px; /* 16px + 8px */
+        --context-menu-text-padding: 24px;
         --menu-background-padding-default: calc(
           var(--context-menu-background-padding) + var(--context-menu-text-padding)
         );
       }
+      @media (-moz-windows-non-native-menus) {
+        :root {
+          --bookmark-menu-icon-align-padding: 0px;
+        }
+      }
       @media not (-moz-windows-non-native-menus) {
         :root {
           --context-menu-background-padding: 3px;
           --menu-background-padding-default: 0px;
+          --context-menu-text-padding: calc(1.45em + 8px);
+          --bookmark-menu-icon-align-padding: calc((1.45em - 16px) / 2 + 1px);
         }
         @supports -moz-bool-pref("userChrome.compatibility.os.win11") {
           :root {
@@ -10722,6 +10753,23 @@
     #PersonalToolbar {
       --context-menu-background-padding: var(--arrowpanel-menuitem-padding-inline);
     }
+    /* Windows */
+    @media (-moz-os-version: windows-win7),
+      (-moz-platform: windows-win7),
+      (-moz-os-version: windows-win8),
+      (-moz-platform: windows-win8),
+      (-moz-os-version: windows-win10),
+      (-moz-platform: windows-win10) {
+      /* Bookmark Popup - None icon menu */
+      menupopup:is(#BMB_bookmarksPopup) menuitem:not(.menuitem-iconic, [disabled="true"]),
+      menupopup:is(#BMB_bookmarksPopup) menu:not(.menu-iconic),
+      #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
+      #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) {
+        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;
+      }
+    }
     /* Windows 7, 8 */
     @media (-moz-os-version: windows-win7),
       (-moz-platform: windows-win7),
@@ -10731,42 +10779,6 @@
       menupopup:is(#goPopup, #historyMenuPopup, #bookmarksMenuPopup) .bookmark-item {
         padding-inline-start: 0 !important;
       }
-      /* Bookmark Popup - None icon menu */
-      #BMB_bookmarksPopup,
-      #PersonalToolbar {
-        --arrowpanel-menuicon-padding: 9px;
-      }
-      menupopup:is(#BMB_bookmarksPopup) menuitem:not(.menuitem-iconic, [disabled="true"]),
-      menupopup:is(#BMB_bookmarksPopup) menu:not(.menu-iconic),
-      #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
-      #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) {
-        margin-inline: var(--arrowpanel-menuitem-padding-inline) !important;
-        background-position: var(--uc-menu-background-position) calc(var(--arrowpanel-menuicon-padding)) center !important;
-      }
-      menupopup:is(#BMB_bookmarksPopup) menuitem:not(.menuitem-iconic, [disabled="true"]),
-      menupopup:is(#BMB_bookmarksPopup) menu:not(.menu-iconic) {
-        padding-inline-start: calc(
-          var(--arrowpanel-menuicon-padding) + var(--context-menu-text-padding) + 2px
-        ) !important;
-      }
-      #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
-      #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) {
-        padding-inline-start: var(--arrowpanel-menuicon-padding) !important;
-      }
-    }
-    /* Windows */
-    @media (-moz-os-version: windows-win10), (-moz-platform: windows-win10) {
-      /* Bookmark Popup - None icon menu */
-      menupopup:is(#BMB_bookmarksPopup) menuitem:not(.menuitem-iconic, [disabled="true"]),
-      menupopup:is(#BMB_bookmarksPopup) menu:not(.menu-iconic),
-      #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
-      #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) {
-        margin-inline-start: var(--arrowpanel-menuitem-margin-inline) !important;
-        padding-inline-start: calc(
-          var(--arrowpanel-menuitem-padding-inline) + var(--context-menu-text-padding)
-        ) !important;
-        background-position: var(--uc-menu-background-position) var(--arrowpanel-menuitem-padding-inline) center !important;
-      }
     }
     /* Linux */
     @media (-moz-gtk-csd-available) {
diff --git a/css/leptonContent.css b/css/leptonContent.css
index adf594c..73af080 100644
--- a/css/leptonContent.css
+++ b/css/leptonContent.css
@@ -2999,6 +2999,15 @@
         padding-inline-start: var(--context-menu-background-padding) !important;
       }
       /* Padding - Windows */
+      @media (-moz-os-version: windows-win7),
+        (-moz-platform: windows-win7),
+        (-moz-os-version: windows-win8),
+        (-moz-platform: windows-win8) {
+        :root {
+          --context-menu-text-padding: calc(1.45em + 8px);
+          --bookmark-menu-icon-align-padding: calc((1.45em - 16px) / 2 + 1px);
+        }
+      }
       @media (-moz-os-version: windows-win7), (-moz-platform: windows-win7) {
         :root {
           --context-menu-background-padding-default: 2px;
@@ -3032,15 +3041,22 @@
       @media (-moz-os-version: windows-win10), (-moz-platform: windows-win10) {
         :root {
           --context-menu-background-padding: 1em;
-          --context-menu-text-padding: 24px; /* 16px + 8px */
+          --context-menu-text-padding: 24px;
           --menu-background-padding-default: calc(
             var(--context-menu-background-padding) + var(--context-menu-text-padding)
           );
         }
+        @media (-moz-windows-non-native-menus) {
+          :root {
+            --bookmark-menu-icon-align-padding: 0px;
+          }
+        }
         @media not (-moz-windows-non-native-menus) {
           :root {
             --context-menu-background-padding: 3px;
             --menu-background-padding-default: 0px;
+            --context-menu-text-padding: calc(1.45em + 8px);
+            --bookmark-menu-icon-align-padding: calc((1.45em - 16px) / 2 + 1px);
           }
           @supports -moz-bool-pref("userChrome.compatibility.os.win11") {
             :root {
diff --git a/src/icons/layout/_bookmark_menu.scss b/src/icons/layout/_bookmark_menu.scss
index 1c801b4..dd9c33b 100644
--- a/src/icons/layout/_bookmark_menu.scss
+++ b/src/icons/layout/_bookmark_menu.scss
@@ -52,38 +52,22 @@ $_bookmarkToolbarMenus: selector.nest(
 
 //------------------------------------------------------------------------------
 
+/* Windows */
+@include OS($win) {
+  /* Bookmark Popup - None icon menu */
+  @include _layoutBookmarkMenu() {
+    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;
+  }
+}
+
 /* Windows 7, 8 */
 @include OS($win7, $win8) {
   /* Global Menu */
   menupopup:is(#goPopup, #historyMenuPopup, #bookmarksMenuPopup) .bookmark-item {
     padding-inline-start: 0 !important;
   }
-
-  /* Bookmark Popup - None icon menu */
-  #BMB_bookmarksPopup,
-  #PersonalToolbar {
-    --arrowpanel-menuicon-padding: 9px;
-  }
-  @include _layoutBookmarkMenu() {
-    margin-inline: var(--arrowpanel-menuitem-padding-inline) !important;
-    background-position: var(--uc-menu-background-position) calc(var(--arrowpanel-menuicon-padding)) center !important;
-  }
-  @include _layoutBookmarkPopup() {
-    padding-inline-start: calc(var(--arrowpanel-menuicon-padding) + var(--context-menu-text-padding) + 2px) !important;
-  }
-  @include _layoutBookmarkToolbar() {
-    padding-inline-start: var(--arrowpanel-menuicon-padding) !important;
-  }
-}
-
-/* Windows */
-@include OS($win10) {
-  /* Bookmark Popup - None icon menu */
-  @include _layoutBookmarkMenu() {
-    margin-inline-start: var(--arrowpanel-menuitem-margin-inline) !important;
-    padding-inline-start: calc(var(--arrowpanel-menuitem-padding-inline) + var(--context-menu-text-padding)) !important;
-    background-position: var(--uc-menu-background-position) var(--arrowpanel-menuitem-padding-inline) center !important;
-  }
 }
 
 /* Linux */
diff --git a/src/icons/layout/_menu.scss b/src/icons/layout/_menu.scss
index b0b8baf..a4cadec 100644
--- a/src/icons/layout/_menu.scss
+++ b/src/icons/layout/_menu.scss
@@ -79,6 +79,7 @@ $_layoutCommonMenus: (
 }
 
 /* Padding - Windows */
+@include _layout_root_win;
 @include _layout_root_win7_8;
 @include OS($win7, $win8) {
   @include _layoutIconMenus {
diff --git a/src/icons/layout/_menu_common.scss b/src/icons/layout/_menu_common.scss
index 80325e4..4ab2582 100644
--- a/src/icons/layout/_menu_common.scss
+++ b/src/icons/layout/_menu_common.scss
@@ -76,17 +76,32 @@ $_initialMenus: selector.append(
   padding-inline-start: var(--context-menu-background-padding) !important;
 }
 
+@mixin _layout_win_native_context_text_padding() {
+  --context-menu-text-padding: calc(1.45em + 8px);
+  --bookmark-menu-icon-align-padding: calc((1.45em - 16px) / 2 + 1px);
+}
+
+@mixin _layout_root_win() {
+  :root {
+    @include OS($win) {
+      --bookmark-menu-icon-text-padding: calc(var(--context-menu-text-padding) + var(--arrowpanel-menuitem-padding-inline));
+      --bookmark-menu-icon-background-padding: calc(var(--arrowpanel-menuitem-padding-inline) + var(--bookmark-menu-icon-align-padding));
+    }
+  }
+}
+
 @mixin _layout_root_win7_8() {
-  @include OS($win7) {
-    :root {
+  :root {
+    @include OS($win7, $win8) {
+      @include _layout_win_native_context_text_padding;
+    }
+    @include OS($win7) {
       --context-menu-background-padding-default: 2px;
       @media (-moz-windows-classic) {
         --context-menu-background-padding-default: -0.5px;
       }
     }
-  }
-  @include OS($win8) {
-    :root {
+    @include OS($win8) {
       --context-menu-background-padding-default: 3px;
     }
   }
@@ -99,13 +114,18 @@ $_initialMenus: selector.append(
 @mixin _layout_root_win10() {
   :root {
     --context-menu-background-padding: 1em;
-    --context-menu-text-padding: 24px; /* 16px + 8px */
+    --context-menu-text-padding: #{ 16px + 8px };
     --menu-background-padding-default: calc(var(--context-menu-background-padding) + var(--context-menu-text-padding));
+
+    @include Win10_NonNativeMenu() {
+      --bookmark-menu-icon-align-padding: 0px;
+    }
   }
   @include Win10_NativeMenu() {
     :root {
       --context-menu-background-padding: 3px;
       --menu-background-padding-default: 0px;
+      @include _layout_win_native_context_text_padding;
       @include Option("userChrome.compatibility.os.win11") {
         --context-menu-background-padding: 5px;
       }
diff --git a/src/utils/_native_menu.scss b/src/utils/_native_menu.scss
index 66ac8ce..d9eb33f 100644
--- a/src/utils/_native_menu.scss
+++ b/src/utils/_native_menu.scss
@@ -18,3 +18,9 @@
     @content;
   }
 }
+
+@mixin Win10_NonNativeMenu() {
+  @media (-moz-windows-non-native-menus) {
+    @content;
+  }
+}

From 5cf4f049aa17ecefdf700dacb742ae2a45662f2d Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Wed, 8 Mar 2023 10:25:28 +0900
Subject: [PATCH 29/46] Fix: Icons - Exclude `.in-menulist` Popup #627

---
 css/leptonChrome.css               | 42 ++++++++++++++++++------------
 css/leptonContent.css              |  6 +++--
 src/icons/layout/_menu_common.scss |  5 ++--
 3 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index af1806a..ec64de1 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -10452,9 +10452,11 @@
     /* Icon */
     #main-menubar > menu,
     :not(menu, #ContentSelectDropdown)
-      > menupopup
+      > menupopup:not(.in-menulist)
       > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
-    :not(menu, #ContentSelectDropdown) > menupopup > menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+    :not(menu, #ContentSelectDropdown)
+      > menupopup:not(.in-menulist)
+      > menu:not(.menu-iconic, .in-menulist, [checked="true"]),
     menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup)
       menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
     menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup)
@@ -10484,9 +10486,11 @@
     /* For native context menus */
     @supports -moz-bool-pref("widget.macos.native-context-menus") or -moz-bool-pref("widget.gtk.native-context-menus") {
       :not(menu, #ContentSelectDropdown)
-        > menupopup
+        > menupopup:not(.in-menulist)
         > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
-      :not(menu, #ContentSelectDropdown) > menupopup > menu:not(.menu-iconic, .in-menulist, [checked="true"]) {
+      :not(menu, #ContentSelectDropdown)
+        > menupopup:not(.in-menulist)
+        > menu:not(.menu-iconic, .in-menulist, [checked="true"]) {
         list-style-image: var(--menuitem-image, url("../icons/blank.svg")) !important;
       }
     }
@@ -10499,13 +10503,15 @@
     :root:-moz-locale-dir(rtl) {
       --uc-menu-background-position: right;
     }
-    :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menuitem:not(.menuitem-iconic),
-    :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menu:not(.menu-iconic),
     :not(menu, #ContentSelectDropdown, #context-navigation)
-      > menupopup
+      > menupopup:not(.in-menulist)
+      > menuitem:not(.menuitem-iconic),
+    :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup:not(.in-menulist) > menu:not(.menu-iconic),
+    :not(menu, #ContentSelectDropdown, #context-navigation)
+      > menupopup:not(.in-menulist)
       > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
     :not(menu, #ContentSelectDropdown, #context-navigation)
-      > menupopup
+      > menupopup:not(.in-menulist)
       > menu:not(.menu-iconic, .in-menulist, [checked="true"]),
     menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup)
       menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
@@ -10589,10 +10595,10 @@
       (-moz-os-version: windows-win8),
       (-moz-platform: windows-win8) {
       :not(menu, #ContentSelectDropdown, #context-navigation)
-        > menupopup
+        > menupopup:not(.in-menulist)
         > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
       :not(menu, #ContentSelectDropdown, #context-navigation)
-        > menupopup
+        > menupopup:not(.in-menulist)
         > menu:not(.menu-iconic, .in-menulist, [checked="true"]),
       menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup)
         menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
@@ -10672,10 +10678,10 @@
         }
       }
       :not(menu, #ContentSelectDropdown, #context-navigation)
-        > menupopup
+        > menupopup:not(.in-menulist)
         > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
       :not(menu, #ContentSelectDropdown, #context-navigation)
-        > menupopup
+        > menupopup:not(.in-menulist)
         > menu:not(.menu-iconic, .in-menulist, [checked="true"]),
       menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup)
         menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
@@ -10712,21 +10718,23 @@
       }
       /* context menu width */
       :not(menu, #ContentSelectDropdown, #context-navigation)
-        > menupopup
+        > menupopup:not(.in-menulist)
         > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
       :not(menu, #ContentSelectDropdown, #context-navigation)
-        > menupopup
+        > menupopup:not(.in-menulist)
         > menu:not(.menu-iconic, .in-menulist, [checked="true"]),
       #blockedPopupDontShowMessage {
         padding-inline-end: var(--context-menu-background-padding) !important;
       }
       /* text position */
-      :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menuitem > .menu-text,
-      :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menu > .menu-text {
+      :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup:not(.in-menulist) > menuitem > .menu-text,
+      :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup:not(.in-menulist) > menu > .menu-text {
         padding-inline-start: var(--context-menu-mac-padding) !important;
       }
       /* Checkbox menuitem, None iconic menu */
-      :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menuitem[type="checkbox"] {
+      :not(menu, #ContentSelectDropdown, #context-navigation)
+        > menupopup:not(.in-menulist)
+        > menuitem[type="checkbox"] {
         padding-inline-start: calc(var(--context-menu-background-padding) + var(--context-menu-mac-padding)) !important;
       }
       /* Global Menu */
diff --git a/css/leptonContent.css b/css/leptonContent.css
index 73af080..1f33559 100644
--- a/css/leptonContent.css
+++ b/css/leptonContent.css
@@ -2973,9 +2973,11 @@
       /* For native context menus */
       @supports -moz-bool-pref("widget.macos.native-context-menus") or -moz-bool-pref("widget.gtk.native-context-menus") {
         :not(menu, #ContentSelectDropdown)
-          > menupopup
+          > menupopup:not(.in-menulist)
           > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
-        :not(menu, #ContentSelectDropdown) > menupopup > menu:not(.menu-iconic, .in-menulist, [checked="true"]) {
+        :not(menu, #ContentSelectDropdown)
+          > menupopup:not(.in-menulist)
+          > menu:not(.menu-iconic, .in-menulist, [checked="true"]) {
           list-style-image: var(--menuitem-image, url("../icons/blank.svg")) !important;
         }
       }
diff --git a/src/icons/layout/_menu_common.scss b/src/icons/layout/_menu_common.scss
index 4ab2582..42bcf40 100644
--- a/src/icons/layout/_menu_common.scss
+++ b/src/icons/layout/_menu_common.scss
@@ -8,8 +8,9 @@ $_iconMenuitem: "menuitem:not(.menuitem-iconic, .bookmark-item, #{$_iconNoneComm
 $_iconMenu: "menu:not(.menu-iconic, #{$_iconNoneCommon})";
 
 // Components
-$_nestedPopupIcon: ":not(menu, #ContentSelectDropdown) > menupopup >";
-$_nestedPopupPadding: ":not(menu, #ContentSelectDropdown, #context-navigation) > menupopup >";
+$_nestedPopup: "> menupopup:not(.in-menulist) >";
+$_nestedPopupIcon: ":not(menu, #ContentSelectDropdown) #{$_nestedPopup}";
+$_nestedPopupPadding: ":not(menu, #ContentSelectDropdown, #context-navigation) #{$_nestedPopup}";
 $_iconMenuPopup: "menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup)";
 
 $_nestedPopupIconMenus: selector.nest(

From f0ee2672384722ab8b59ec128432436c45f56f75 Mon Sep 17 00:00:00 2001
From: 2641a40fd44383320adde4b027a1d0b03bd550
 <58827198+2641a40fd44383320adde4b027a1d0b03bd550@users.noreply.github.com>
Date: Wed, 8 Mar 2023 11:54:32 +0500
Subject: [PATCH 30/46] Fix: Rounding - Use regex for dialog URL

---
 css/leptonContent.css       | 6 +++---
 src/contents/_rounding.scss | 9 +++------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/css/leptonContent.css b/css/leptonContent.css
index 1f33559..524fec6 100644
--- a/css/leptonContent.css
+++ b/css/leptonContent.css
@@ -2787,7 +2787,7 @@
 }
 /** Rounding ******************************************************************/
 @supports -moz-bool-pref("userChrome.rounding.square_button") {
-  @-moz-document url-prefix("about:"), url-prefix("chrome://browser/content/"), url-prefix("chrome://pippki/content/")
+  @-moz-document url-prefix("about:"), regexp("^chrome://\\w+/content/.*.xhtml$")
   {
     button,
     .close-icon,
@@ -2847,7 +2847,7 @@
   }
 }
 @supports -moz-bool-pref("userChrome.rounding.square_checklabel") {
-  @-moz-document url-prefix("about:"), url-prefix("chrome://browser/content/"), url-prefix("chrome://pippki/content/")
+  @-moz-document url-prefix("about:"), regexp("^chrome://\\w+/content/.*.xhtml$")
   {
     input[type="checkbox"]:not(.toggle-button),
     .checkbox-check {
@@ -2856,7 +2856,7 @@
   }
 }
 @supports -moz-bool-pref("userChrome.rounding.square_field") {
-  @-moz-document url-prefix("about:"), url-prefix("chrome://browser/content/"), url-prefix("chrome://pippki/content/")
+  @-moz-document url-prefix("about:"), regexp("^chrome://\\w+/content/.*.xhtml$")
   {
     input:is([type="color"], [type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]),
     textarea,
diff --git a/src/contents/_rounding.scss b/src/contents/_rounding.scss
index fb5fff7..adf493f 100644
--- a/src/contents/_rounding.scss
+++ b/src/contents/_rounding.scss
@@ -1,8 +1,7 @@
 @include Option("userChrome.rounding.square_button") {
   @include moz-document(
     url-prefix "about:",
-    url-prefix "chrome://browser/content/",
-    url-prefix "chrome://pippki/content/"
+    regexp "^chrome:\/\/\\w+\/content\/.*\.xhtml$"
   ) {
     button,
     .close-icon,
@@ -71,8 +70,7 @@
 @include Option("userChrome.rounding.square_checklabel") {
   @include moz-document(
     url-prefix "about:",
-    url-prefix "chrome://browser/content/",
-    url-prefix "chrome://pippki/content/"
+    regexp "^chrome:\/\/\\w+\/content\/.*\.xhtml$"
   ) {
     input[type="checkbox"]:not(.toggle-button),
     .checkbox-check {
@@ -84,8 +82,7 @@
 @include Option("userChrome.rounding.square_field") {
   @include moz-document(
     url-prefix "about:",
-    url-prefix "chrome://browser/content/",
-    url-prefix "chrome://pippki/content/"
+    regexp "^chrome:\/\/\\w+\/content\/.*\.xhtml$"
   ) {
     input:is([type="color"], [type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]),
     textarea,

From c8b0469c51c2f8aea1ab0c30a4c341448f2ed456 Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Thu, 9 Mar 2023 21:01:56 +0900
Subject: [PATCH 31/46] Fix: Compatibility - UI density menu at win native menu
 #649

---
 css/leptonChrome.css       | 13 +++++++++++++
 src/compatibility/_os.scss |  9 +++++++++
 2 files changed, 22 insertions(+)

diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index ec64de1..6e59800 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -314,6 +314,19 @@
       border-color: color-mix(in srgb, currentColor 80%, transparent) !important;
     }
   }
+  /*= Windows - UI Density Menu Item Padding #649 ===============================*/
+  @media (-moz-os-version: windows-win7),
+    (-moz-platform: windows-win7),
+    (-moz-os-version: windows-win8),
+    (-moz-platform: windows-win8),
+    (-moz-os-version: windows-win10),
+    (-moz-platform: windows-win10) {
+    @media not (-moz-windows-non-native-menus) {
+      .customization-uidensity-menuitem > .menu-iconic-left {
+        width: unset !important;
+      }
+    }
+  }
   /*= Windows 10 - Native Menu Active Color =====================================*/
   @media (-moz-os-version: windows-win10), (-moz-platform: windows-win10) {
     @media not (-moz-windows-non-native-menus) {
diff --git a/src/compatibility/_os.scss b/src/compatibility/_os.scss
index d5fa112..261a4cc 100644
--- a/src/compatibility/_os.scss
+++ b/src/compatibility/_os.scss
@@ -124,6 +124,15 @@
   @include _os_menuEmulate(17%, 80%);
 }
 
+/*= Windows - UI Density Menu Item Padding #649 ===============================*/
+@include OS($win) {
+  @include Win10_NativeMenu() {
+    .customization-uidensity-menuitem > .menu-iconic-left {
+      width: unset !important;
+    }
+  }
+}
+
 /*= Windows 10 - Native Menu Active Color =====================================*/
 @include OS($win10) {
   @include Win10_NativeMenu() {

From 143601deea634b1e6708d149cb3c582513969576 Mon Sep 17 00:00:00 2001
From: 2641a40fd44383320adde4b027a1d0b03bd550
 <58827198+2641a40fd44383320adde4b027a1d0b03bd550@users.noreply.github.com>
Date: Fri, 10 Mar 2023 05:26:40 +0500
Subject: [PATCH 32/46] Fix: Rounding - Firefox View #645, density menu item
 #649

---
 css/leptonChrome.css        | 3 ++-
 css/leptonContent.css       | 2 ++
 src/contents/_rounding.scss | 2 ++
 src/rounding/_square.scss   | 3 ++-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index ec64de1..7d4f838 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -3163,7 +3163,8 @@
 @supports -moz-bool-pref("userChrome.rounding.square_menuitem") {
   xul|menulist:not([native]),
   xul|menulist > xul|menupopup xul|menu,
-  xul|menulist > xul|menupopup xul|menuitem {
+  xul|menulist > xul|menupopup xul|menuitem,
+  .customization-uidensity-menuitem {
     border-radius: 0 !important;
   }
 }
diff --git a/css/leptonContent.css b/css/leptonContent.css
index 524fec6..6663c0f 100644
--- a/css/leptonContent.css
+++ b/css/leptonContent.css
@@ -2793,6 +2793,8 @@
     .close-icon,
     .action-icon::before,
     .web-appearance-choice,
+    .page-section-header > .twisty,
+    .closed-tab-li-main,
     #categories > .category,
     .sidebar-footer-link {
       border-radius: 0 !important;
diff --git a/src/contents/_rounding.scss b/src/contents/_rounding.scss
index adf493f..b0452d1 100644
--- a/src/contents/_rounding.scss
+++ b/src/contents/_rounding.scss
@@ -7,6 +7,8 @@
     .close-icon,
     .action-icon::before,
     .web-appearance-choice,
+    .page-section-header > .twisty,
+    .closed-tab-li-main,
     #categories > .category,
     .sidebar-footer-link {
       border-radius: 0 !important;
diff --git a/src/rounding/_square.scss b/src/rounding/_square.scss
index f978e11..6411f61 100644
--- a/src/rounding/_square.scss
+++ b/src/rounding/_square.scss
@@ -65,7 +65,8 @@
 @include Option("userChrome.rounding.square_menuitem") {
   xul|menulist:not([native]),
   xul|menulist > xul|menupopup xul|menu,
-  xul|menulist > xul|menupopup xul|menuitem {
+  xul|menulist > xul|menupopup xul|menuitem,
+  .customization-uidensity-menuitem {
     border-radius: 0 !important;
   }
 }

From 6cbfd045ad77aae857f0042a299216c065705231 Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Mon, 13 Mar 2023 08:01:22 +0900
Subject: [PATCH 33/46] Fix: Iconst - Win11 native menu height #650

---
 css/leptonChrome.css               | 22 ++++++++++++++++++++++
 css/leptonContent.css              | 12 ++++++++++++
 src/icons/layout/_menu_common.scss | 18 +++++++++++++++++-
 src/padding/_global_menubar.scss   |  6 ++++++
 4 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index d9c032d..5c8e9b2 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -3848,6 +3848,16 @@
   #main-menubar > menu > menupopup menu {
     padding-block: var(--bookmark-menu-padding) !important;
   }
+  @supports -moz-bool-pref("userChrome.compatibility.os.win11") {
+    #main-menubar > menu > menupopup menuitem,
+    #main-menubar > menu > menupopup menu {
+      --bookmark-menu-padding: 3px;
+    }
+    #main-menubar > menu > menupopup menuitem:is([type="checkbox"], [type="radio"]),
+    #main-menubar > menu > menupopup menu:is([type="checkbox"], [type="radio"]) {
+      --bookmark-menu-padding: 0px;
+    }
+  }
 }
 /*= Panel - Reduce padding ===================================================*/
 @supports -moz-bool-pref("userChrome.padding.panel") {
@@ -10655,6 +10665,18 @@
           :root {
             --context-menu-background-padding: 5px;
           }
+          #main-menubar {
+            --context-menu-background-padding: calc(5px + ((1.45em - 16px) / 2));
+          }
+          menuitem:is([type="checkbox"], [type="radio"]) {
+            --menu-padding: 0px;
+          }
+          menuitem[checked="true"] {
+            --context-menu-background-padding: 0px;
+          }
+          menuitem[checked="true"] > .menu-iconic-left {
+            transform: translateX(2px);
+          }
         }
         menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic > .menu-iconic-left,
         menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menuitem-iconic > .menu-iconic-left,
diff --git a/css/leptonContent.css b/css/leptonContent.css
index 6663c0f..addde32 100644
--- a/css/leptonContent.css
+++ b/css/leptonContent.css
@@ -3066,6 +3066,18 @@
             :root {
               --context-menu-background-padding: 5px;
             }
+            #main-menubar {
+              --context-menu-background-padding: calc(5px + ((1.45em - 16px) / 2));
+            }
+            menuitem:is([type="checkbox"], [type="radio"]) {
+              --menu-padding: 0px;
+            }
+            menuitem[checked="true"] {
+              --context-menu-background-padding: 0px;
+            }
+            menuitem[checked="true"] > .menu-iconic-left {
+              transform: translateX(2px);
+            }
           }
           menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic > .menu-iconic-left,
           menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menuitem-iconic > .menu-iconic-left,
diff --git a/src/icons/layout/_menu_common.scss b/src/icons/layout/_menu_common.scss
index 42bcf40..8bb595a 100644
--- a/src/icons/layout/_menu_common.scss
+++ b/src/icons/layout/_menu_common.scss
@@ -127,9 +127,25 @@ $_initialMenus: selector.append(
       --context-menu-background-padding: 3px;
       --menu-background-padding-default: 0px;
       @include _layout_win_native_context_text_padding;
-      @include Option("userChrome.compatibility.os.win11") {
+    }
+    @include Option("userChrome.compatibility.os.win11") {
+      :root {
         --context-menu-background-padding: 5px;
       }
+      #main-menubar {
+        --context-menu-background-padding: calc(5px + ((1.45em - 16px) / 2));
+      }
+      menuitem {
+        &:is([type="checkbox"], [type="radio"]) {
+          --menu-padding: 0px;
+        }
+        &[checked="true"] {
+          --context-menu-background-padding: 0px;
+          > .menu-iconic-left {
+            transform: translateX(2px);
+          }
+        }
+      }
     }
 
     @include NativeMenuPopup {
diff --git a/src/padding/_global_menubar.scss b/src/padding/_global_menubar.scss
index 2cd1c94..05024b9 100644
--- a/src/padding/_global_menubar.scss
+++ b/src/padding/_global_menubar.scss
@@ -26,4 +26,10 @@
 #main-menubar > menu > menupopup menuitem,
 #main-menubar > menu > menupopup menu {
   padding-block: var(--bookmark-menu-padding) !important;
+  @include Option("userChrome.compatibility.os.win11") {
+    --bookmark-menu-padding: 3px;
+    &:is([type="checkbox"], [type="radio"]) {
+      --bookmark-menu-padding: 0px;
+    }
+  }
 }

From 97cfd6649d8b5c9caf2a8fcc481fae3e5350aa84 Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Fri, 17 Mar 2023 04:05:48 +0900
Subject: [PATCH 34/46] Fix: Icons - Win Native Menu Active Color #650

---
 __tests__/native_menu.test.scss    |   4 +-
 css/leptonChrome.css               | 129 ++++++++++++++--------------
 src/compatibility/_os.scss         | 131 +++++++++++++++--------------
 src/icons/layout/_menu_common.scss |   4 +-
 src/utils/_native_menu.scss        |   4 +-
 5 files changed, 136 insertions(+), 136 deletions(-)

diff --git a/__tests__/native_menu.test.scss b/__tests__/native_menu.test.scss
index e0c7901..f18edc4 100644
--- a/__tests__/native_menu.test.scss
+++ b/__tests__/native_menu.test.scss
@@ -12,10 +12,10 @@
         @include native_menu.NativeMenuPopup {
           @include example;
         }
-        @include native_menu.Win10_NativeMenu {
+        @include native_menu.WinNativeMenu {
           @include example;
         }
-        @include native_menu.Win10_NonNativeMenu {
+        @include native_menu.WinNonNativeMenu {
           @include example;
         }
       }
diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index 5c8e9b2..5dc33c7 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -241,7 +241,7 @@
       color: var(--lwt-text-color) !important;
     }
   }
-  /*= Windows 7, 8 - Menu Active Color =========================================*/
+  /*= Windows 7, 8 - Menu Bar ==================================================*/
   @media (-moz-os-version: windows-win7),
     (-moz-platform: windows-win7),
     (-moz-os-version: windows-win8),
@@ -260,76 +260,73 @@
       color: inherit !important; /* Original: -moz-menubarhovertext */
       background-color: color-mix(in srgb, currentColor 20%, transparent) !important; /* Original: -moz-menuhover */
     }
-    menulist > menupopup > menuitem[_moz-menuactive="true"],
-    menulist > menupopup > menu[_moz-menuactive="true"] {
-      background-color: highlight !important;
-      color: highlighttext !important;
-    }
-    #PlacesToolbar menu,
-    #PlacesToolbar menuitem,
-    #BMB_bookmarksPopup menu,
-    #BMB_bookmarksPopup menuitem {
-      border: none !important; /* Remove border */
-    }
-    #PlacesToolbar menu:not([disabled], :active)[_moz-menuactive="true"],
-    #PlacesToolbar menuitem:not([disabled], :active)[_moz-menuactive="true"],
-    #BMB_bookmarksPopup menu:not([disabled], :active)[_moz-menuactive="true"],
-    #BMB_bookmarksPopup menuitem:not([disabled], :active)[_moz-menuactive="true"] {
-      background-color: var(--button-hover-bgcolor) !important;
-    }
   }
-  @media (-moz-os-version: windows-win7), (-moz-platform: windows-win7) {
-    @media (-moz-windows-classic: 0) {
-      menu[_moz-menuactive="true"],
-      menuitem[_moz-menuactive="true"] {
-        background-color: color-mix(in srgb, -moz-menuhover 5%, transparent) !important;
-        border-color: color-mix(in srgb, -moz-menuhover 60%, transparent) !important;
-      }
-      menu[_moz-menuactive="true"][disabled="true"],
-      menuitem[_moz-menuactive="true"][disabled="true"] {
-        background-color: color-mix(in srgb, currentColor 5%, transparent) !important;
-        border-color: color-mix(in srgb, currentColor 60%, transparent) !important;
-      }
-      /* Remove text shadow */
-      :root:-moz-lwtheme #toolbar-menubar {
-        text-shadow: unset !important;
-        /* Original: 0 0 .5em white, 0 0 .5em white, 0 1px 0 rgba(255, 255, 255, .4) */
-      }
-      /* Remove Color */
-      :root:-moz-lwtheme #main-menubar:not(:-moz-window-inactive) {
-        background-color: unset !important; /* Original: rgba(255, 255, 255, .5) */
-        color: unset !important; /* Original: black */
-      }
-    }
-  }
-  @media (-moz-os-version: windows-win8), (-moz-platform: windows-win8) {
-    menu[_moz-menuactive="true"],
-    menuitem[_moz-menuactive="true"] {
-      background-color: color-mix(in srgb, -moz-menuhover 17%, transparent) !important;
-      border-color: color-mix(in srgb, -moz-menuhover 80%, transparent) !important;
-    }
-    menu[_moz-menuactive="true"][disabled="true"],
-    menuitem[_moz-menuactive="true"][disabled="true"] {
-      background-color: color-mix(in srgb, currentColor 17%, transparent) !important;
-      border-color: color-mix(in srgb, currentColor 80%, transparent) !important;
-    }
-  }
-  /*= Windows - UI Density Menu Item Padding #649 ===============================*/
-  @media (-moz-os-version: windows-win7),
-    (-moz-platform: windows-win7),
-    (-moz-os-version: windows-win8),
-    (-moz-platform: windows-win8),
-    (-moz-os-version: windows-win10),
-    (-moz-platform: windows-win10) {
-    @media not (-moz-windows-non-native-menus) {
+  /*= Windows - Native Menu ====================================================*/
+  @media not (-moz-windows-non-native-menus) {
+    @media (-moz-os-version: windows-win7),
+      (-moz-platform: windows-win7),
+      (-moz-os-version: windows-win8),
+      (-moz-platform: windows-win8),
+      (-moz-os-version: windows-win10),
+      (-moz-platform: windows-win10) {
       .customization-uidensity-menuitem > .menu-iconic-left {
         width: unset !important;
       }
+      menulist > menupopup > menuitem[_moz-menuactive="true"],
+      menulist > menupopup > menu[_moz-menuactive="true"] {
+        background-color: highlight !important;
+        color: highlighttext !important;
+      }
+      #PlacesToolbar menu,
+      #PlacesToolbar menuitem,
+      #BMB_bookmarksPopup menu,
+      #BMB_bookmarksPopup menuitem {
+        border: none !important; /* Remove border */
+      }
+      #PlacesToolbar menu:not([disabled], :active)[_moz-menuactive="true"],
+      #PlacesToolbar menuitem:not([disabled], :active)[_moz-menuactive="true"],
+      #BMB_bookmarksPopup menu:not([disabled], :active)[_moz-menuactive="true"],
+      #BMB_bookmarksPopup menuitem:not([disabled], :active)[_moz-menuactive="true"] {
+        background-color: var(--button-hover-bgcolor) !important;
+      }
     }
-  }
-  /*= Windows 10 - Native Menu Active Color =====================================*/
-  @media (-moz-os-version: windows-win10), (-moz-platform: windows-win10) {
-    @media not (-moz-windows-non-native-menus) {
+    @media (-moz-os-version: windows-win7), (-moz-platform: windows-win7) {
+      @media (not (-moz-windows-non-native-menus)) and (-moz-windows-classic: 0) {
+        menu[_moz-menuactive="true"],
+        menuitem[_moz-menuactive="true"] {
+          background-color: color-mix(in srgb, -moz-menuhover 5%, transparent) !important;
+          border-color: color-mix(in srgb, -moz-menuhover 60%, transparent) !important;
+        }
+        menu[_moz-menuactive="true"][disabled="true"],
+        menuitem[_moz-menuactive="true"][disabled="true"] {
+          background-color: color-mix(in srgb, currentColor 5%, transparent) !important;
+          border-color: color-mix(in srgb, currentColor 60%, transparent) !important;
+        }
+        /* Remove text shadow */
+        :root:-moz-lwtheme #toolbar-menubar {
+          text-shadow: unset !important;
+          /* Original: 0 0 .5em white, 0 0 .5em white, 0 1px 0 rgba(255, 255, 255, .4) */
+        }
+        /* Remove Color */
+        :root:-moz-lwtheme #main-menubar:not(:-moz-window-inactive) {
+          background-color: unset !important; /* Original: rgba(255, 255, 255, .5) */
+          color: unset !important; /* Original: black */
+        }
+      }
+    }
+    @media (-moz-os-version: windows-win8), (-moz-platform: windows-win8) {
+      menu[_moz-menuactive="true"],
+      menuitem[_moz-menuactive="true"] {
+        background-color: color-mix(in srgb, -moz-menuhover 17%, transparent) !important;
+        border-color: color-mix(in srgb, -moz-menuhover 80%, transparent) !important;
+      }
+      menu[_moz-menuactive="true"][disabled="true"],
+      menuitem[_moz-menuactive="true"][disabled="true"] {
+        background-color: color-mix(in srgb, currentColor 17%, transparent) !important;
+        border-color: color-mix(in srgb, currentColor 80%, transparent) !important;
+      }
+    }
+    @media (-moz-os-version: windows-win10), (-moz-platform: windows-win10) {
       menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) menu[_moz-menuactive="true"],
       menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) menuitem[_moz-menuactive="true"],
       menupopup:not([placespopup="true"]) menu[_moz-menuactive="true"],
diff --git a/src/compatibility/_os.scss b/src/compatibility/_os.scss
index 261a4cc..1f3a14b 100644
--- a/src/compatibility/_os.scss
+++ b/src/compatibility/_os.scss
@@ -51,7 +51,7 @@
   }
 }
 
-/*= Windows 7, 8 - Menu Active Color =========================================*/
+/*= Windows 7, 8 - Menu Bar ==================================================*/
 @include OS($win7, $win8) {
   menupopup > menu,
   menupopup > menuitem,
@@ -68,87 +68,90 @@
     color: inherit !important; /* Original: -moz-menubarhovertext */
     background-color: color-mix(in srgb, currentColor 20%, transparent) !important; /* Original: -moz-menuhover */
   }
+}
 
-  menulist > menupopup > menuitem[_moz-menuactive="true"],
-  menulist > menupopup > menu[_moz-menuactive="true"] {
-    background-color: highlight !important;
-    color: highlighttext !important;
-  }
+/*= Windows - Native Menu ====================================================*/
+//-- Mixin ---------------------------------------------------------------------
+@mixin _os_menuEmulateActive($activeBg, $activeBd, $disabledBg, $disabledBd) {
+  menu[_moz-menuactive="true"],
+  menuitem[_moz-menuactive="true"] {
+    background-color: $activeBg !important;
+    border-color: $activeBd !important;
 
-  #PlacesToolbar menu,
-  #PlacesToolbar menuitem,
-  #BMB_bookmarksPopup menu,
-  #BMB_bookmarksPopup menuitem {
-    border: none !important; /* Remove border */
-
-    &:not([disabled], :active)[_moz-menuactive="true"] {
-      background-color: var(--button-hover-bgcolor) !important;
+    &[disabled="true"] {
+      background-color: $disabledBg !important;
+      border-color: $disabledBd !important;
     }
   }
 }
-
-//-- Mixin ---------------------------------------------------------------------
 @mixin _os_menuEmulate($bgRate, $bdRate) {
-  menu[_moz-menuactive="true"],
-  menuitem[_moz-menuactive="true"] {
-    background-color: color-mix(in srgb, -moz-menuhover $bgRate, transparent) !important;
-    border-color: color-mix(in srgb, -moz-menuhover $bdRate, transparent) !important;
-
-    &[disabled="true"] {
-      background-color: color-mix(in srgb, currentColor $bgRate, transparent) !important;
-      border-color: color-mix(in srgb, currentColor $bdRate, transparent) !important;
-    }
-  }
+  @include _os_menuEmulateActive(
+    color-mix(in srgb, -moz-menuhover $bgRate, transparent),
+    color-mix(in srgb, -moz-menuhover $bdRate, transparent),
+    color-mix(in srgb, currentColor $bgRate, transparent),
+    color-mix(in srgb, currentColor $bdRate, transparent)
+  );
 }
 
 //------------------------------------------------------------------------------
 
-@include OS($win7) {
-  @media (-moz-windows-classic: 0) {
-    @include _os_menuEmulate(5%, 60%);
-
-    /* Remove text shadow */
-    :root:-moz-lwtheme #toolbar-menubar {
-      text-shadow: unset !important;
-      /* Original: 0 0 .5em white, 0 0 .5em white, 0 1px 0 rgba(255, 255, 255, .4) */
-    }
-
-    /* Remove Color */
-    :root:-moz-lwtheme #main-menubar:not(:-moz-window-inactive) {
-      background-color: unset !important; /* Original: rgba(255, 255, 255, .5) */
-      color: unset !important; /* Original: black */
-    }
-  }
-}
-@include OS($win8) {
-  @include _os_menuEmulate(17%, 80%);
-}
-
-/*= Windows - UI Density Menu Item Padding #649 ===============================*/
-@include OS($win) {
-  @include Win10_NativeMenu() {
+@include WinNativeMenu() {
+  @include OS($win) {
+    // UI Density Menu Item Padding #649
     .customization-uidensity-menuitem > .menu-iconic-left {
       width: unset !important;
     }
-  }
-}
 
-/*= Windows 10 - Native Menu Active Color =====================================*/
-@include OS($win10) {
-  @include Win10_NativeMenu() {
-    @include NativeMenuPopup {
-      menu[_moz-menuactive="true"],
-      menuitem[_moz-menuactive="true"] {
-        background-color: #91c9f7 !important; // color-mix(in srgb, -moz-menuhover 40%, transparent)
-        border-color: transparent !important;
+    menulist > menupopup > menuitem[_moz-menuactive="true"],
+    menulist > menupopup > menu[_moz-menuactive="true"] {
+      background-color: highlight !important;
+      color: highlighttext !important;
+    }
 
-        &[disabled="true"] {
-          background-color: color-mix(in srgb, currentColor 9%, transparent) !important;
-          border-color: transparent !important;
-        }
+    #PlacesToolbar menu,
+    #PlacesToolbar menuitem,
+    #BMB_bookmarksPopup menu,
+    #BMB_bookmarksPopup menuitem {
+      border: none !important; /* Remove border */
+
+      &:not([disabled], :active)[_moz-menuactive="true"] {
+        background-color: var(--button-hover-bgcolor) !important;
       }
     }
   }
+
+  @include OS($win7) {
+    @media (-moz-windows-classic: 0) {
+      @include _os_menuEmulate(5%, 60%);
+
+      /* Remove text shadow */
+      :root:-moz-lwtheme #toolbar-menubar {
+        text-shadow: unset !important;
+        /* Original: 0 0 .5em white, 0 0 .5em white, 0 1px 0 rgba(255, 255, 255, .4) */
+      }
+
+      /* Remove Color */
+      :root:-moz-lwtheme #main-menubar:not(:-moz-window-inactive) {
+        background-color: unset !important; /* Original: rgba(255, 255, 255, .5) */
+        color: unset !important; /* Original: black */
+      }
+    }
+  }
+
+  @include OS($win8) {
+    @include _os_menuEmulate(17%, 80%);
+  }
+
+  @include OS($win10) {
+    @include NativeMenuPopup {
+      @include _os_menuEmulateActive(
+        #91c9f7, // color-mix(in srgb, -moz-menuhover 40%, transparent)
+        transparent,
+        color-mix(in srgb, currentColor 9%, transparent),
+        transparent
+      );
+    }
+  }
 }
 
 @include OS($linux) {
diff --git a/src/icons/layout/_menu_common.scss b/src/icons/layout/_menu_common.scss
index 8bb595a..a86eef7 100644
--- a/src/icons/layout/_menu_common.scss
+++ b/src/icons/layout/_menu_common.scss
@@ -118,11 +118,11 @@ $_initialMenus: selector.append(
     --context-menu-text-padding: #{ 16px + 8px };
     --menu-background-padding-default: calc(var(--context-menu-background-padding) + var(--context-menu-text-padding));
 
-    @include Win10_NonNativeMenu() {
+    @include WinNonNativeMenu() {
       --bookmark-menu-icon-align-padding: 0px;
     }
   }
-  @include Win10_NativeMenu() {
+  @include WinNativeMenu() {
     :root {
       --context-menu-background-padding: 3px;
       --menu-background-padding-default: 0px;
diff --git a/src/utils/_native_menu.scss b/src/utils/_native_menu.scss
index d9eb33f..acad4a9 100644
--- a/src/utils/_native_menu.scss
+++ b/src/utils/_native_menu.scss
@@ -13,13 +13,13 @@
   }
 }
 
-@mixin Win10_NativeMenu() {
+@mixin WinNativeMenu() {
   @media not (-moz-windows-non-native-menus) {
     @content;
   }
 }
 
-@mixin Win10_NonNativeMenu() {
+@mixin WinNonNativeMenu() {
   @media (-moz-windows-non-native-menus) {
     @content;
   }

From 8fe7e11f3a5c41f1b217a68306b35102bcbcee12 Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Fri, 17 Mar 2023 06:31:18 +0900
Subject: [PATCH 35/46] Fix: Icons - Win Native Menu Padding #650

---
 css/leptonChrome.css                 | 239 +++++++++++++--------------
 css/leptonContent.css                | 194 ++++++++++++----------
 src/icons/layout/_menu.scss          |  12 +-
 src/icons/layout/_menu_common.scss   | 159 +++++++++---------
 src/icons/layout/_menu_contents.scss |  13 +-
 5 files changed, 306 insertions(+), 311 deletions(-)

diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index 5dc33c7..bc69802 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -10586,151 +10586,148 @@
           var(--arrowpanel-menuitem-padding-inline) + var(--bookmark-menu-icon-align-padding)
         );
       }
-    }
-    @media (-moz-os-version: windows-win7),
-      (-moz-platform: windows-win7),
-      (-moz-os-version: windows-win8),
-      (-moz-platform: windows-win8) {
-      :root {
-        --context-menu-text-padding: calc(1.45em + 8px);
-        --bookmark-menu-icon-align-padding: calc((1.45em - 16px) / 2 + 1px);
-      }
-    }
-    @media (-moz-os-version: windows-win7), (-moz-platform: windows-win7) {
-      :root {
-        --context-menu-background-padding-default: 2px;
-      }
-      @media (-moz-windows-classic) {
-        :root {
-          --context-menu-background-padding-default: -0.5px;
-        }
-      }
-    }
-    @media (-moz-os-version: windows-win8), (-moz-platform: windows-win8) {
-      :root {
-        --context-menu-background-padding-default: 3px;
-      }
-    }
-    @media (-moz-os-version: windows-win7),
-      (-moz-platform: windows-win7),
-      (-moz-os-version: windows-win8),
-      (-moz-platform: windows-win8) {
-      :not(menu, #ContentSelectDropdown, #context-navigation)
-        > menupopup:not(.in-menulist)
-        > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
-      :not(menu, #ContentSelectDropdown, #context-navigation)
-        > menupopup:not(.in-menulist)
-        > menu:not(.menu-iconic, .in-menulist, [checked="true"]),
-      menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup)
-        menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
-      menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup)
-        menu:not(.menu-iconic, .in-menulist, [checked="true"]),
-      menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
-        > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
-      menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]),
-      menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup)
-        > menuitem,
-      .openintabs-menuitem,
-      #blockedPopupDontShowMessage,
-      #BMB_viewBookmarksToolbar,
-      #context_openANewTab.tabmix-newtab-menu-icon {
-        background-position: left var(--context-menu-background-padding) center !important;
-        padding-inline-start: 0 !important;
-      }
-    }
-    @media (-moz-os-version: windows-win10), (-moz-platform: windows-win10) {
-      :root {
-        --context-menu-background-padding: 1em;
-        --context-menu-text-padding: 24px;
-        --menu-background-padding-default: calc(
-          var(--context-menu-background-padding) + var(--context-menu-text-padding)
-        );
-      }
       @media (-moz-windows-non-native-menus) {
         :root {
+          --context-menu-background-padding: 1em;
+          --context-menu-text-padding: 24px;
+          --menu-background-padding-default: calc(
+            var(--context-menu-background-padding) + var(--context-menu-text-padding)
+          );
           --bookmark-menu-icon-align-padding: 0px;
         }
       }
       @media not (-moz-windows-non-native-menus) {
         :root {
-          --context-menu-background-padding: 3px;
-          --menu-background-padding-default: 0px;
           --context-menu-text-padding: calc(1.45em + 8px);
           --bookmark-menu-icon-align-padding: calc((1.45em - 16px) / 2 + 1px);
         }
-        @supports -moz-bool-pref("userChrome.compatibility.os.win11") {
+        @media (-moz-os-version: windows-win7), (-moz-platform: windows-win7) {
           :root {
-            --context-menu-background-padding: 5px;
+            --context-menu-background-padding-default: 2px;
           }
-          #main-menubar {
-            --context-menu-background-padding: calc(5px + ((1.45em - 16px) / 2));
-          }
-          menuitem:is([type="checkbox"], [type="radio"]) {
-            --menu-padding: 0px;
-          }
-          menuitem[checked="true"] {
-            --context-menu-background-padding: 0px;
-          }
-          menuitem[checked="true"] > .menu-iconic-left {
-            transform: translateX(2px);
+          @media (not (-moz-windows-non-native-menus)) and (-moz-windows-classic) {
+            :root {
+              --context-menu-background-padding-default: -0.5px;
+            }
           }
         }
-        menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic > .menu-iconic-left,
-        menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menuitem-iconic > .menu-iconic-left,
-        menupopup:not([placespopup="true"]) .menu-iconic > .menu-iconic-left,
-        menupopup:not([placespopup="true"]) .menuitem-iconic > .menu-iconic-left {
-          appearance: none !important;
-          padding-block: 0 !important;
-          padding-inline-start: 5px !important;
-          margin-inline-end: 8px !important;
+        @media (-moz-os-version: windows-win8), (-moz-platform: windows-win8) {
+          :root {
+            --context-menu-background-padding-default: 3px;
+          }
         }
-        @supports -moz-bool-pref("userChrome.compatibility.os.win11") {
+        @media (-moz-os-version: windows-win10), (-moz-platform: windows-win10) {
+          :root {
+            --context-menu-background-padding: 3px;
+            --menu-background-padding-default: 0px;
+          }
+          @supports -moz-bool-pref("userChrome.compatibility.os.win11") {
+            :root {
+              --context-menu-background-padding: 5px;
+            }
+            #main-menubar {
+              --context-menu-background-padding: calc(5px + ((1.45em - 16px) / 2));
+            }
+            menuitem:is([type="checkbox"], [type="radio"]) {
+              --menu-padding: 0px;
+            }
+            menuitem[checked="true"] {
+              --context-menu-background-padding: 0px;
+            }
+            menuitem[checked="true"] > .menu-iconic-left {
+              transform: translateX(2px);
+            }
+          }
           menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic > .menu-iconic-left,
           menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menuitem-iconic > .menu-iconic-left,
           menupopup:not([placespopup="true"]) .menu-iconic > .menu-iconic-left,
           menupopup:not([placespopup="true"]) .menuitem-iconic > .menu-iconic-left {
+            appearance: none !important;
+            padding-block: 0 !important;
+            padding-inline-start: 5px !important;
+            margin-inline-end: 8px !important;
+          }
+          @supports -moz-bool-pref("userChrome.compatibility.os.win11") {
+            menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic > .menu-iconic-left,
+            menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menuitem-iconic > .menu-iconic-left,
+            menupopup:not([placespopup="true"]) .menu-iconic > .menu-iconic-left,
+            menupopup:not([placespopup="true"]) .menuitem-iconic > .menu-iconic-left {
+              box-sizing: content-box;
+            }
+          }
+          menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-accel,
+          menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic-accel,
+          menupopup:not([placespopup="true"]) .menu-accel,
+          menupopup:not([placespopup="true"]) .menu-iconic-accel {
             box-sizing: content-box;
+            min-height: 16px;
+          }
+          menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-accel,
+          menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic-accel,
+          menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-text,
+          menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic-text,
+          menupopup:not([placespopup="true"]) .menu-accel,
+          menupopup:not([placespopup="true"]) .menu-iconic-accel,
+          menupopup:not([placespopup="true"]) .menu-text,
+          menupopup:not([placespopup="true"]) .menu-iconic-text {
+            padding-block: 0 !important;
           }
         }
-        menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-accel,
-        menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic-accel,
-        menupopup:not([placespopup="true"]) .menu-accel,
-        menupopup:not([placespopup="true"]) .menu-iconic-accel {
-          box-sizing: content-box;
-          min-height: 16px;
-        }
-        menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-accel,
-        menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic-accel,
-        menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-text,
-        menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic-text,
-        menupopup:not([placespopup="true"]) .menu-accel,
-        menupopup:not([placespopup="true"]) .menu-iconic-accel,
-        menupopup:not([placespopup="true"]) .menu-text,
-        menupopup:not([placespopup="true"]) .menu-iconic-text {
-          padding-block: 0 !important;
+      }
+    }
+    @media (-moz-os-version: windows-win7),
+      (-moz-platform: windows-win7),
+      (-moz-os-version: windows-win8),
+      (-moz-platform: windows-win8),
+      (-moz-os-version: windows-win10),
+      (-moz-platform: windows-win10) {
+      @media not (-moz-windows-non-native-menus) {
+        :not(menu, #ContentSelectDropdown, #context-navigation)
+          > menupopup:not(.in-menulist)
+          > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+        :not(menu, #ContentSelectDropdown, #context-navigation)
+          > menupopup:not(.in-menulist)
+          > menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+        menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup)
+          menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+        menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup)
+          menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+        menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
+          > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+        menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+        menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup)
+          > menuitem,
+        .openintabs-menuitem,
+        #blockedPopupDontShowMessage,
+        #BMB_viewBookmarksToolbar,
+        #context_openANewTab.tabmix-newtab-menu-icon {
+          background-position: left var(--context-menu-background-padding) center !important;
+          padding-inline-start: 0 !important;
         }
       }
-      :not(menu, #ContentSelectDropdown, #context-navigation)
-        > menupopup:not(.in-menulist)
-        > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
-      :not(menu, #ContentSelectDropdown, #context-navigation)
-        > menupopup:not(.in-menulist)
-        > menu:not(.menu-iconic, .in-menulist, [checked="true"]),
-      menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup)
-        menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
-      menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup)
-        menu:not(.menu-iconic, .in-menulist, [checked="true"]),
-      menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
-        > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
-      menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]),
-      menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup)
-        > menuitem,
-      .openintabs-menuitem,
-      #blockedPopupDontShowMessage,
-      #BMB_viewBookmarksToolbar,
-      #context_openANewTab.tabmix-newtab-menu-icon {
-        padding-inline-start: var(--menu-background-padding-default) !important;
-        margin-left: 0 !important;
+      @media (-moz-windows-non-native-menus) {
+        :not(menu, #ContentSelectDropdown, #context-navigation)
+          > menupopup:not(.in-menulist)
+          > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+        :not(menu, #ContentSelectDropdown, #context-navigation)
+          > menupopup:not(.in-menulist)
+          > menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+        menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup)
+          menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+        menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup)
+          menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+        menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
+          > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+        menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+        menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup)
+          > menuitem,
+        .openintabs-menuitem,
+        #blockedPopupDontShowMessage,
+        #BMB_viewBookmarksToolbar,
+        #context_openANewTab.tabmix-newtab-menu-icon {
+          padding-inline-start: var(--menu-background-padding-default) !important;
+          margin-left: 0 !important;
+        }
       }
     }
     /* Padding - Linux */
diff --git a/css/leptonContent.css b/css/leptonContent.css
index addde32..e027fba 100644
--- a/css/leptonContent.css
+++ b/css/leptonContent.css
@@ -3006,123 +3006,137 @@
       @media (-moz-os-version: windows-win7),
         (-moz-platform: windows-win7),
         (-moz-os-version: windows-win8),
-        (-moz-platform: windows-win8) {
+        (-moz-platform: windows-win8),
+        (-moz-os-version: windows-win10),
+        (-moz-platform: windows-win10) {
         :root {
-          --context-menu-text-padding: calc(1.45em + 8px);
-          --bookmark-menu-icon-align-padding: calc((1.45em - 16px) / 2 + 1px);
-        }
-      }
-      @media (-moz-os-version: windows-win7), (-moz-platform: windows-win7) {
-        :root {
-          --context-menu-background-padding-default: 2px;
-        }
-        @media (-moz-windows-classic) {
-          :root {
-            --context-menu-background-padding-default: -0.5px;
-          }
-        }
-      }
-      @media (-moz-os-version: windows-win8), (-moz-platform: windows-win8) {
-        :root {
-          --context-menu-background-padding-default: 3px;
-        }
-      }
-      @media (-moz-os-version: windows-win7),
-        (-moz-platform: windows-win7),
-        (-moz-os-version: windows-win8),
-        (-moz-platform: windows-win8) {
-        menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
-          menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
-        menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
-          menu:not(.menu-iconic, .in-menulist, [checked="true"]),
-        menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
-          > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
-        menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]) {
-          background-position: left var(--context-menu-background-padding) center !important;
-          padding-inline-start: 0 !important;
-        }
-      }
-      @media (-moz-os-version: windows-win10), (-moz-platform: windows-win10) {
-        :root {
-          --context-menu-background-padding: 1em;
-          --context-menu-text-padding: 24px;
-          --menu-background-padding-default: calc(
-            var(--context-menu-background-padding) + var(--context-menu-text-padding)
+          --bookmark-menu-icon-text-padding: calc(
+            var(--context-menu-text-padding) + var(--arrowpanel-menuitem-padding-inline)
+          );
+          --bookmark-menu-icon-background-padding: calc(
+            var(--arrowpanel-menuitem-padding-inline) + var(--bookmark-menu-icon-align-padding)
           );
         }
         @media (-moz-windows-non-native-menus) {
           :root {
+            --context-menu-background-padding: 1em;
+            --context-menu-text-padding: 24px;
+            --menu-background-padding-default: calc(
+              var(--context-menu-background-padding) + var(--context-menu-text-padding)
+            );
             --bookmark-menu-icon-align-padding: 0px;
           }
         }
         @media not (-moz-windows-non-native-menus) {
           :root {
-            --context-menu-background-padding: 3px;
-            --menu-background-padding-default: 0px;
             --context-menu-text-padding: calc(1.45em + 8px);
             --bookmark-menu-icon-align-padding: calc((1.45em - 16px) / 2 + 1px);
           }
-          @supports -moz-bool-pref("userChrome.compatibility.os.win11") {
+          @media (-moz-os-version: windows-win7), (-moz-platform: windows-win7) {
             :root {
-              --context-menu-background-padding: 5px;
+              --context-menu-background-padding-default: 2px;
             }
-            #main-menubar {
-              --context-menu-background-padding: calc(5px + ((1.45em - 16px) / 2));
-            }
-            menuitem:is([type="checkbox"], [type="radio"]) {
-              --menu-padding: 0px;
-            }
-            menuitem[checked="true"] {
-              --context-menu-background-padding: 0px;
-            }
-            menuitem[checked="true"] > .menu-iconic-left {
-              transform: translateX(2px);
+            @media (not (-moz-windows-non-native-menus)) and (-moz-windows-classic) {
+              :root {
+                --context-menu-background-padding-default: -0.5px;
+              }
             }
           }
-          menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic > .menu-iconic-left,
-          menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menuitem-iconic > .menu-iconic-left,
-          menupopup:not([placespopup="true"]) .menu-iconic > .menu-iconic-left,
-          menupopup:not([placespopup="true"]) .menuitem-iconic > .menu-iconic-left {
-            appearance: none !important;
-            padding-block: 0 !important;
-            padding-inline-start: 5px !important;
-            margin-inline-end: 8px !important;
+          @media (-moz-os-version: windows-win8), (-moz-platform: windows-win8) {
+            :root {
+              --context-menu-background-padding-default: 3px;
+            }
           }
-          @supports -moz-bool-pref("userChrome.compatibility.os.win11") {
+          @media (-moz-os-version: windows-win10), (-moz-platform: windows-win10) {
+            :root {
+              --context-menu-background-padding: 3px;
+              --menu-background-padding-default: 0px;
+            }
+            @supports -moz-bool-pref("userChrome.compatibility.os.win11") {
+              :root {
+                --context-menu-background-padding: 5px;
+              }
+              #main-menubar {
+                --context-menu-background-padding: calc(5px + ((1.45em - 16px) / 2));
+              }
+              menuitem:is([type="checkbox"], [type="radio"]) {
+                --menu-padding: 0px;
+              }
+              menuitem[checked="true"] {
+                --context-menu-background-padding: 0px;
+              }
+              menuitem[checked="true"] > .menu-iconic-left {
+                transform: translateX(2px);
+              }
+            }
             menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic > .menu-iconic-left,
             menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menuitem-iconic > .menu-iconic-left,
             menupopup:not([placespopup="true"]) .menu-iconic > .menu-iconic-left,
             menupopup:not([placespopup="true"]) .menuitem-iconic > .menu-iconic-left {
+              appearance: none !important;
+              padding-block: 0 !important;
+              padding-inline-start: 5px !important;
+              margin-inline-end: 8px !important;
+            }
+            @supports -moz-bool-pref("userChrome.compatibility.os.win11") {
+              menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic > .menu-iconic-left,
+              menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menuitem-iconic > .menu-iconic-left,
+              menupopup:not([placespopup="true"]) .menu-iconic > .menu-iconic-left,
+              menupopup:not([placespopup="true"]) .menuitem-iconic > .menu-iconic-left {
+                box-sizing: content-box;
+              }
+            }
+            menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-accel,
+            menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic-accel,
+            menupopup:not([placespopup="true"]) .menu-accel,
+            menupopup:not([placespopup="true"]) .menu-iconic-accel {
               box-sizing: content-box;
+              min-height: 16px;
+            }
+            menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-accel,
+            menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic-accel,
+            menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-text,
+            menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic-text,
+            menupopup:not([placespopup="true"]) .menu-accel,
+            menupopup:not([placespopup="true"]) .menu-iconic-accel,
+            menupopup:not([placespopup="true"]) .menu-text,
+            menupopup:not([placespopup="true"]) .menu-iconic-text {
+              padding-block: 0 !important;
             }
           }
-          menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-accel,
-          menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic-accel,
-          menupopup:not([placespopup="true"]) .menu-accel,
-          menupopup:not([placespopup="true"]) .menu-iconic-accel {
-            box-sizing: content-box;
-            min-height: 16px;
-          }
-          menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-accel,
-          menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic-accel,
-          menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-text,
-          menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic-text,
-          menupopup:not([placespopup="true"]) .menu-accel,
-          menupopup:not([placespopup="true"]) .menu-iconic-accel,
-          menupopup:not([placespopup="true"]) .menu-text,
-          menupopup:not([placespopup="true"]) .menu-iconic-text {
-            padding-block: 0 !important;
+        }
+      }
+      @media (-moz-os-version: windows-win7),
+        (-moz-platform: windows-win7),
+        (-moz-os-version: windows-win8),
+        (-moz-platform: windows-win8),
+        (-moz-os-version: windows-win10),
+        (-moz-platform: windows-win10) {
+        @media not (-moz-windows-non-native-menus) {
+          menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+            menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+          menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+            menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+          menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
+            > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+          menupopup:is(#viewMenuPopup, #maintenanceButtonPopup)
+            > menu:not(.menu-iconic, .in-menulist, [checked="true"]) {
+            background-position: left var(--context-menu-background-padding) center !important;
+            padding-inline-start: 0 !important;
           }
         }
-        menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
-          menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
-        menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
-          menu:not(.menu-iconic, .in-menulist, [checked="true"]),
-        menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
-          > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
-        menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]) {
-          padding-inline-start: var(--menu-background-padding-default) !important;
-          margin-left: 0 !important;
+        @media (-moz-windows-non-native-menus) {
+          menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+            menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+          menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu)
+            menu:not(.menu-iconic, .in-menulist, [checked="true"]),
+          menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup)
+            > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
+          menupopup:is(#viewMenuPopup, #maintenanceButtonPopup)
+            > menu:not(.menu-iconic, .in-menulist, [checked="true"]) {
+            padding-inline-start: var(--menu-background-padding-default) !important;
+            margin-left: 0 !important;
+          }
         }
       }
       /* Padding - Linux */
diff --git a/src/icons/layout/_menu.scss b/src/icons/layout/_menu.scss
index a4cadec..96e4fa8 100644
--- a/src/icons/layout/_menu.scss
+++ b/src/icons/layout/_menu.scss
@@ -80,17 +80,9 @@ $_layoutCommonMenus: (
 
 /* Padding - Windows */
 @include _layout_root_win;
-@include _layout_root_win7_8;
-@include OS($win7, $win8) {
+@include OS($win) {
   @include _layoutIconMenus {
-    @include _layout_init_win7_8();
-  }
-}
-@include OS($win10) {
-  @include _layout_root_win10;
-
-  @include _layoutIconMenus {
-    @include _layout_init_win10;
+    @include _layout_init_win();
   }
 }
 
diff --git a/src/icons/layout/_menu_common.scss b/src/icons/layout/_menu_common.scss
index a86eef7..2ae5264 100644
--- a/src/icons/layout/_menu_common.scss
+++ b/src/icons/layout/_menu_common.scss
@@ -77,104 +77,103 @@ $_initialMenus: selector.append(
   padding-inline-start: var(--context-menu-background-padding) !important;
 }
 
-@mixin _layout_win_native_context_text_padding() {
-  --context-menu-text-padding: calc(1.45em + 8px);
-  --bookmark-menu-icon-align-padding: calc((1.45em - 16px) / 2 + 1px);
+@mixin _layout_win_native_menu_popup() {
+  @include NativeMenuPopup {
+    .menu-iconic,
+    .menuitem-iconic {
+      > .menu-iconic-left {
+        appearance: none !important;
+        padding-block: 0 !important;
+        padding-inline-start: 5px !important;
+        margin-inline-end: 8px !important;
+        @include Option("userChrome.compatibility.os.win11") {
+          box-sizing: content-box;
+        }
+      }
+    }
+    .menu-accel, .menu-iconic-accel {
+      box-sizing: content-box;
+      min-height: 16px;
+    }
+    .menu-accel, .menu-iconic-accel,
+    .menu-text, .menu-iconic-text {
+      padding-block: 0 !important;
+    }
+  }
 }
 
 @mixin _layout_root_win() {
-  :root {
-    @include OS($win) {
+  @include OS($win) {
+    :root {
       --bookmark-menu-icon-text-padding: calc(var(--context-menu-text-padding) + var(--arrowpanel-menuitem-padding-inline));
       --bookmark-menu-icon-background-padding: calc(var(--arrowpanel-menuitem-padding-inline) + var(--bookmark-menu-icon-align-padding));
-    }
-  }
-}
 
-@mixin _layout_root_win7_8() {
-  :root {
-    @include OS($win7, $win8) {
-      @include _layout_win_native_context_text_padding;
-    }
-    @include OS($win7) {
-      --context-menu-background-padding-default: 2px;
-      @media (-moz-windows-classic) {
-        --context-menu-background-padding-default: -0.5px;
+      @include WinNonNativeMenu() {
+        --context-menu-background-padding: 1em;
+        --context-menu-text-padding: #{ 16px + 8px };
+        --menu-background-padding-default: calc(var(--context-menu-background-padding) + var(--context-menu-text-padding));
+
+        --bookmark-menu-icon-align-padding: 0px;
       }
     }
-    @include OS($win8) {
-      --context-menu-background-padding-default: 3px;
-    }
-  }
-}
-@mixin _layout_init_win7_8() {
-  background-position: left var(--context-menu-background-padding) center !important;
-  padding-inline-start: 0 !important;
-}
 
-@mixin _layout_root_win10() {
-  :root {
-    --context-menu-background-padding: 1em;
-    --context-menu-text-padding: #{ 16px + 8px };
-    --menu-background-padding-default: calc(var(--context-menu-background-padding) + var(--context-menu-text-padding));
-
-    @include WinNonNativeMenu() {
-      --bookmark-menu-icon-align-padding: 0px;
-    }
-  }
-  @include WinNativeMenu() {
-    :root {
-      --context-menu-background-padding: 3px;
-      --menu-background-padding-default: 0px;
-      @include _layout_win_native_context_text_padding;
-    }
-    @include Option("userChrome.compatibility.os.win11") {
+    @include WinNativeMenu() {
       :root {
-        --context-menu-background-padding: 5px;
-      }
-      #main-menubar {
-        --context-menu-background-padding: calc(5px + ((1.45em - 16px) / 2));
-      }
-      menuitem {
-        &:is([type="checkbox"], [type="radio"]) {
-          --menu-padding: 0px;
-        }
-        &[checked="true"] {
-          --context-menu-background-padding: 0px;
-          > .menu-iconic-left {
-            transform: translateX(2px);
-          }
-        }
-      }
-    }
+        --context-menu-text-padding: calc(1.45em + 8px);
+        --bookmark-menu-icon-align-padding: calc((1.45em - 16px) / 2 + 1px);
 
-    @include NativeMenuPopup {
-      .menu-iconic,
-      .menuitem-iconic {
-        > .menu-iconic-left {
-          appearance: none !important;
-          padding-block: 0 !important;
-          padding-inline-start: 5px !important;
-          margin-inline-end: 8px !important;
-          @include Option("userChrome.compatibility.os.win11") {
-            box-sizing: content-box;
+        @include OS($win7) {
+          --context-menu-background-padding-default: 2px;
+          @media (-moz-windows-classic) {
+            --context-menu-background-padding-default: -0.5px;
           }
         }
+        @include OS($win8) {
+          --context-menu-background-padding-default: 3px;
+        }
       }
-      .menu-accel, .menu-iconic-accel {
-        box-sizing: content-box;
-        min-height: 16px;
-      }
-      .menu-accel, .menu-iconic-accel,
-      .menu-text, .menu-iconic-text {
-        padding-block: 0 !important;
+
+      @include OS($win10) {
+        :root {
+          --context-menu-background-padding: 3px;
+          --menu-background-padding-default: 0px;
+        }
+
+        @include Option("userChrome.compatibility.os.win11") {
+          :root {
+            --context-menu-background-padding: 5px;
+          }
+          #main-menubar {
+            --context-menu-background-padding: calc(5px + ((1.45em - 16px) / 2));
+          }
+          menuitem {
+            &:is([type="checkbox"], [type="radio"]) {
+              --menu-padding: 0px;
+            }
+            &[checked="true"] {
+              --context-menu-background-padding: 0px;
+              > .menu-iconic-left {
+                transform: translateX(2px);
+              }
+            }
+          }
+        }
+
+        @include _layout_win_native_menu_popup();
       }
     }
   }
 }
-@mixin _layout_init_win10() {
-  padding-inline-start: var(--menu-background-padding-default) !important;
-  margin-left: 0 !important;
+
+@mixin _layout_init_win() {
+  @include WinNativeMenu() {
+    background-position: left var(--context-menu-background-padding) center !important;
+    padding-inline-start: 0 !important;
+  }
+  @include WinNonNativeMenu() {
+    padding-inline-start: var(--menu-background-padding-default) !important;
+    margin-left: 0 !important;
+  }
 }
 
 @mixin _layout_root_linux() {
diff --git a/src/icons/layout/_menu_contents.scss b/src/icons/layout/_menu_contents.scss
index e10008d..b7b59db 100644
--- a/src/icons/layout/_menu_contents.scss
+++ b/src/icons/layout/_menu_contents.scss
@@ -37,17 +37,10 @@ $_placesPopupSetMenus: selector.nest(
 }
 
 /* Padding - Windows */
-@include _layout_root_win7_8;
-@include OS($win7, $win8) {
+@include _layout_root_win;
+@include OS($win) {
   @include _library_contextMenu {
-    @include _layout_init_win7_8();
-  }
-}
-@include OS($win10) {
-  @include _layout_root_win10;
-
-  @include _library_contextMenu {
-    @include _layout_init_win10;
+    @include _layout_init_win;
   }
 }
 

From 1a009f71bcf187c29c9feec42cf45d559f6866a4 Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Fri, 17 Mar 2023 06:52:05 +0900
Subject: [PATCH 36/46] Fix: Icons - Bookmark Popup padding #658

---
 css/leptonChrome.css                 | 24 ++++++++++++++----------
 src/icons/layout/_bookmark_menu.scss |  2 +-
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index bc69802..bab2222 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -10799,8 +10799,8 @@
       (-moz-os-version: windows-win10),
       (-moz-platform: windows-win10) {
       /* Bookmark Popup - None icon menu */
-      menupopup:is(#BMB_bookmarksPopup) menuitem:not(.menuitem-iconic, [disabled="true"]),
-      menupopup:is(#BMB_bookmarksPopup) menu:not(.menu-iconic),
+      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) {
         margin-inline: var(--arrowpanel-menuitem-margin-inline) !important;
@@ -10830,14 +10830,16 @@
         margin-inline-start: -1px !important;
       }
       /* Bookmark Popup - None icon menu */
-      menupopup:is(#BMB_bookmarksPopup) menuitem:not(.menuitem-iconic, [disabled="true"]),
-      menupopup:is(#BMB_bookmarksPopup) menu:not(.menu-iconic),
+      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) {
         padding-inline-start: calc(var(--context-menu-background-padding) + 2px) !important;
       }
-      menupopup:is(#BMB_bookmarksPopup) menuitem:not(.menuitem-iconic, [disabled="true"]) .menu-text,
-      menupopup:is(#BMB_bookmarksPopup) menu:not(.menu-iconic) .menu-text,
+      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 {
         margin-inline-start: var(--context-menu-text-padding) !important;
@@ -10850,16 +10852,18 @@
         padding-inline: var(--arrowpanel-menuitem-padding-inline) !important;
       }
       /* Bookmark Popup - None icon menu */
-      menupopup:is(#BMB_bookmarksPopup) menuitem:not(.menuitem-iconic, [disabled="true"]),
-      menupopup:is(#BMB_bookmarksPopup) menu:not(.menu-iconic) {
+      menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]),
+      menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menu:not(.menu-iconic) {
         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) {
         padding-inline-start: calc(var(--arrowpanel-menuitem-padding-inline) + 1px) !important;
       }
-      menupopup:is(#BMB_bookmarksPopup) menuitem:not(.menuitem-iconic, [disabled="true"]) > .menu-text,
-      menupopup:is(#BMB_bookmarksPopup) menu:not(.menu-iconic) > .menu-text,
+      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 {
         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 dd9c33b..21cd48d 100644
--- a/src/icons/layout/_bookmark_menu.scss
+++ b/src/icons/layout/_bookmark_menu.scss
@@ -21,7 +21,7 @@ $_bookmarkMenuitem: "menuitem:not(.menuitem-iconic, [disabled=\"true\"])";
 $_bookmarkMenu: "menu:not(.menu-iconic)";
 
 // Components
-$_bookmarkPopup: "menupopup:is(#BMB_bookmarksPopup)";
+$_bookmarkPopup: "menupopup:is(#BMB_bookmarksPopup)[placespopup=\"true\"]";
 $_bookmarkToolbar: "#PersonalToolbar menupopup[placespopup=\"true\"]";
 
 $_bookmarkPopupMenus: selector.nest(

From e79556cc48933dac7088a1150500d4cc95c9a0b9 Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Sat, 18 Mar 2023 08:42:37 +0900
Subject: [PATCH 37/46] Fix: Icons - Replace synced tabs icon

---
 css/leptonChrome.css  |  9 ++++++++-
 icons/synced-tabs.svg | 12 ++++++++++++
 src/icons/_panel.scss | 11 ++++++++++-
 3 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 icons/synced-tabs.svg

diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index bab2222..4357540 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -10446,7 +10446,7 @@
       list-style-image: url("chrome://browser/skin/history.svg");
     }
     #sidebar-switcher-tabs {
-      list-style-image: url("chrome://browser/skin/tab.svg");
+      list-style-image: url("../icons/synced-tabs.svg");
     }
     #sidebar-reverse-position {
       list-style-image: var(--uc-sidebar-icon-reverse);
@@ -10458,6 +10458,13 @@
     #unified-extensions-manage-extensions {
       list-style-image: url("chrome://mozapps/skin/extensions/extension.svg");
     }
+    /*= Compatibility ============================================================*/
+    .sync-engine-tabs .checkbox-icon,
+    .sync-engine-tabs.sync-engine-image,
+    #sidebar-box[sidebarcommand="viewTabsSidebar"] > #sidebar-header > #sidebar-switcher-target > #sidebar-icon,
+    #sync-button {
+      list-style-image: url("../icons/synced-tabs.svg") !important;
+    }
     /*= Tab Mix Plus =============================================================*/
     #allTabsMenu_sortTabsButton {
       list-style-image: url("../icons/text-sort-ascending.svg");
diff --git a/icons/synced-tabs.svg b/icons/synced-tabs.svg
new file mode 100644
index 0000000..af172fd
--- /dev/null
+++ b/icons/synced-tabs.svg
@@ -0,0 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity">
+  <path d="M13.75 7V6L13.75 5.99215L13.0079 5.25004L13 5.25H12V4H13C14.1046 4 15 4.89543 15 6V7H13.75Z"/>
+  <path d="M4.25 10V11L4.25004 11.0079L4.99215 11.75L5 11.75H6V13H5C3.89543 13 3 12.1046 3 11V10H4.25Z"/>
+  <path d="M13 11.75H12V13H13C14.1046 13 15 12.1046 15 11V10H13.75V11L13.75 11.0079L13.0079 11.75L13 11.75Z"/>
+  <path fill-rule="evenodd" d="M1 3C1 1.89543 1.89543 1 3 1H9C10.1046 1 11 1.89543 11 3V6C11 7.10457 10.1046 8 9 8H3C1.89543 8 1 7.10457 1 6V3ZM7 2.25H3C2.58579 2.25 2.25 2.58579 2.25 3V6C2.25 6.41421 2.58579 6.75 3 6.75H7V2.25ZM9 3C9.41421 3 9.75 3.33579 9.75 3.75V5.25C9.75 5.66421 9.41421 6 9 6C8.58579 6 8.25 5.66421 8.25 5.25V3.75C8.25 3.33579 8.58579 3 9 3Z"/>
+  <path fill-rule="evenodd" d="M3 11V9H4.25V11C4.25 11.4142 4.58579 11.75 5 11.75H13C13.4142 11.75 13.75 11.4142 13.75 11V6C13.75 5.58579 13.4142 5.25 13 5.25H12V4H13C14.1046 4 15 4.89543 15 6V11C15 12.1046 14.1046 13 13 13H14.5C15.3284 13 16 13.6716 16 14.5C16 15.3284 15.3284 16 14.5 16H3.5C2.67157 16 2 15.3284 2 14.5C2 13.6716 2.67157 13 3.5 13H5C3.89543 13 3 12.1046 3 11ZM7.5 13.75C7.5 13.3358 7.83579 13 8.25 13H9.75C10.1642 13 10.5 13.3358 10.5 13.75C10.5 14.1642 10.1642 14.5 9.75 14.5H8.25C7.83579 14.5 7.5 14.1642 7.5 13.75Z"/>
+  <path d="M4 2.25H3L2.99215 2.25004L2.25004 2.99215L2.25 3V4H1V3C1 1.89543 1.89543 1 3 1H4V2.25Z"/>
+  <path d="M2.25 5V6L2.25004 6.00785L2.99215 6.74996L3 6.75H4V8H3C1.89543 8 1 7.10457 1 6L1 5H2.25Z"/>
+</svg>
\ No newline at end of file
diff --git a/src/icons/_panel.scss b/src/icons/_panel.scss
index 7c310f2..254f0a3 100644
--- a/src/icons/_panel.scss
+++ b/src/icons/_panel.scss
@@ -469,7 +469,7 @@ panelMenuBookmarkThisPage[starred] {
 }
 
 #sidebar-switcher-tabs {
-  list-style-image: url("chrome://browser/skin/tab.svg");
+  list-style-image: url("../icons/synced-tabs.svg");
 }
 
 #sidebar-reverse-position {
@@ -485,6 +485,15 @@ panelMenuBookmarkThisPage[starred] {
   list-style-image: url("chrome://mozapps/skin/extensions/extension.svg");
 }
 
+/*= Compatibility ============================================================*/
+// https://github.com/mozilla/gecko-dev/commit/d8ad6ecc983133a46a30cc998073d30a5e0e5f00
+.sync-engine-tabs .checkbox-icon,
+.sync-engine-tabs.sync-engine-image,
+#sidebar-box[sidebarcommand="viewTabsSidebar"] > #sidebar-header > #sidebar-switcher-target > #sidebar-icon,
+#sync-button {
+  list-style-image: url("../icons/synced-tabs.svg") !important;
+}
+
 /*= Tab Mix Plus =============================================================*/
 #allTabsMenu_sortTabsButton {
   list-style-image: url("../icons/text-sort-ascending.svg");

From fd43668574466ec29ae2b8b001c8163b5d31ac71 Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Sat, 18 Mar 2023 08:44:35 +0900
Subject: [PATCH 38/46] Fix: Icons - Global Menu's sidebar submenu

---
 css/leptonChrome.css        | 10 ++++++++++
 src/icons/_global_menu.scss | 11 +++++++++++
 2 files changed, 21 insertions(+)

diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index 4357540..0e2116e 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -11891,6 +11891,16 @@
       #menu_customizeToolbars {
         --menuitem-image: url("chrome://browser/skin/customize.svg");
       }
+      /* viewSidebarMenu sub menu */
+      #menu_bookmarksSidebar {
+        --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+      }
+      #menu_historySidebar {
+        --menuitem-image: url("chrome://browser/skin/history.svg");
+      }
+      #menu_tabsSidebar {
+        --menuitem-image: url("../icons/synced-tabs.svg");
+      }
       /* viewFullZoomMenu sub menu */
       #menu_zoomEnlarge {
         --menuitem-image: url("chrome://browser/skin/add-circle-fill.svg");
diff --git a/src/icons/_global_menu.scss b/src/icons/_global_menu.scss
index 6d1d8ee..cd6d329 100644
--- a/src/icons/_global_menu.scss
+++ b/src/icons/_global_menu.scss
@@ -144,6 +144,17 @@ menu.share-tab-url-item {
   --menuitem-image: url("chrome://browser/skin/customize.svg");
 }
 
+/* viewSidebarMenu sub menu */
+#menu_bookmarksSidebar {
+  --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+}
+#menu_historySidebar {
+  --menuitem-image: url("chrome://browser/skin/history.svg");
+}
+#menu_tabsSidebar {
+  --menuitem-image: url("../icons/synced-tabs.svg");
+}
+
 /* viewFullZoomMenu sub menu */
 #menu_zoomEnlarge {
   --menuitem-image: url("chrome://browser/skin/add-circle-fill.svg");

From 29e23d2a6e34bfd5061131c67b19e804343a84b2 Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Sat, 18 Mar 2023 14:11:11 +0900
Subject: [PATCH 39/46] Fix: Rounding - UrlView Item at FF v111 #668

---
 css/leptonChrome.css      | 1 +
 src/rounding/_square.scss | 1 +
 2 files changed, 2 insertions(+)

diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index 0e2116e..2e4c903 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -3198,6 +3198,7 @@
   }
 }
 @supports -moz-bool-pref("userChrome.rounding.square_urlView_item") {
+  .urlbarView-row,
   .urlbarView-row-inner {
     --toolbarbutton-border-radius: 0;
   }
diff --git a/src/rounding/_square.scss b/src/rounding/_square.scss
index 6411f61..78235df 100644
--- a/src/rounding/_square.scss
+++ b/src/rounding/_square.scss
@@ -93,6 +93,7 @@
 }
 
 @include Option("userChrome.rounding.square_urlView_item") {
+  .urlbarView-row, // At FF v111 #668
   .urlbarView-row-inner {
     --toolbarbutton-border-radius: 0;
   }

From feda613e5f6bdfe6f40e4d57f26407cf0856d66c Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Sun, 19 Mar 2023 00:16:05 +0900
Subject: [PATCH 40/46] Fix: Compatibility - `-moz-box-ordinal-group` at FF
 v112 #670

---
 css/leptonChrome.css                          |  31 ++++-
 src/autohide/_fill_urlbar.scss                |   2 +-
 src/combined/_index.scss                      |  14 +--
 src/counter/_bookmark_menu.scss               |   2 +-
 src/icons/_panel.scss                         |   9 +-
 src/leptonChrome.scss                         |   1 +
 src/others/_findbar_floating_on_top.scss      |   2 +-
 src/tab/_picture_in_picture_tab.scss          |   4 +-
 src/tab/clipped_tab/_pinned_close_button.scss |   2 +-
 src/tabbar/_on_bottom.scss                    |   9 +-
 src/utils/_moz_box.scss                       | 107 ++++++++++++++++++
 11 files changed, 154 insertions(+), 29 deletions(-)
 create mode 100644 src/utils/_moz_box.scss

diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index 2e4c903..4eb71d2 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -3969,12 +3969,12 @@
     See the above repository for updates as well as full license text. */
     /*= Tabbar - Move to bottom ==================================================*/
     #titlebar {
-      order: 2; /* When userChrome.fullscreen.overlap */
+      order: 2;
       -moz-box-ordinal-group: 2;
       --tabs-navbar-shadow-size: 0px;
     }
     #tab-notification-deck {
-      order: 2; /* When userChrome.fullscreen.overlap */
+      order: 2;
       -moz-box-ordinal-group: 2;
     }
     #TabsToolbar .titlebar-spacer {
@@ -3985,7 +3985,7 @@
     }
     @supports -moz-bool-pref("userChrome.tabbar.on_bottom.above_bookmark") {
       #PersonalToolbar {
-        order: 2; /* When userChrome.fullscreen.overlap */
+        order: 2;
         -moz-box-ordinal-group: 2;
       }
     }
@@ -4081,12 +4081,12 @@
         See the above repository for updates as well as full license text. */
         /*= Tabbar - Move to bottom ==================================================*/
         #titlebar {
-          order: 2; /* When userChrome.fullscreen.overlap */
+          order: 2;
           -moz-box-ordinal-group: 2;
           --tabs-navbar-shadow-size: 0px;
         }
         #tab-notification-deck {
-          order: 2; /* When userChrome.fullscreen.overlap */
+          order: 2;
           -moz-box-ordinal-group: 2;
         }
         #TabsToolbar .titlebar-spacer {
@@ -4097,7 +4097,7 @@
         }
         @supports -moz-bool-pref("userChrome.tabbar.on_bottom.above_bookmark") {
           #PersonalToolbar {
-            order: 2; /* When userChrome.fullscreen.overlap */
+            order: 2;
             -moz-box-ordinal-group: 2;
           }
         }
@@ -7215,6 +7215,7 @@
     .tabbrowser-tab[pinned][visuallyselected]:not([style*="transform: translateX"]):hover:not([busy])
       .tab-close-button {
       display: -moz-box !important;
+      order: 0 !important;
       -moz-box-ordinal-group: 0 !important;
       /* Looks like hover */
       width: var(--uc-close-button-size) !important;
@@ -7233,6 +7234,7 @@
     @supports -moz-bool-pref("userChrome.tab.close_button_at_pinned.always") {
       .tabbrowser-tab[pinned][visuallyselected]:not([busy]) .tab-close-button {
         display: -moz-box !important;
+        order: 0 !important;
         -moz-box-ordinal-group: 0 !important;
         /* Looks like hover */
         width: var(--uc-close-button-size) !important;
@@ -7252,6 +7254,7 @@
     @supports -moz-bool-pref("userChrome.tab.close_button_at_pinned.background") {
       .tabbrowser-tab[pinned]:not([style*="transform: translateX"]):hover:not([busy]) .tab-close-button {
         display: -moz-box !important;
+        order: 0 !important;
         -moz-box-ordinal-group: 0 !important;
         /* Looks like hover */
         width: var(--uc-close-button-size) !important;
@@ -7474,6 +7477,7 @@
     width: 14px;
     height: 14px;
     background-size: 14px;
+    order: 1 !important;
     -moz-box-ordinal-group: 1 !important;
     /* Color */
     fill: currentColor;
@@ -7487,6 +7491,7 @@
   }
   /* Close Button's position */
   .tabbrowser-tab[pictureinpicture]:not([pinned]) .tab-close-button {
+    order: 2 !important;
     -moz-box-ordinal-group: 2 !important;
   }
   #tabbrowser-tabs:not([closebuttons="activetab"]) .tabbrowser-tab[pictureinpicture]:not([pinned]) .tab-close-button {
@@ -8107,12 +8112,15 @@
     --uc-combined-circlebutton-active-background: color-mix(in srgb, currentColor 20%, transparent);
   }
   #nav-bar-customization-target > * {
+    order: 1;
     -moz-box-ordinal-group: 1;
   }
   #nav-bar-customization-target > #urlbar-container {
+    order: 5;
     -moz-box-ordinal-group: 5;
   }
   #nav-bar-customization-target > #urlbar-container ~ * {
+    order: 7;
     -moz-box-ordinal-group: 7;
   }
 }
@@ -8464,9 +8472,11 @@
 }
 @supports -moz-bool-pref("userChrome.combined.urlbar.nav_button") {
   #nav-bar-customization-target > #back-button {
+    order: 2;
     -moz-box-ordinal-group: 2;
   }
   #nav-bar-customization-target > #forward-button {
+    order: 4;
     -moz-box-ordinal-group: 4;
   }
   @supports -moz-bool-pref("userChrome.combined.urlbar.home_button") {
@@ -8499,6 +8509,7 @@
 }
 @supports -moz-bool-pref("userChrome.combined.urlbar.home_button") {
   #nav-bar-customization-target > #home-button {
+    order: 3;
     -moz-box-ordinal-group: 3;
   }
   @supports not -moz-bool-pref("userChrome.combined.urlbar.nav_button") {
@@ -8546,6 +8557,7 @@
 }
 @supports -moz-bool-pref("userChrome.combined.urlbar.reload_button") {
   #nav-bar-customization-target > #stop-reload-button {
+    order: 6;
     -moz-box-ordinal-group: 6;
   }
   #urlbar {
@@ -8672,6 +8684,7 @@
   menupopup[placespopup="true"] > menu.bookmark-item > .menu-iconic-highlightable-text,
   menupopup[placespopup="true"] > menu.bookmark-item > .menu-accel-container,
   menupopup[placespopup="true"] > menu.bookmark-item > .menu-right {
+    order: 2;
     -moz-box-ordinal-group: 2;
   }
   menu.bookmark-item > menupopup[placespopup="true"] > .bookmark-item {
@@ -8686,6 +8699,7 @@
     z-index: 1;
   }
   findbar {
+    order: 0;
     -moz-box-ordinal-group: 0;
     position: relative;
     height: 0 !important;
@@ -9571,6 +9585,7 @@
 }
 @supports -moz-bool-pref("userChrome.autohide.fill_urlbar") {
   #nav-bar:not(:hover, :focus-within, [urlbar-exceeds-toolbar-bounds="true"]) #urlbar-container {
+    order: 0;
     -moz-box-ordinal-group: 0;
     min-width: calc(
       var(--uc-navbar-width, 100vw) -
@@ -10022,6 +10037,7 @@
     #appMenu-proton-addon-banners > .addon-banner-item > .toolbarbutton-icon {
       display: -moz-inline-box !important;
       margin-inline-start: var(--arrowpanel-menuicon-padding);
+      order: 0 !important;
       -moz-box-ordinal-group: 0 !important;
     }
     #appMenu-proton-update-banner::before {
@@ -10154,6 +10170,7 @@
     }
     @supports -moz-bool-pref("userChrome.icon.account_image_to_right") {
       #fxa-manage-account-button::before {
+        order: 2 !important;
         -moz-box-ordinal-group: 2 !important;
       }
     }
@@ -10165,6 +10182,7 @@
     }
     .syncNowBtn {
       visibility: visible !important;
+      order: 1 !important;
       -moz-box-ordinal-group: 1 !important;
       margin-inline-end: var(--arrowpanel-menuicon-padding);
     }
@@ -10213,6 +10231,7 @@
       padding: 0;
     }
     #PanelUI-fxa-menu > :first-child {
+      order: 0;
       -moz-box-ordinal-group: 0;
     }
     #PanelUI-sign-out-separator {
diff --git a/src/autohide/_fill_urlbar.scss b/src/autohide/_fill_urlbar.scss
index b1cca3f..8b26dd4 100644
--- a/src/autohide/_fill_urlbar.scss
+++ b/src/autohide/_fill_urlbar.scss
@@ -1,5 +1,5 @@
 #nav-bar:not(:hover, :focus-within, [urlbar-exceeds-toolbar-bounds="true"]) #urlbar-container {
-  -moz-box-ordinal-group: 0;
+  @include BoxOrder(0);
   min-width: calc(var(--uc-navbar-width, 100vw) - ((2 * var(--urlbar-margin-inline)) + var(--uc-window-drag-space-pre, 0px) + var(--uc-navbar-gap, 0px))) !important;
 }
 
diff --git a/src/combined/_index.scss b/src/combined/_index.scss
index 216b4b5..77f1fec 100644
--- a/src/combined/_index.scss
+++ b/src/combined/_index.scss
@@ -30,18 +30,18 @@
   }
 
   #nav-bar-customization-target > * {
-    -moz-box-ordinal-group: 1;
+    @include BoxOrder(1);
   }
   // Preserve
   // `back`    -> 2
   // `home`    -> 3
   // `forward` -> 4
   #nav-bar-customization-target > #urlbar-container {
-    -moz-box-ordinal-group: 5;
+    @include BoxOrder(5);
   }
   // `reload`  -> 6
   #nav-bar-customization-target > #urlbar-container ~ * {
-    -moz-box-ordinal-group: 7;
+    @include BoxOrder(7);
   }
 }
 
@@ -97,10 +97,10 @@
 @include Option("userChrome.combined.urlbar.nav_button") {
   #nav-bar-customization-target > {
     #back-button {
-      -moz-box-ordinal-group: 2;
+      @include BoxOrder(2);
     }
     #forward-button {
-      -moz-box-ordinal-group: 4;
+      @include BoxOrder(4);
     }
 
     $button: ":is(toolbarbutton, toolbaritem)";
@@ -133,7 +133,7 @@
 }
 @include Option("userChrome.combined.urlbar.home_button") {
   #nav-bar-customization-target > #home-button {
-    -moz-box-ordinal-group: 3;
+    @include BoxOrder(3);
 
     @include NotOption("userChrome.combined.urlbar.nav_button") {
       &:is(:first-child) + :is(toolbarbutton, toolbaritem) {
@@ -145,7 +145,7 @@
 }
 @include Option("userChrome.combined.urlbar.reload_button") {
   #nav-bar-customization-target > #stop-reload-button {
-    -moz-box-ordinal-group: 6;
+    @include BoxOrder(6);
   }
 
   @import "reload_button";
diff --git a/src/counter/_bookmark_menu.scss b/src/counter/_bookmark_menu.scss
index 62359f8..0714b55 100644
--- a/src/counter/_bookmark_menu.scss
+++ b/src/counter/_bookmark_menu.scss
@@ -9,7 +9,7 @@ menupopup[placespopup="true"] > menu.bookmark-item::after {
 menupopup[placespopup="true"] > menu.bookmark-item > .menu-iconic-highlightable-text,
 menupopup[placespopup="true"] > menu.bookmark-item > .menu-accel-container,
 menupopup[placespopup="true"] > menu.bookmark-item > .menu-right {
-  -moz-box-ordinal-group: 2;
+  @include BoxOrder(2);
 }
 
 menu.bookmark-item > menupopup[placespopup="true"] > .bookmark-item {
diff --git a/src/icons/_panel.scss b/src/icons/_panel.scss
index 254f0a3..172381d 100644
--- a/src/icons/_panel.scss
+++ b/src/icons/_panel.scss
@@ -2,7 +2,7 @@
 #appMenu-proton-addon-banners > .addon-banner-item > .toolbarbutton-icon {
   display: -moz-inline-box !important;
   margin-inline-start: var(--arrowpanel-menuicon-padding);
-  -moz-box-ordinal-group: 0 !important;
+  @include BoxOrder(0, true);
 }
 
 #appMenu-proton-update-banner::before {
@@ -142,7 +142,7 @@
   margin-inline-end: var(--arrowpanel-menuicon-padding);
 
   @include Option("userChrome.icon.account_image_to_right") {
-    -moz-box-ordinal-group: 2 !important;
+    @include BoxOrder(2, true);
   }
 }
 @include Option("userChrome.icon.account_label_to_right") {
@@ -153,7 +153,8 @@
 
 .syncNowBtn {
   visibility: visible !important;
-  -moz-box-ordinal-group: 1 !important;
+  @include BoxOrder(1, true);
+
   margin-inline-end: var(--arrowpanel-menuicon-padding);
 }
 #PanelUI-fxa-menu-setup-sync-button {
@@ -204,7 +205,7 @@
   padding: 0;
 }
 #PanelUI-fxa-menu > :first-child {
-  -moz-box-ordinal-group: 0;
+  @include BoxOrder(0);
 }
 #PanelUI-sign-out-separator {
   display: none;
diff --git a/src/leptonChrome.scss b/src/leptonChrome.scss
index 000d72e..ea1aca0 100644
--- a/src/leptonChrome.scss
+++ b/src/leptonChrome.scss
@@ -4,6 +4,7 @@
 @use "utils/accent_color" as *;
 @use "utils/native_menu" as *;
 @use "utils/moz_document" as *;
+@use "utils/moz_box" as *;
 @use "utils/theme" as *;
 @use "utils/one_liner" as *;
 @use "utils/window_control" as *;
diff --git a/src/others/_findbar_floating_on_top.scss b/src/others/_findbar_floating_on_top.scss
index 69a033c..6a07309 100644
--- a/src/others/_findbar_floating_on_top.scss
+++ b/src/others/_findbar_floating_on_top.scss
@@ -9,7 +9,7 @@ See the above repository for updates as well as full license text. */
 }
 
 findbar {
-  -moz-box-ordinal-group: 0;
+  @include BoxOrder(0);
   position: relative;
 
   height: 0 !important;
diff --git a/src/tab/_picture_in_picture_tab.scss b/src/tab/_picture_in_picture_tab.scss
index 9ae0581..9bf4b06 100644
--- a/src/tab/_picture_in_picture_tab.scss
+++ b/src/tab/_picture_in_picture_tab.scss
@@ -8,7 +8,7 @@
   width: 14px;
   height: 14px;
   background-size: 14px;
-  -moz-box-ordinal-group: 1 !important;
+  @include BoxOrder(1, true);
 
   /* Color */
   fill: currentColor;
@@ -24,7 +24,7 @@
 
 /* Close Button's position */
 .tabbrowser-tab[pictureinpicture]:not([pinned]) .tab-close-button {
-  -moz-box-ordinal-group: 2 !important;
+  @include BoxOrder(2, true);
 }
 #tabbrowser-tabs:not([closebuttons="activetab"]) .tabbrowser-tab[pictureinpicture]:not([pinned]) .tab-close-button {
   margin-left: 7px !important;
diff --git a/src/tab/clipped_tab/_pinned_close_button.scss b/src/tab/clipped_tab/_pinned_close_button.scss
index 7f49852..8bcb3b2 100644
--- a/src/tab/clipped_tab/_pinned_close_button.scss
+++ b/src/tab/clipped_tab/_pinned_close_button.scss
@@ -12,7 +12,7 @@
 @mixin pinnedCloseButtonShow($prefix: "") {
   #{$prefix}:not([busy]) .tab-close-button {
     display: -moz-box !important;
-    -moz-box-ordinal-group: 0 !important;
+    @include BoxOrder(0, true);
 
     /* Looks like hover */
     width: var(--uc-close-button-size) !important;
diff --git a/src/tabbar/_on_bottom.scss b/src/tabbar/_on_bottom.scss
index b8095b0..489bb49 100644
--- a/src/tabbar/_on_bottom.scss
+++ b/src/tabbar/_on_bottom.scss
@@ -3,13 +3,11 @@ See the above repository for updates as well as full license text. */
 
 /*= Tabbar - Move to bottom ==================================================*/
 #titlebar {
-  order: 2; /* When userChrome.fullscreen.overlap */
-  -moz-box-ordinal-group: 2;
+  @include BoxOrder(2) /* When userChrome.fullscreen.overlap */;
   --tabs-navbar-shadow-size: 0px;
 }
 #tab-notification-deck {
-  order: 2; /* When userChrome.fullscreen.overlap */
-  -moz-box-ordinal-group: 2;
+  @include BoxOrder(2);
 }
 
 #TabsToolbar .titlebar-spacer {
@@ -22,8 +20,7 @@ See the above repository for updates as well as full license text. */
 
 @include Option("userChrome.tabbar.on_bottom.above_bookmark") {
   #PersonalToolbar {
-    order: 2; /* When userChrome.fullscreen.overlap */
-    -moz-box-ordinal-group: 2;
+    @include BoxOrder(2);
   }
 }
 @include NotOption("userChrome.tabbar.on_bottom.above_bookmark") {
diff --git a/src/utils/_moz_box.scss b/src/utils/_moz_box.scss
new file mode 100644
index 0000000..87aa276
--- /dev/null
+++ b/src/utils/_moz_box.scss
@@ -0,0 +1,107 @@
+// https://bugzilla.mozilla.org/show_bug.cgi?id=1820534
+// https://groups.google.com/a/mozilla.org/g/firefox-dev/c/9sGpF1TNbLk/m/QpU3oTUuAgAJ
+// https://github.com/MrOtherGuy/firefox-csshacks/commit/0ff12e01fe18bc86ca68291c88c6dcf027cb9d83
+
+@function _important($important) {
+  @if $important {
+    @return !important;
+  }
+  @return null;
+}
+
+@mixin BoxFlex($num, $important: false) {
+  $important: _important($important);
+
+  flex: $num $important;
+  -moz-box-flex: $num $important;
+}
+
+@mixin BoxOrder($num, $important: false) {
+  $important: _important($important);
+
+  // -moz-box-ordinal-group is always positive
+  order: $num $important;
+  -moz-box-ordinal-group: $num $important;
+}
+
+@mixin BoxAlign($align, $important: false) {
+  $important: _important($important);
+
+  @if $align == "start" {
+    align-items: flex-start $important;
+    -moz-box-align: start $important;
+  }
+  @if $align == "center" {
+    align-items: center $important;
+    -moz-box-align: center $important;
+  }
+  @if $align == "end" {
+    align-items: flex-end $important;
+    -moz-box-align: end $important;
+  }
+
+  @if $align == "baseline" {
+    align-items: baseline $important;
+    -moz-box-align: baseline $important;
+  }
+  @if $align == "stretch" {
+    align-items: stretch $important;
+    -moz-box-align: stretch $important;
+  }
+}
+
+@mixin BoxPack($align, $important: false) {
+  $important: _important($important);
+
+  @if $align == "start" {
+    justify-content: flex-start $important;
+    -moz-box-pack: start $important;
+  }
+  @if $align == "center" {
+    justify-content: center $important;
+    -moz-box-pack: center $important;
+  }
+  @if $align == "end" {
+    justify-content: flex-end $important;
+    -moz-box-pack: end $important;
+  }
+
+  @if $align == "justify" {
+    justify-content: space-between $important;
+    -moz-box-pack: justify $important;
+  }
+}
+
+@mixin BoxDirection($direction, $important: false) {
+  $important: _important($important);
+
+  @if $direction == "row" {
+    flex-direction: row $important;
+    -moz-box-orient: horizontal $important;
+    -moz-box-direction: normal $important;
+  }
+  @if $direction == "row-reverse" {
+    flex-direction: row-reverse $important;
+    -moz-box-orient: horizontal $important;
+    -moz-box-direction: reverse $important;
+  }
+  @if $direction == "column" {
+    flex-direction: column $important;
+    -moz-box-orient: vertical $important;
+    -moz-box-direction: normal $important;
+  }
+  @if $direction == "column-reverse" {
+    flex-direction: column-reverse $important;
+    -moz-box-orient: vertical $important;
+    -moz-box-direction: reverse $important;
+  }
+  @if $direction == "revert" {
+    flex-direction: revert $important;
+    -moz-box-direction: revert $important;
+  }
+
+  @if $direction == "reverse" {
+    flex-direction: row-reverse $important;
+    -moz-box-direction: reverse $important;
+  }
+}

From 761e2e25915b63a3508ebc09e37f56da919a9f19 Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Sun, 19 Mar 2023 00:34:19 +0900
Subject: [PATCH 41/46] Fix: Compatibility - `-moz-box-flex` at FF v112 #670

---
 css/leptonChrome.css                     | 7 ++++++-
 src/centered/tab/_content.scss           | 2 +-
 src/decoration/_animate.scss             | 1 +
 src/others/_findbar_floating_on_top.scss | 4 ++--
 src/padding/_global_menubar.scss         | 2 +-
 src/tabbar/_as_titlebar.scss             | 2 +-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index 4eb71d2..6b6281a 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -2948,7 +2948,7 @@
     /*- Pinned Tab -------------------------------------------------------------*/
     #tabbrowser-tabs:not([movingtab]) .tabbrowser-tab:not([collapsed]) {
       /* -moz-box-flex may be caused #tabbrowser-tabs[closebuttons] */
-      transition: -moz-box-flex 0.2s var(--animation-easing-function),
+      transition: -moz-box-flex 0.2s var(--animation-easing-function), flex 0.2s var(--animation-easing-function),
         margin-inline-start 0.2s var(--animation-easing-function), min-width 0.1s ease-out, max-width 0.1s ease-out !important;
     }
     #tabbrowser-tabs:not([movingtab]) .tabbrowser-tab[pinned] {
@@ -3822,6 +3822,7 @@
 @supports -moz-bool-pref("userChrome.padding.global_menubar") {
   /* Vertical Align - Center & Height: 100%  */
   #main-menubar {
+    flex: 1 !important;
     -moz-box-flex: 1 !important;
   }
   /* Rounding */
@@ -5868,6 +5869,7 @@
     margin-inline-start: calc(var(--tab-shadow-max-size) * -1) !important;
   }
   .tabbrowser-tab[selected="true"][pinned="true"] {
+    flex: 100;
     -moz-box-flex: 100;
     max-width: var(--tab-max-width) !important;
   }
@@ -8715,6 +8717,7 @@
   findbar::before {
     content: "";
     display: -moz-box;
+    flex: 200;
     -moz-box-flex: 200;
   }
   .findbar-container,
@@ -8738,6 +8741,7 @@
     display: -moz-box;
     overflow: hidden;
     text-overflow: ellipsis;
+    flex: 1;
     -moz-box-flex: 1;
   }
   .findbar-container > hbox {
@@ -8805,6 +8809,7 @@
   }
   @supports not -moz-bool-pref("userChrome.centered.tab.label") {
     .tab-icon-stack {
+      flex: 1;
       -moz-box-flex: 1;
       justify-content: end;
     }
diff --git a/src/centered/tab/_content.scss b/src/centered/tab/_content.scss
index 1549e6e..5875497 100644
--- a/src/centered/tab/_content.scss
+++ b/src/centered/tab/_content.scss
@@ -1,4 +1,4 @@
 .tab-icon-stack {
-  -moz-box-flex: 1;
+  @include BoxFlex(1);
   justify-content: end;
 }
diff --git a/src/decoration/_animate.scss b/src/decoration/_animate.scss
index 341206c..032453f 100644
--- a/src/decoration/_animate.scss
+++ b/src/decoration/_animate.scss
@@ -37,6 +37,7 @@
     &:not([collapsed]) {
       /* -moz-box-flex may be caused #tabbrowser-tabs[closebuttons] */
       transition: -moz-box-flex 0.2s var(--animation-easing-function),
+        flex 0.2s var(--animation-easing-function),
         margin-inline-start 0.2s var(--animation-easing-function), min-width 0.1s ease-out, max-width 0.1s ease-out !important;
     }
     &[pinned] {
diff --git a/src/others/_findbar_floating_on_top.scss b/src/others/_findbar_floating_on_top.scss
index 6a07309..b757101 100644
--- a/src/others/_findbar_floating_on_top.scss
+++ b/src/others/_findbar_floating_on_top.scss
@@ -28,7 +28,7 @@ findbar {
   &::before {
     content:"";
     display: -moz-box;
-    -moz-box-flex: 200;
+    @include BoxFlex(200);
   }
 }
 
@@ -54,7 +54,7 @@ findbar {
     display: -moz-box;
     overflow: hidden;
     text-overflow: ellipsis;
-    -moz-box-flex: 1;
+    @include BoxFlex(1);
   }
   > hbox {
     margin-inline: 5px;
diff --git a/src/padding/_global_menubar.scss b/src/padding/_global_menubar.scss
index 05024b9..5e916f3 100644
--- a/src/padding/_global_menubar.scss
+++ b/src/padding/_global_menubar.scss
@@ -1,6 +1,6 @@
 /* Vertical Align - Center & Height: 100%  */
 #main-menubar {
-  -moz-box-flex: 1 !important;
+  @include BoxFlex(1, true);
 }
 
 /* Rounding */
diff --git a/src/tabbar/_as_titlebar.scss b/src/tabbar/_as_titlebar.scss
index 7d6fcb0..5eb1031 100644
--- a/src/tabbar/_as_titlebar.scss
+++ b/src/tabbar/_as_titlebar.scss
@@ -35,7 +35,7 @@ spacer:is([part="overflow-start-indicator"], [part="overflow-end-indicator"]),
   // padding-inline-start: calc(var(--tab-shadow-max-size) + 1px) !important;
 
   &[pinned="true"] {
-    -moz-box-flex: 100;
+    @include BoxFlex(100);
     max-width: var(--tab-max-width) !important;
   }
   .tab-label-container {

From 4f41b0b7395e28ae566c248f127fd79810ba0ae2 Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Sun, 19 Mar 2023 00:53:24 +0900
Subject: [PATCH 42/46] Fix: Compatibility - `-moz-box-align` at FF v112 #670

---
 css/leptonChrome.css                         | 5 +++++
 css/leptonContent.css                        | 1 +
 src/tab/newtab_button/_looks_like_tab.scss   | 2 +-
 src/tabbar/_one_liner.scss                   | 2 +-
 src/theme/proton_chrome/_proton_commons.scss | 2 +-
 src/utils/_proton_elements.scss              | 3 ++-
 6 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index 6b6281a..267a792 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -1829,6 +1829,7 @@
     /* From checkbox.css */
     checkbox {
       appearance: none !important;
+      align-items: center !important;
       -moz-box-align: center !important;
       margin: 4px 2px !important;
     }
@@ -2001,6 +2002,7 @@
       }
     }
     #label-box {
+      align-items: center !important;
       -moz-box-align: center !important;
       -moz-box-pack: center !important;
       font-weight: 600 !important;
@@ -4238,6 +4240,7 @@
       }
       #nav-bar,
       #nav-bar-customization-target {
+        align-items: center;
         -moz-box-align: center;
       }
       #urlbar-container {
@@ -4339,6 +4342,7 @@
         }
         #nav-bar,
         #nav-bar-customization-target {
+          align-items: center;
           -moz-box-align: center;
         }
         #urlbar-container {
@@ -6892,6 +6896,7 @@
   @supports -moz-bool-pref("userChrome.tab.connect_to_window") {
     #tabs-newtab-button {
       /* Size */
+      align-items: stretch !important;
       -moz-box-align: stretch !important;
       padding-top: var(--tab-block-margin) !important;
     }
diff --git a/css/leptonContent.css b/css/leptonContent.css
index e027fba..327a24c 100644
--- a/css/leptonContent.css
+++ b/css/leptonContent.css
@@ -2621,6 +2621,7 @@
         /* From checkbox.css */
         menuitem[type="checkbox"] {
           appearance: none !important;
+          align-items: center !important;
           -moz-box-align: center !important;
           margin: 0px 2px !important;
         }
diff --git a/src/tab/newtab_button/_looks_like_tab.scss b/src/tab/newtab_button/_looks_like_tab.scss
index 34ba30c..3b6de4f 100644
--- a/src/tab/newtab_button/_looks_like_tab.scss
+++ b/src/tab/newtab_button/_looks_like_tab.scss
@@ -1,7 +1,7 @@
 #tabs-newtab-button {
   @include Option("userChrome.tab.connect_to_window") {
     /* Size */
-    -moz-box-align: stretch !important;
+    @include BoxAlign("stretch", true);
     padding-top: var(--tab-block-margin) !important;
   }
 
diff --git a/src/tabbar/_one_liner.scss b/src/tabbar/_one_liner.scss
index a74fc22..d65f28e 100644
--- a/src/tabbar/_one_liner.scss
+++ b/src/tabbar/_one_liner.scss
@@ -51,7 +51,7 @@
 
   #nav-bar,
   #nav-bar-customization-target {
-    -moz-box-align: center;
+    @include BoxAlign("center");
   }
 
   #urlbar-container {
diff --git a/src/theme/proton_chrome/_proton_commons.scss b/src/theme/proton_chrome/_proton_commons.scss
index e40c4b4..a80aad3 100644
--- a/src/theme/proton_chrome/_proton_commons.scss
+++ b/src/theme/proton_chrome/_proton_commons.scss
@@ -278,7 +278,7 @@
   }
 
   #label-box {
-    -moz-box-align: center !important;
+    @include BoxAlign("center", true);
     -moz-box-pack: center !important;
     font-weight: 600 !important;
   }
diff --git a/src/utils/_proton_elements.scss b/src/utils/_proton_elements.scss
index 72892e3..24b8d5e 100644
--- a/src/utils/_proton_elements.scss
+++ b/src/utils/_proton_elements.scss
@@ -1,4 +1,5 @@
 @use "accent_color" as *;
+@use "moz_box" as *;
 
 //== Radio Button ==============================================================
 @mixin RadioGlobal {
@@ -68,7 +69,7 @@
 //== Check Box =================================================================
 @mixin CheckboxGlobal($content: false) {
   appearance: none !important;
-  -moz-box-align: center !important;
+  @include BoxAlign("center", true);
   margin: if($content, 0px, 4px) 2px !important;
 }
 

From 4b4e32c6bdfa906b7e68e96e2ecffbaeca4cd81c Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Mon, 20 Mar 2023 21:05:08 +0900
Subject: [PATCH 43/46] Fix: Compatibility - `-moz-box-pack` at FF v112 #670

---
 css/leptonChrome.css                         | 2 ++
 src/navbar/_as_sidebar.scss                  | 2 +-
 src/theme/proton_chrome/_proton_commons.scss | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index 267a792..43704c4 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -2004,6 +2004,7 @@
     #label-box {
       align-items: center !important;
       -moz-box-align: center !important;
+      justify-content: center !important;
       -moz-box-pack: center !important;
       font-weight: 600 !important;
     }
@@ -7637,6 +7638,7 @@
     position: absolute !important;
   }
   #nav-bar-customization-target {
+    justify-content: space-between;
     -moz-box-pack: justify;
   }
   #nav-bar {
diff --git a/src/navbar/_as_sidebar.scss b/src/navbar/_as_sidebar.scss
index 8d813d4..05ef66b 100644
--- a/src/navbar/_as_sidebar.scss
+++ b/src/navbar/_as_sidebar.scss
@@ -21,7 +21,7 @@
 }
 
 #nav-bar-customization-target {
-  -moz-box-pack: justify;
+  @include BoxPack("justify");
 }
 #nav-bar {
   // --toolbarbutton-outer-padding: 0px !important;
diff --git a/src/theme/proton_chrome/_proton_commons.scss b/src/theme/proton_chrome/_proton_commons.scss
index a80aad3..1d246a2 100644
--- a/src/theme/proton_chrome/_proton_commons.scss
+++ b/src/theme/proton_chrome/_proton_commons.scss
@@ -279,7 +279,7 @@
 
   #label-box {
     @include BoxAlign("center", true);
-    -moz-box-pack: center !important;
+    @include BoxPack("center", true);
     font-weight: 600 !important;
   }
 

From 238cfea98171f65c9fa112b6a1c5a32ef560a5c4 Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Tue, 21 Mar 2023 18:12:56 +0900
Subject: [PATCH 44/46] Fix: Compatibility - `-moz-box-direction` at FF v112
 #670

---
 css/leptonChrome.css                     | 1 +
 src/others/_findbar_floating_on_top.scss | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index 43704c4..dc91b81 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -8736,6 +8736,7 @@
     height: 33px !important;
   }
   .findbar-container {
+    flex-direction: row-reverse;
     -moz-box-direction: reverse;
     border-width: 0 0 1px 1px;
     border-radius: var(--toolbarbutton-border-radius) 0 0 var(--toolbarbutton-border-radius) !important;
diff --git a/src/others/_findbar_floating_on_top.scss b/src/others/_findbar_floating_on_top.scss
index b757101..0d80267 100644
--- a/src/others/_findbar_floating_on_top.scss
+++ b/src/others/_findbar_floating_on_top.scss
@@ -42,7 +42,7 @@ findbar {
 }
 
 .findbar-container {
-  -moz-box-direction: reverse;
+  @include BoxDirection("reverse");
   border-width: 0 0 1px 1px;
   border-radius: var(--toolbarbutton-border-radius) 0 0 var(--toolbarbutton-border-radius) !important;
 

From 3c5206cade966f5b0a993a3c89ffa25208863deb Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Wed, 22 Mar 2023 14:23:03 +0900
Subject: [PATCH 45/46] Fix: Tab - New tab button separator position at FF v112

---
 css/leptonChrome.css                           | 3 +++
 src/tab/unselected_tab/_dynamic_separator.scss | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index dc91b81..d535cd4 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -6666,6 +6666,9 @@
         background-color: var(--tabs-border-color);
       }
     }
+    #tabs-newtab-button::before {
+      left: calc(50% - (8px + var(--toolbarbutton-inner-padding)));
+    }
   }
   @supports not -moz-bool-pref("userChrome.tab.newtab_button_like_tab") {
     .tab-stack::before,
diff --git a/src/tab/unselected_tab/_dynamic_separator.scss b/src/tab/unselected_tab/_dynamic_separator.scss
index 3477d6a..d9c4f3a 100644
--- a/src/tab/unselected_tab/_dynamic_separator.scss
+++ b/src/tab/unselected_tab/_dynamic_separator.scss
@@ -47,6 +47,9 @@
     /* More position */
     transform: translateX(var(--tab-separator-position-x)) translateY(var(--tab-separator-position-y));
   }
+  #tabs-newtab-button::before {
+    left: calc(50%  - (8px + var(--toolbarbutton-inner-padding)));
+  }
 }
 
 @include NotOption("userChrome.tab.newtab_button_like_tab") {

From 29a51f2e36612ffc92e3c630e844ce08027b85c5 Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Thu, 23 Mar 2023 17:15:22 +0900
Subject: [PATCH 46/46] Fix: Tab - Tab shadow size

---
 css/leptonChrome.css                  | 4 ++--
 src/tab/selected_tab/_box_shadow.scss | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index d535cd4..db99d2d 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -6187,7 +6187,7 @@
     > .tab-stack
     > .tab-background:-moz-lwtheme {
     --uc-tab-shadow-color: var(--uc-tab-shadow-color-bundle);
-    filter: drop-shadow(-1px -0.5px 0px var(--uc-tab-shadow-color, transparent))
+    filter: drop-shadow(-1px 0px 0px var(--uc-tab-shadow-color, transparent))
       drop-shadow(1px -1px 0px var(--uc-tab-shadow-color, transparent)) drop-shadow(0 0 2px rgba(128, 128, 142, 0.5));
   }
   :root:not([lwtheme-mozlightdark], [style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"])
@@ -6196,7 +6196,7 @@
     .tabbrowser-tab:is([visuallyselected="true"], [multiselected])
     > .tab-stack
     > .tab-background:-moz-lwtheme {
-    filter: drop-shadow(-1px -0.5px 0px var(--uc-tab-shadow-color, transparent))
+    filter: drop-shadow(-1px 0px 0px var(--uc-tab-shadow-color, transparent))
       drop-shadow(1px -1px 0px var(--uc-tab-shadow-color, transparent));
   }
 }
diff --git a/src/tab/selected_tab/_box_shadow.scss b/src/tab/selected_tab/_box_shadow.scss
index 864d532..02d5a2c 100644
--- a/src/tab/selected_tab/_box_shadow.scss
+++ b/src/tab/selected_tab/_box_shadow.scss
@@ -1,9 +1,12 @@
+//-- Mixin ---------------------------------------------------------------------
 $ucTabBasicShadow: drop-shadow(0 0 2px rgba(0, 0, 0, 0.4));
 $ucTabAdditionalShadow: drop-shadow(0 0 2px rgba(128, 128, 142, 0.5));
 $ucTabBackgroundShadowSoft: drop-shadow(0 0 1px var(--uc-tab-shadow-color, transparent));
-$ucTabBackgroundShadowHard: drop-shadow(-1px -0.5px 0px var(--uc-tab-shadow-color, transparent))
+$ucTabBackgroundShadowHard: drop-shadow(-1px 0px 0px var(--uc-tab-shadow-color, transparent))
                             drop-shadow(1px -1px 0px var(--uc-tab-shadow-color, transparent));
 
+//------------------------------------------------------------------------------
+
 #TabsToolbar {
   --uc-tab-shadow-color: var(--tab-line-color, var(--lwt-tab-line-color, var(--tabs-border-color, rgba(128, 128, 142, 0.9))));
   --uc-tab-shadow-color-bundle: var(--tab-line-color, var(--lwt-tab-line-color, rgba(128, 128, 142, 0.9)));