diff --git a/src/panel/_icon_padding.scss b/src/panel/_icon_padding.scss
new file mode 100644
index 0000000..c6e07a5
--- /dev/null
+++ b/src/panel/_icon_padding.scss
@@ -0,0 +1,71 @@
+/*= Padding ==================================================================*/
+:root {
+  --arrowpanel-menublank-padding: calc(var(--arrowpanel-menuicon-padding) * 2 + 8px) !important;
+  --arrowpanel-menuimageblank-padding: calc(var(--arrowpanel-menuitem-padding) - 2px) !important;
+}
+
+#downloadsHistory .button-text,
+.subviewbutton > .toolbarbutton-text {
+  padding-inline-start: var(--arrowpanel-menuicon-padding) !important;
+}
+.toolbaritem-combined-buttons > .subviewbutton:not(.subviewbutton-iconic) > .toolbarbutton-text {
+  padding-inline-start: 0 !important;
+}
+#panelMenu_bookmarksMenu .subviewbutton[disabled="true"] .toolbarbutton-text,
+#appMenu_historyMenu .subviewbutton[disabled="true"] .toolbarbutton-text {
+  padding-inline-start: var(--arrowpanel-menublank-padding) !important;
+}
+#appMenu-proton-update-banner .toolbarbutton-text {
+  margin-inline-start: 0 !important;
+}
+
+#appMenu-multiView .subviewbutton::before,
+#appMenu-proton-update-banner::before {
+  display: -moz-inline-box;
+  margin-inline-end: var(--arrowpanel-menuicon-padding);
+  width: 16px;
+  height: 16px;
+}
+#appMenu-proton-update-banner {
+  margin-bottom: 2px !important;
+}
+#appMenu-proton-update-banner::before {
+  margin-inline-start: var(--arrowpanel-menuitem-padding) !important;
+}
+#appMenu-fxa-status2,
+#appMenu-zoom-controls2 {
+  align-items: center;
+  padding-top: var(--arrowpanel-menuimageblank-padding) !important;
+  padding-bottom: var(--arrowpanel-menuimageblank-padding) !important;
+}
+#appMenu-zoom-controls2::before {
+  margin-inline-end: 0 !important;
+}
+
+.subviewbutton[type="checkbox"]:not([checked="true"]) > .toolbarbutton-text {
+  margin-left: 16px !important;
+}
+
+/* Icons Color */
+#appMenu-multiView .subviewbutton::before,
+#appMenu-proton-update-banner::before,
+#downloadsHistory .button-icon,
+.subviewbutton > image {
+  fill: currentColor !important;
+  fill-opacity: var(--toolbarbutton-icon-fill-opacity) !important;
+  -moz-context-properties: fill !important;
+}
+#appMenu-zoomReduce-button2 > .toolbarbutton-icon,
+#appMenu-zoomEnlarge-button2 > .toolbarbutton-icon {
+  stroke: var(--zoom-controls-bgcolor, var(--button-bgcolor, ButtonFace)) !important;
+  -moz-context-properties: fill, stroke !important;
+}
+#appMenu-zoomReduce-button2:not([disabled], [open], :active):is(:hover) > .toolbarbutton-icon,
+#appMenu-zoomEnlarge-button2:not([disabled], [open], :active):is(:hover) > .toolbarbutton-icon {
+  stroke: var(--button-hover-bgcolor) !important;
+}
+
+.subviewbutton[disabled="true"] > image {
+  /* Ghost icons when disabled */
+  opacity: 0.4;
+}
diff --git a/src/userChrome.scss b/src/userChrome.scss
index 4eec103..d8bdf7d 100644
--- a/src/userChrome.scss
+++ b/src/userChrome.scss
@@ -87,78 +87,7 @@
 @import "library/menubar";
 
 /** Panel - Icons *************************************************************/
-/*= Padding ==================================================================*/
-:root {
-  --arrowpanel-menublank-padding: calc(var(--arrowpanel-menuicon-padding) * 2 + 8px) !important;
-  --arrowpanel-menuimageblank-padding: calc(var(--arrowpanel-menuitem-padding) - 2px) !important;
-}
-
-#downloadsHistory .button-text,
-.subviewbutton > .toolbarbutton-text {
-  padding-inline-start: var(--arrowpanel-menuicon-padding) !important;
-}
-.toolbaritem-combined-buttons > .subviewbutton:not(.subviewbutton-iconic) > .toolbarbutton-text {
-  padding-inline-start: 0 !important;
-}
-#panelMenu_bookmarksMenu .subviewbutton[disabled="true"] .toolbarbutton-text,
-#appMenu_historyMenu .subviewbutton[disabled="true"] .toolbarbutton-text {
-  padding-inline-start: var(--arrowpanel-menublank-padding) !important;
-}
-#appMenu-proton-update-banner .toolbarbutton-text {
-  margin-inline-start: 0 !important;
-}
-
-#appMenu-multiView .subviewbutton::before,
-#appMenu-proton-update-banner::before {
-  display: -moz-inline-box;
-  margin-inline-end: var(--arrowpanel-menuicon-padding);
-  width: 16px;
-  height: 16px;
-}
-#appMenu-proton-update-banner {
-  margin-bottom: 2px !important;
-}
-#appMenu-proton-update-banner::before {
-  margin-inline-start: var(--arrowpanel-menuitem-padding) !important;
-}
-#appMenu-fxa-status2,
-#appMenu-zoom-controls2 {
-  align-items: center;
-  padding-top: var(--arrowpanel-menuimageblank-padding) !important;
-  padding-bottom: var(--arrowpanel-menuimageblank-padding) !important;
-}
-#appMenu-zoom-controls2::before {
-  margin-inline-end: 0 !important;
-}
-
-.subviewbutton[type="checkbox"]:not([checked="true"]) > .toolbarbutton-text {
-  margin-left: 16px !important;
-}
-
-/* Icons Color */
-#appMenu-multiView .subviewbutton::before,
-#appMenu-proton-update-banner::before,
-#downloadsHistory .button-icon,
-.subviewbutton > image {
-  fill: currentColor !important;
-  fill-opacity: var(--toolbarbutton-icon-fill-opacity) !important;
-  -moz-context-properties: fill !important;
-}
-#appMenu-zoomReduce-button2 > .toolbarbutton-icon,
-#appMenu-zoomEnlarge-button2 > .toolbarbutton-icon {
-  stroke: var(--zoom-controls-bgcolor, var(--button-bgcolor, ButtonFace)) !important;
-  -moz-context-properties: fill, stroke !important;
-}
-#appMenu-zoomReduce-button2:not([disabled], [open], :active):is(:hover) > .toolbarbutton-icon,
-#appMenu-zoomEnlarge-button2:not([disabled], [open], :active):is(:hover) > .toolbarbutton-icon {
-  stroke: var(--button-hover-bgcolor) !important;
-}
-
-.subviewbutton[disabled="true"] > image {
-  /* Ghost icons when disabled */
-  opacity: 0.4;
-}
-
+@import "panel/icon_padding";
 @import "icons/panel";
 
 /** Menu - Icons Layout *******************************************************/