diff --git a/src/icons/_panel.scss b/src/icons/_panel.scss
index 14acc04..65d23cc 100644
--- a/src/icons/_panel.scss
+++ b/src/icons/_panel.scss
@@ -24,12 +24,12 @@
   background-image: var(--avatar-image-url) !important;
 }
 
-@include Option("userChrome.panel.proton") {
+@include Option("userChrome.icon.panel_full") {
   #appMenu-new-tab-button2 {
     list-style-image: url("chrome://browser/skin/new-tab.svg");
   }
 }
-@include Option("userChrome.panel.photon") {
+@include Option("userChrome.icon.panel_sparse") {
   #appMenu-new-tab-button2,           /* Seperate */
   #appMenu-passwords-button,          /* Seperate */
   #appMenu-extensions-themes-button,
@@ -62,7 +62,7 @@
 #appMenu-downloads-button {
   list-style-image: url("chrome://browser/skin/downloads/downloads.svg");
 }
-@supports -moz-bool-pref("userChrome.panel.proton") {
+@include Option("userChrome.icon.panel_full") {
   #appMenu-passwords-button {
     list-style-image: url("chrome://browser/skin/login.svg");
   }
@@ -74,7 +74,7 @@
 #appMenu-print-button2 {
   list-style-image: url("chrome://global/skin/icons/print.svg");
 }
-@supports -moz-bool-pref("userChrome.panel.proton") {
+@include Option("userChrome.icon.panel_full") {
   #appMenu-save-file-button2 {
     list-style-image: url("chrome://browser/skin/save.svg");
   }
@@ -89,7 +89,7 @@
 #appMenu-settings-button {
   list-style-image: url("chrome://global/skin/icons/settings.svg");
 }
-@supports -moz-bool-pref("userChrome.panel.proton") {
+@include Option("userChrome.icon.panel_full") {
   #appMenu-more-button2 {
     list-style-image: url("chrome://browser/skin/ion.svg");
   }
@@ -368,7 +368,7 @@ panelMenuBookmarkThisPage[starred] {
   --menuitem-image: url("chrome://browser/skin/bookmarks-toolbar.svg");
 }
 
-@supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") {
+@include OS($mac) {
   #BMB_bookmarksShowAllTop {
     list-style-image: url("chrome://browser/skin/bookmark-star-on-tray.svg") !important;
   }
diff --git a/src/panel/_icon_padding.scss b/src/panel/_icon_padding.scss
index 4224e1f..a6cd699 100644
--- a/src/panel/_icon_padding.scss
+++ b/src/panel/_icon_padding.scss
@@ -4,7 +4,7 @@
   --arrowpanel-menuimageblank-padding: calc(var(--arrowpanel-menuitem-padding) - 2px) !important;
 }
 
-@supports -moz-bool-pref("userChrome.panel.photon") {
+@include Option("userChrome.icon.panel_sparse") {
   :root {
     /* Blank Menu Left Padding */
     --arrowpanel-menuimageblank-padding-horizontal: calc(var(--arrowpanel-menublank-padding) - 3px);
diff --git a/user.js b/user.js
index 68c39b5..ba32b16 100644
--- a/user.js
+++ b/user.js
@@ -30,9 +30,6 @@ user_pref("browser.newtabpage.activity-stream.improvesearch.handoffToAwesomebar"
 // Mutliple
 user_pref("userChrome.tab.connect_to_window",          true); // Original, Photon
 
-user_pref("userChrome.panel.proton",                   true); // Original, Proton
-// user_pref("userChrome.panel.photon",                true); // Photon
-
 user_pref("userChrome.tab.lepton_like_padding",        true); // Original
 // user_pref("userChrome.tab.photon_like_padding",     true); // Photon
 
@@ -43,6 +40,9 @@ user_pref("userChrome.tab.newtab_button_like_tab",     true); // Original
 // user_pref("userChrome.tab.newtab_button_smaller",   true); // Photon
 // user_pref("userChrome.tab.newtab_button_proton",    true); // Proton
 
+user_pref("userChrome.icon.panel_full",                true); // Original, Proton
+// user_pref("userChrome.icon.panel_sparse",           true); // Photon
+
 // Original Only
 user_pref("userChrome.tab.box_shadow",                 true);
 user_pref("userChrome.tab.bottom_rounded_corner",      true);