diff --git a/src/contents/dark_mode/_accounts_com.scss b/src/contents/dark_mode/_accounts_com.scss
index 8fa3926..7fef1fd 100644
--- a/src/contents/dark_mode/_accounts_com.scss
+++ b/src/contents/dark_mode/_accounts_com.scss
@@ -20,6 +20,7 @@
   header h1,
   .info,
   .info a,
+  .prefillEmail,
   .faint a:hover,
   .cta-neutral:hover {
     color: var(--in-content-page-color) !important;
diff --git a/src/icons/_panel.scss b/src/icons/_panel.scss
index 65d23cc..e23328f 100644
--- a/src/icons/_panel.scss
+++ b/src/icons/_panel.scss
@@ -38,7 +38,6 @@
   #appMenu-more-button2,              /* Seperate */
   #appMenu-help-button2,
   #appMenu-quit-button2               /* Seperate */ {
-    padding-inline-start: var(--arrowpanel-menuimageblank-padding-horizontal) !important;
     padding-top: var(--arrowpanel-menuitemblank-padding) !important;
     padding-bottom: var(--arrowpanel-menuitemblank-padding) !important;
   }
diff --git a/src/icons/_tor_browser.scss b/src/icons/_tor_browser.scss
new file mode 100644
index 0000000..d2f8471
--- /dev/null
+++ b/src/icons/_tor_browser.scss
@@ -0,0 +1,23 @@
+@include Option("userChrome.icon.panel") {
+  #appMenuNewIdentity{
+    list-style-image: url("chrome://browser/skin/new_identity.svg");
+  }
+  #appMenuNewCircuit {
+    list-style-image: url("chrome://browser/skin/new_circuit.svg");
+  }
+  #appMenu_torBrowserUserManual {
+    list-style-image: url("chrome://browser/skin/onion.svg");
+  }
+}
+
+@include Option("userChrome.icon.menu") {
+  #menu_newIdentity {
+    --menuitem-image: url("chrome://browser/skin/new_identity.svg");
+  }
+  #menu_newCircuit {
+    --menuitem-image: url("chrome://browser/skin/new_circuit.svg");
+  }
+  #torBrowserUserManual {
+    --menuitem-image: url("chrome://browser/skin/onion.svg");
+  }
+}
diff --git a/src/padding/_popup_panel.scss b/src/padding/_popup_panel.scss
index 4fbd912..00b4447 100644
--- a/src/padding/_popup_panel.scss
+++ b/src/padding/_popup_panel.scss
@@ -25,7 +25,7 @@
 }
 /* not cut off for Protection popup Footer on windows */
 :root[uidensity="compact"] #protections-popup-multiView #protections-popup-footer {
-  padding: 3px 0 20px !important;
+  padding: 3px 0 10px !important;
 }
 /* Button and disabled category in Protection popup */
 :root[uidensity="compact"] #protections-popup-multiView .protections-popup-footer-button,
diff --git a/src/panel/_icon_padding.scss b/src/panel/_icon_padding.scss
index a6cd699..004e0de 100644
--- a/src/panel/_icon_padding.scss
+++ b/src/panel/_icon_padding.scss
@@ -3,6 +3,9 @@
   --arrowpanel-menublank-padding: calc(var(--arrowpanel-menuicon-padding) * 2 + 8px) !important;
   --arrowpanel-menuimageblank-padding: calc(var(--arrowpanel-menuitem-padding) - 2px) !important;
 }
+.subviewbutton > .toolbarbutton-icon {
+  width: 16px;
+}
 
 @include Option("userChrome.icon.panel_sparse") {
   :root {
diff --git a/src/tabbar/_connect_to_window.scss b/src/tabbar/_connect_to_window.scss
index f55dab3..e163495 100644
--- a/src/tabbar/_connect_to_window.scss
+++ b/src/tabbar/_connect_to_window.scss
@@ -19,3 +19,8 @@
 #TabsToolbar {
   overflow: hidden;   /* Prevent toolbar area over */
 }
+
+/* Pinned Tab - tabbrowser-arrowscrollbox overflowing */
+#tabbrowser-tabs[positionpinnedtabs] > #tabbrowser-arrowscrollbox > .tabbrowser-tab[pinned] {
+  z-index: 0 !important;
+}
diff --git a/src/tabbar/clipped_tab/_letters_cleary.scss b/src/tabbar/clipped_tab/_letters_cleary.scss
index 2a9e82d..36ff18e 100644
--- a/src/tabbar/clipped_tab/_letters_cleary.scss
+++ b/src/tabbar/clipped_tab/_letters_cleary.scss
@@ -5,6 +5,14 @@
   --inline-tab-padding: 8px !important; /* Original: 8px */
 }
 
