diff --git a/src/padding/_tabbar_height.scss b/src/padding/_tabbar_height.scss
index 421503c..405f1eb 100644
--- a/src/padding/_tabbar_height.scss
+++ b/src/padding/_tabbar_height.scss
@@ -1,5 +1,5 @@
 /* Toolbar Height */
-@include Option($tabLeptonLikePadding) {
+@include Option("userChrome.tab.lepton_like_padding") {
   :root:not([uidensity]) #TabsToolbar {
     --tab-min-height: 36px;
   }
@@ -10,7 +10,7 @@
     --tab-min-height: 41px;
   }
 }
-@include Option($tabPhotonLikePadding) {
+@include Option("userChrome.tab.photon_like_padding") {
   :root:not([uidensity]) #TabsToolbar {
     --tab-min-height: 32px;
   }
@@ -27,7 +27,7 @@
     margin-top: 0 !important;
   }
 }
-@include NotOption($tabPhotonLikePadding) {
+@include NotOption("userChrome.tab.photon_like_padding") {
   :root:not([uidensity]) #TabsToolbar {
     --tab-min-height: 36px !important; /* 38px -> 36px */
   }
@@ -35,7 +35,7 @@
     --tab-min-height: 29px !important; /* 36px -> 29px */
   }
 }
-@include NotOption($tabProtonLikePadding) {
+@include Option("userChrome.tab.connect_to_window") {
   #TabsToolbar {
     --toolbarbutton-inner-padding: calc((var(--tab-min-height) - 18px) / 2) !important; /* Prevent overflow pinned tab bottom margin */
   }
diff --git a/src/padding/_tabbar_width.scss b/src/padding/_tabbar_width.scss
index 955dd3f..8fed01c 100644
--- a/src/padding/_tabbar_width.scss
+++ b/src/padding/_tabbar_width.scss
@@ -21,14 +21,14 @@
   padding-right: var(--newtab-button-width-padding) !important;
 }
 
-@include NotOption($tabPhotonLikePadding) {
+@include NotOption("userChrome.tab.photon_like_padding") {
   #tabbrowser-tabs[haspinnedtabs]:not([positionpinnedtabs])
     > #tabbrowser-arrowscrollbox
     > .tabbrowser-tab[first-visible-unpinned-tab] {
     margin-inline-start: 1px !important;
   }
 }
-@include Option($tabPhotonLikePadding) {
+@include Option("userChrome.tab.photon_like_padding") {
   #tabbrowser-tabs[haspinnedtabs]:not([positionpinnedtabs])
     > #tabbrowser-arrowscrollbox
     > .tabbrowser-tab[first-visible-unpinned-tab] {
@@ -55,12 +55,12 @@
 }
 
 /* Tab - Max Size */
-@include NotOption($tabPhotonLikePadding) {
+@include NotOption("userChrome.tab.photon_like_padding") {
   :root {
     --tab-max-width: 240px;
   }
 }
-@include Option($tabPhotonLikePadding) {
+@include Option("userChrome.tab.photon_like_padding") {
   :root {
     --tab-max-width: 225px;
   }
@@ -70,7 +70,7 @@
 }
 
 /* neighbouring tabs should "pinch" together */
-@include NotOption($tabPhotonLikePadding) {
+@include NotOption("userChrome.tab.photon_like_padding") {
   .tabbrowser-tab {
     padding-inline: 1px !important;
   }
@@ -78,7 +78,7 @@
     margin-inline-end: -0.5px !important;
   }
 }
-@include Option($tabPhotonLikePadding) {
+@include Option("userChrome.tab.photon_like_padding") {
   .tabbrowser-tab {
     padding-inline: 0 !important;
   }
diff --git a/src/utils/_option.scss b/src/utils/_option.scss
index 8986164..c9df60e 100644
--- a/src/utils/_option.scss
+++ b/src/utils/_option.scss
@@ -4,10 +4,7 @@ $tabProton: "userChrome.tab.proton";
 $tabConnectToWindow: "userChrome.tab.connect_to_window";
 $tabBoxShadow: "userChrome.tab.box_shadow";
 $tabBottomRoundedCorner: "userChrome.tab.bottom_rounded_corner";
-$tabLeptonLikePadding: "userChrome.tab.lepton_like_padding";
 $tabPhotonLikeContextLine: "userChrome.tab.photon_like_contextline";
-$tabPhotonLikePadding: "userChrome.tab.photon_like_padding";
-$tabProtonLikePadding: "userChrome.tab.proton_like_padding";
 
 $tabMultiSelected: "userChrome.tab.multi_selected";