diff --git a/src/icons/_library.scss b/src/icons/_library.scss
index 8c59e2e..4266084 100644
--- a/src/icons/_library.scss
+++ b/src/icons/_library.scss
@@ -3,7 +3,10 @@
   --menuitem-image: url("chrome://browser/skin/bookmark.svg");
 }
 #newfolder {
-  --menuitem-image: url("./icons/folder.svg");
+  --menuitem-image: url("chrome://global/skin/icons/folder.svg");
+  @include Option("userChrome.icon.library") {
+    --menuitem-image: url("./icons/folder.svg");
+  }
 }
 #newseparator {
   --menuitem-image: url("./icons/vertical-line.svg");
diff --git a/src/icons/context_menu/_others.scss b/src/icons/context_menu/_others.scss
index 37a1e84..140a663 100644
--- a/src/icons/context_menu/_others.scss
+++ b/src/icons/context_menu/_others.scss
@@ -75,7 +75,10 @@
   /* checkbox */
 }
 .downloadShowMenuItem {
-  --menuitem-image: url("./icons/folder.svg");
+  --menuitem-image: url("chrome://global/skin/icons/folder.svg");
+  @include Option("userChrome.icon.library") {
+    --menuitem-image: url("./icons/folder.svg");
+  }
 }
 
 #downloadsContextMenu > menuitem[command="downloadsCmd_openReferrer"] {
diff --git a/src/icons/context_menu/_place.scss b/src/icons/context_menu/_place.scss
index 9a04d26..2ff1f1d 100644
--- a/src/icons/context_menu/_place.scss
+++ b/src/icons/context_menu/_place.scss
@@ -50,7 +50,10 @@
   --menuitem-image: url("chrome://browser/skin/bookmark.svg");
 }
 #placesContext_new\:folder {
-  --menuitem-image: url("./icons/folder.svg");
+  --menuitem-image: url("chrome://global/skin/icons/folder.svg");
+  @include Option("userChrome.icon.library") {
+    --menuitem-image: url("./icons/folder.svg");
+  }
 }
 #placesContext_new\:separator {
   --menuitem-image: url("./icons/vertical-line.svg");
diff --git a/userChrome.css b/userChrome.css
index 827bed7..5dc45cb 100644
--- a/userChrome.css
+++ b/userChrome.css
@@ -2982,10 +2982,11 @@
 
   /* neighbouring tabs should "pinch" together */
   @supports not -moz-bool-pref("userChrome.tab.photon_like_padding") {
-    .tabbrowser-tab {
-      padding-inline: 1px !important;
+    @supports -moz-bool-pref("userChrome.tab.lepton_like_padding") {
+      .tabbrowser-tab {
+        padding-inline: 1px !important;
+      }
     }
-
     .tabbrowser-tab:not([last-visible-tab]) {
       margin-inline-end: -0.5px !important;
     }
@@ -4378,13 +4379,13 @@
 /*= Clipped tabs =============================================================*/
 /** Clipped tabs - Letters cleary *********************************************/
 @supports -moz-bool-pref("userChrome.tab.letters_cleary") {
-  :root {
-    --inline-tab-padding: 6px !important;
+  #tabbrowser-tabs[closebuttons="activetab"] {
+    --inline-tab-padding: 7px !important;
     /* Original: 8px */
   }
 
-  :root[uidensity="touch"] {
-    --inline-tab-padding: 8px !important;
+  #tabbrowser-tabs[overflow="true"] {
+    --inline-tab-padding: 6px !important;
     /* Original: 8px */
   }
 
@@ -6489,7 +6490,12 @@
     }
 
     #placesContext_new\:folder {
-      --menuitem-image: url("./icons/folder.svg");
+      --menuitem-image: url("chrome://global/skin/icons/folder.svg");
+    }
+    @supports -moz-bool-pref("userChrome.icon.library") {
+      #placesContext_new\:folder {
+        --menuitem-image: url("./icons/folder.svg");
+      }
     }
 
     #placesContext_new\:separator {
@@ -6604,7 +6610,12 @@
     }
 
     .downloadShowMenuItem {
-      --menuitem-image: url("./icons/folder.svg");
+      --menuitem-image: url("chrome://global/skin/icons/folder.svg");
+    }
+    @supports -moz-bool-pref("userChrome.icon.library") {
+      .downloadShowMenuItem {
+        --menuitem-image: url("./icons/folder.svg");
+      }
     }
 
     #downloadsContextMenu > menuitem[command="downloadsCmd_openReferrer"] {
@@ -7082,7 +7093,12 @@
     }
 
     #newfolder {
-      --menuitem-image: url("./icons/folder.svg");
+      --menuitem-image: url("chrome://global/skin/icons/folder.svg");
+    }
+    @supports -moz-bool-pref("userChrome.icon.library") {
+      #newfolder {
+        --menuitem-image: url("./icons/folder.svg");
+      }
     }
 
     #newseparator {
diff --git a/userContent.css b/userContent.css
index 20f2482..870df79 100644
--- a/userContent.css
+++ b/userContent.css
@@ -126,11 +126,13 @@
     /* Control Bar */
     #controlsContainer .controlBar {
       transition: transform 350ms ease;
+      opacity: 1 !important;
     }
 
     #controlsContainer .controlBar[hidden] {
       transform: translateY(100%);
       transition: transform 350ms ease-in-out, opacity 1s ease 100ms !important;
+      opacity: 0 !important;
     }
 
     #controlsContainer .controlBar[hidden] .progressBar,
@@ -1970,7 +1972,12 @@
       }
 
       #placesContext_new\:folder {
-        --menuitem-image: url("./icons/folder.svg");
+        --menuitem-image: url("chrome://global/skin/icons/folder.svg");
+      }
+      @supports -moz-bool-pref("userChrome.icon.library") {
+        #placesContext_new\:folder {
+          --menuitem-image: url("./icons/folder.svg");
+        }
       }
 
       #placesContext_new\:separator {
@@ -2004,7 +2011,12 @@
       }
 
       #newfolder {
-        --menuitem-image: url("./icons/folder.svg");
+        --menuitem-image: url("chrome://global/skin/icons/folder.svg");
+      }
+      @supports -moz-bool-pref("userChrome.icon.library") {
+        #newfolder {
+          --menuitem-image: url("./icons/folder.svg");
+        }
       }
 
       #newseparator {