diff --git a/theme/parts/buttons-fixes.css b/theme/parts/buttons-fixes.css
index 9bdf14c..ac0931a 100644
--- a/theme/parts/buttons-fixes.css
+++ b/theme/parts/buttons-fixes.css
@@ -4,6 +4,13 @@
 /* Menulist */
 link[href="chrome://global/skin/menulist.css"] ~ dropmarker {
 	align-items: center !important;
+	justify-content: center !important;
+}
+
+.button-menu-dropmarker {
+	appearance: none !important;
+	margin: 0 !important;
+	margin-inline-start: 6px !important;
 }
 
 /* Remove the header bar buttons' hover styles */
diff --git a/theme/parts/buttons.css b/theme/parts/buttons.css
index a24e1f4..387a1e0 100644
--- a/theme/parts/buttons.css
+++ b/theme/parts/buttons.css
@@ -12,6 +12,7 @@
 
 /* Buttons */
 menulist,
+.customizationmode-button,
 #nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton),
 .subviewbutton.panel-subview-footer,
 .panel-footer button,
@@ -85,6 +86,8 @@ button.close,
 
 /* Text buttons */
 menulist,
+.customizationmode-button,
+#sidebar-switcher-target,
 .subviewbutton.panel-subview-footer,
 .panel-footer button,
 #appMenu-popup .panel-banner-item,
@@ -101,7 +104,7 @@ menulist,
 .button.connect-device,
 #item-choose button,
 #editBMPanel_newFolderButton {
-	padding: 2px 16px !important;
+	padding: 2px 9px !important;
 }
 .subviewbutton.panel-subview-footer label,
 .panel-footer button,
@@ -120,31 +123,9 @@ menulist,
 	text-align: center !important;
 }
 
-/* Drop down buttons */
-#sidebar-switcher-target,
-#viewButton {
-	padding: 2px 16px !important;
-	position: relative;
-}
-#sidebar-switcher-arrow,
-#viewButton .button-menu-dropmarker { /* Arrow position, type b */
-	transform: translate(6px, 0)
-}
-.menulist-label-box {
-	padding: 2px 26px 2px 16px !important;
-	position: relative;
-}
-.menulist-label-box:after { /* Arrow position */
-	position: absolute !important;
-	right: 8px !important;
-	top: 8px !important;
-}
-.menulist-label-box:after { /* Create arrow if icon tag no exist */
-	content: "";
-}
-
 /* Hover buttons */
 menulist:hover,
+.customizationmode-button:hover,
 .subviewbutton.panel-subview-footer:hover,
 .panel-footer button:hover,
 #downloadsPanel-mainView .download-state .downloadButton:hover,
@@ -185,6 +166,7 @@ button.close:hover,
 
 /* Active buttons */
 menulist[open],
+.customizationmode-button:is([open], :active),
 .subviewbutton.panel-subview-footer:active,
 .panel-footer button:active,
 #downloadsPanel-mainView .download-state .downloadButton:active,
diff --git a/theme/parts/controls.css b/theme/parts/controls.css
index fde4ef1..8bf90a0 100644
--- a/theme/parts/controls.css
+++ b/theme/parts/controls.css
@@ -30,10 +30,6 @@ checkbox:not(.treenode-checkbox) > .checkbox-check[checked] {
 	fill: white !important;
 }
 
-.checkbox-label {
-	margin-inline-start: 6px !important;
-}
-
 /* Radio */
 radio > .radio-check {
 	appearance: none !important;
@@ -58,7 +54,7 @@ radio > .radio-check[selected] {
 }
 
 .radio-label {
-	margin-inline-start: 6px !important;
+	margin-inline-start: 3px !important;
 }
 
 /* Switchers */
diff --git a/theme/parts/icons.css b/theme/parts/icons.css
index af34c08..57a456d 100644
--- a/theme/parts/icons.css
+++ b/theme/parts/icons.css
@@ -48,6 +48,7 @@ button.close::before,
 .textbox-search-clear,
 .urlbarView-type-icon,
 radio > .radio-check,
+link[href="chrome://global/skin/dropmarker.css"] + image,
 :root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-close .toolbarbutton-icon,
 :root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-max .toolbarbutton-icon,
 :root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-restore .toolbarbutton-icon,