diff --git a/firefox/userChrome.css b/firefox/userChrome.css
index d689af2..c22ad74 100644
--- a/firefox/userChrome.css
+++ b/firefox/userChrome.css
@@ -1,40 +1,27 @@
-/* Border Radius */
-
 * {
   border-radius: 0 !important;
 }
 
-:root {
-  --tab-border-radius: 0 !important;
-}
-
-menupopup, panel {
-  --panel-border-radius: 0 !important;
-}
-
 /* Tabbar */
 
-#main-window[tabsintitlebar="true"]:not([extradragspace="true"]) #TabsToolbar {
-  opacity: 0;
-  pointer-events: none;
-}
-
-#main-window:not([tabsintitlebar="true"]) #TabsToolbar {
+#TabsToolbar {
   visibility: collapse !important;
 }
 
+/* Sidebar */
+
 #sidebar-box[sidebarcommand="treestyletab_piro_sakura_ne_jp-sidebar-action"] #sidebar-header {
   display: none;
 }
 
 /* Addressbar */
 
-#nav-bar.browser-toolbar {
-  background-color: -moz-dialog !important;
+#nav-bar-customization-target {
+  --toolbar-padding-inline: 0;
 }
 
-#nav-bar-customization-target {
-  --toolbar-start-end-padding: 0;
+#nav-bar.browser-toolbar {
+  background-color: -moz-dialog !important;
 }
 
 .urlbar-background {