diff --git a/src/icons/_waterfox.scss b/src/icons/_waterfox.scss
index c0bc4fb..55f9779 100644
--- a/src/icons/_waterfox.scss
+++ b/src/icons/_waterfox.scss
@@ -1,12 +1,16 @@
-#appMenu-restart-button {
-  list-style-image: url("./icons/refresh-cw.svg") !important;
-}
-#menu_FileRestartItem {
-  --menuitem-image: url("./icons/refresh-cw.svg");
+@include Option("userChrome.icon.panel") {
+  #appMenu-restart-button {
+    list-style-image: url("./icons/refresh-cw.svg") !important;
+  }
 }
+@include Option("userChrome.icon.menu") {
+  #menu_FileRestartItem {
+    --menuitem-image: url("./icons/refresh-cw.svg");
+  }
 
-menuitem.privatetab-icon {
-  list-style-image: url("./icons/priavate-favicon.svg") !important;
-  fill: currentColor;
-  -moz-context-properties: fill;
+  menuitem.privatetab-icon {
+    list-style-image: url("./icons/priavate-favicon.svg") !important;
+    fill: currentColor;
+    -moz-context-properties: fill;
+  }
 }
diff --git a/src/userChrome.scss b/src/userChrome.scss
index 73a59fa..9d20224 100644
--- a/src/userChrome.scss
+++ b/src/userChrome.scss
@@ -55,21 +55,35 @@
 }
 
 /** Library - Icons Replace ***************************************************/
-@import "library/chrome";
+@include Option("userChrome.icon.library") {
+  @import "library/chrome";
+}
 
 /** Panel - Icons *************************************************************/
-@import "panel/icon_padding";
-@import "icons/panel";
+@include Option("userChrome.icon.panel") {
+  @import "panel/icon_padding";
+  @import "icons/panel";
+}
 
 /** Menu - Icons Layout *******************************************************/
-@import "menu/icons_layout";
-@import "menu/bookmark_layout";
+@include Option("userChrome.icon.menu") {
+  @import "menu/icons_layout";
+  @import "menu/bookmark_layout";
 
-@import "icons/context_menu";
-@import "icons/global_menu";
+  @include Option("userChrome.icon.context_menu") {
+    @import "icons/context_menu";
+  }
+  @include Option("userChrome.icon.global_menu") {
+    @import "icons/global_menu";
+  }
+}
 
 /** Libray Menu ***************************************************************/
-@import "icons/library";
+@include Option("userChrome.icon.library") {
+  @include Option("userChrome.icon.library") {
+    @import "icons/library";
+  }
+}
 
 /*= Waterfox =================================================================*/
 @import "icons/waterfox";
diff --git a/user.js b/user.js
index a4fd198..f0540d6 100644
--- a/user.js
+++ b/user.js
@@ -82,6 +82,12 @@ user_pref("userChrome.tab.crashed",               true);
 
 user_pref("userChrome.fullscreen.overlap", true);
 
+user_pref("userChrome.icon.library",      true);
+user_pref("userChrome.icon.panel",        true);
+user_pref("userChrome.icon.menu",         true);
+user_pref("userChrome.icon.context_menu", true);
+user_pref("userChrome.icon.global_menu",  true);
+
 user_pref("userContent.player.ui",            true);
 user_pref("userContent.player.icon",          true);
 user_pref("userContent.player.noaudio",       true);