+.tab-content[pinned] {
+  --inline-tab-padding: 10px; /* Prevent overflow pinned tab's divide line not aligned */
+  padding-inline: var(--inline-tab-padding) !important;
+}
+:root[uidensity="compact"] .tab-content[pinned] {
+  --inline-tab-padding: 8px;
+}
+
 #tabbrowser-tabs[closebuttons="activetab"] .tab-label-container[textoverflow][labeldirection="ltr"]:not([pinned]),
 #tabbrowser-tabs[closebuttons="activetab"]
   .tab-label-container[textoverflow]:not([labeldirection]):-moz-locale-dir(ltr):not([pinned]) {
diff --git a/src/tabbar/selected_tab/_box_shadow.scss b/src/tabbar/selected_tab/_box_shadow.scss
index c22c26c..00d28d2 100644
--- a/src/tabbar/selected_tab/_box_shadow.scss
+++ b/src/tabbar/selected_tab/_box_shadow.scss
@@ -55,8 +55,3 @@
   box-shadow: 0 0 0 1px
     var(--tab-line-color, var(--lwt-tab-line-color, var(--tabs-border-color, rgba(128, 128, 142, 0.9)))) !important;
 }
-
-/* Pinned Tab - tabbrowser-arrowscrollbox overflowing */
-#tabbrowser-tabs[positionpinnedtabs] > #tabbrowser-arrowscrollbox > .tabbrowser-tab[pinned] {
-  z-index: 0 !important;
-}
diff --git a/src/theme/_waterfox.scss b/src/theme/_waterfox.scss
new file mode 100644
index 0000000..699d13a
--- /dev/null
+++ b/src/theme/_waterfox.scss
@@ -0,0 +1,26 @@
+/* New Folder Button */
+#editBMPanel_newFolderButton {
+  appearance: none;
+  border: 0;
+  border-radius: 4px;
+  background-color: var(--button-bgcolor);
+  color: var(--button-color, inherit);
+  font-weight: 600;
+  min-width: 0;
+  padding: 8px 16px;
+
+  /* This button is deeper in the visual hierarchy than others (notably the
+     buttons at the bottom of the panel), so it should be slightly smaller. */
+  font-size: 90%;
+
+  /* This button needs to align with the tree above it. */
+  margin-inline-start: 4px;
+}
+
+#editBMPanel_newFolderButton:hover {
+  background-color: var(--button-hover-bgcolor);
+}
+
+#editBMPanel_newFolderButton:hover:active {
+  background-color: var(--button-active-bgcolor);
+}
diff --git a/src/theme/system_default_theme/_win10.scss b/src/theme/system_default_theme/_win10.scss
index eada318..833d064 100644
--- a/src/theme/system_default_theme/_win10.scss
+++ b/src/theme/system_default_theme/_win10.scss
@@ -21,6 +21,7 @@
     --win-shorcut-text-color: #757575;
     --win-error-color: #b31616;
     --win-red-border-color: #ff4343;
+    --win-accent-forground-color: -moz-accent-color-foreground;
     --win-accent-color: color-mix(in srgb, rgba(0, 0, 0, 0.8) 10%, -moz-accent-color);
     --win-accent-content-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 15%, -moz-accent-color);
     --win-accent-hover-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 27%, -moz-accent-color);
@@ -106,8 +107,6 @@
     --toolbar-field-background-color: var(--win-field-bgcolor) !important;
     --toolbar-field-focus-background-color: var(--win-field-bgcolor) !important;
     --tab-icon-overlay-stroke: var(--win-field-bgcolor) !important;
-    --button-primary-color: var(--win-field-bgcolor) !important;
-    --checkbox-checked-color: var(--win-field-bgcolor) !important;
 
     /* Hover Background Color, Button Color  */
     --menuitem-hover-background-color: var(--win-hover-bgcolor) !important;
@@ -142,6 +141,10 @@
     --input-border-color: var(--win-button-border) !important;
     --autocomplete-popup-separator-color: var(--win-button-border) !important;
 
+    /* Accent Forground Color */
+    --button-primary-color: var(--win-accent-forground-color) !important;
+    --checkbox-checked-color: var(--win-accent-forground-color) !important;
+
     /* Accent Color */
     --button-primary-bgcolor: var(--win-accent-color) !important;
     --focus-outline-color: var(--win-accent-color) !important;
diff --git a/src/userChrome.scss b/src/userChrome.scss
index 73a135c..284fbd5 100644
--- a/src/userChrome.scss
+++ b/src/userChrome.scss
@@ -53,7 +53,9 @@
 
 /** Fullscreen - Overlap toolbar **********************************************/
 @include Option("userChrome.fullscreen.overlap") {
-  @import "fullscreen/index";
+  @supports not -moz-bool-pref("layout.css.osx-font-smoothing.enabled") {
+    @import "fullscreen/index";
+  }
 }
 
 /** Library - Icons Replace ***************************************************/
@@ -89,3 +91,9 @@
 
 /*= Waterfox =================================================================*/
 @import "icons/waterfox";
+@include Option("userChrome.theme.fully_color") {
+  @import "theme/waterfox";
+}
+
+/*= Tor Browser ==============================================================*/
+@import "icons/tor_browser";