diff --git a/README.md b/README.md
index 4a7f056..8771440 100644
--- a/README.md
+++ b/README.md
@@ -111,47 +111,48 @@ git pull origin master
 To achieve Firefox with overlay scrollbars install [firefox-gnome-scrollbars](https://github.com/rafaelmardojai/firefox-gnome-scrollbars).
 
 ## Enabling optional features
-Open `chrome/firefox-gnome-theme/userChrome.css` with a text editor and follow instructions to enable extra features. Keep in mind this file might change in future versions and your configuration will be lost. You can copy the @imports you want to enable to a new file named `customChrome.css` directly in your `chrome/firefox-gnome-theme` directory if you want it to survive updates. Remember all @imports must be at the top of the file, before other statements.
+Optional features can be enabled by crating new `boolean` preferences in `about:config`.
 
-Alternatively you can run installation script with `-g` flag to auto install GNOMISH features.
+1. Go to the `about:config` page 
+2. Type the key of the feature you want to enable
+3. Set it as a `boolean` and click on the add button
+4. Restart Firefox
 
-```sh
-./scripts/install.sh -g
-```
+### Features
 
-*Those features are not included by default, because can introduce bugs or Firefox functionalities lost.*
+#### Hide single tab
+`gnomeTheme.hideSingleTab`
 
-- **hide-single-tab.css** *GNOMISH*
+Hide the tab bar when only one tab is open.
 
-	Hide the tab bar when only one tab is open.
+> You should move the new tab button somewhere else for this to work, because by default it is on the tab bar too.
 
-	You should move the new tab button somewhere else for this to work, because by default it is on the tab bar too.
-	
-- **square-title-buttons.css**
+#### Normal width tabs
+`gnomeTheme.normalWidthTabs`
 
-	Use square title buttons old style.
+Use normal width tabs as default Firefox.
 
-- **normal-width-tabs.css**
+#### Active tab contrast
+`gnomeTheme.activeTabContrast`
 
-	Use normal width tabs.
+Add more contrast to the active tab.
 
-- **active-tab-contrast.css**
+#### System icons
+`gnomeTheme.systemIcons`
 
-	Active tab better contrast.
+Use system theme icons instead of Adwaita icons included by theme.
 
-- **system-icons.css**
+#### Drag window from headerbar buttons [BUGGED]
+`gnomeTheme.dragWindowHeaderbarButtons`
 
-	Use system theme icons instead of Adwaita icons included by theme.
+Allow draging the window from headerbar buttons.
 
-- **drag-window-headerbar-buttons.css**
+> **Note:** It can activate button action, with unpleasant behavior.
 
-	Allow drag window from headerbar buttons *GNOMISH* **[BUGGED]**
+#### Symbolic tab icons
+`gnomeTheme.symbolicTabIcons`
 
-	It can activate button action, with unpleasant behavior.
-
-- **symbolic-tab-icons.css**
-
-	Make all tab icons look kinda like symbolic icons.
+Make all tab icons look kinda like symbolic icons.
 
 ## Known bugs
 
diff --git a/theme/active-tab-contrast.css b/theme/active-tab-contrast.css
deleted file mode 100644
index bb6287c..0000000
--- a/theme/active-tab-contrast.css
+++ /dev/null
@@ -1,10 +0,0 @@
-/* Better active tab contrast */
-
-@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-.tab-background[selected=true],
-:root:not(:-moz-window-inactive) .tabbrowser-tab:hover > .tab-stack > .tab-background:not(#hack) {
-	background: var(--gnome-tabbar-tab-active-background-contrast) !important;
-	border-bottom-width: 5px !important;
-	border-bottom-color: var(--gnome-tabbar-tab-active-border-bottom-color-contrast) !important;
-}
diff --git a/theme/drag-window-headerbar-buttons.css b/theme/drag-window-headerbar-buttons.css
deleted file mode 100644
index a0c207c..0000000
--- a/theme/drag-window-headerbar-buttons.css
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Allow drag window from headerbar buttons */
-
-@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-:root[tabsintitlebar] #nav-bar *,
-:root[tabsintitlebar] #titlebar .titlebar-button,
-:root[tabsintitlebar][inFullscreen] #window-controls toolbarbutton {
-	-moz-window-dragging: drag;
-}
-
-/* Avoid window dragging from urlbar */
-:root[tabsintitlebar] #nav-bar .urlbar-input-box, 
-:root[tabsintitlebar] #nav-bar .urlbar-input-box * {
-	-moz-window-dragging: no-drag !important;
-}
-
diff --git a/theme/gnome-theme.css b/theme/gnome-theme.css
index 42821b7..2a6f6ea 100644
--- a/theme/gnome-theme.css
+++ b/theme/gnome-theme.css
@@ -11,10 +11,12 @@
 @import "parts/icons.css";
 @import "colors/light.css";
 @import "colors/dark.css";
+@import "system-icons.css";
+@import "symbolic-tab-icons.css";
 @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
 /* Set theme version text in customization panel */
 #customization-footer::before {
-	content: "Firefox GNOME theme v80";
+	content: "Firefox GNOME theme v81";
 	padding: 9px;
 }
diff --git a/theme/hide-single-tab.css b/theme/hide-single-tab.css
deleted file mode 100644
index 943c67b..0000000
--- a/theme/hide-single-tab.css
+++ /dev/null
@@ -1,7 +0,0 @@
-@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-#tabbrowser-tabs tab:only-of-type {
-	display: none !important;
-}
-
-/* TODO: Hidde tabbar bottom border */
diff --git a/theme/normal-width-tabs.css b/theme/normal-width-tabs.css
deleted file mode 100644
index 8d7641c..0000000
--- a/theme/normal-width-tabs.css
+++ /dev/null
@@ -1,8 +0,0 @@
-/* Use normal width tabs */
-
-@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-.tabbrowser-tab:not([style^="max-width"]):not([pinned]),
-.tabbrowser-tab[style^="max-width: 100px !important;"]:not([pinned]) {
-	max-width: 225px !important;
-}
diff --git a/theme/parts/csd.css b/theme/parts/csd.css
index 399052c..4ac1ff0 100644
--- a/theme/parts/csd.css
+++ b/theme/parts/csd.css
@@ -159,3 +159,18 @@
 	box-shadow: var(--gnome-button-active-box-shadow);
 	border-color: var(--gnome-button-active-border-color) !important;
 }
+
+/* OPTIONAL: Allow draging the window from headerbar buttons */
+@supports -moz-bool-pref("gnomeTheme.dragWindowHeaderbarButtons") {
+	:root[tabsintitlebar] #nav-bar *,
+	:root[tabsintitlebar] #titlebar .titlebar-button,
+	:root[tabsintitlebar][inFullscreen] #window-controls toolbarbutton {
+		-moz-window-dragging: drag;
+	}
+	
+	/* Avoid window dragging from urlbar */
+	:root[tabsintitlebar] #nav-bar .urlbar-input-box,
+	:root[tabsintitlebar] #nav-bar .urlbar-input-box * {
+		-moz-window-dragging: no-drag !important;
+	}
+}
diff --git a/theme/parts/tabsbar.css b/theme/parts/tabsbar.css
index 4936e20..86b5ed8 100644
--- a/theme/parts/tabsbar.css
+++ b/theme/parts/tabsbar.css
@@ -292,9 +292,27 @@ tab[selected]:-moz-window-inactive {
 	margin-right: -10px;
 }
 
-/* OPTIONAL: Hide Single Tab */
+/* OPTIONAL: Hide single tab */
 @supports -moz-bool-pref("gnomeTheme.hideSingleTab") {
 	#tabbrowser-tabs tab:only-of-type {
 		display: none !important;
 	}
 }
+
+/* OPTIONAL: Use normal width tabs */
+@supports -moz-bool-pref("gnomeTheme.normalWidthTabs") {
+	.tabbrowser-tab:not([style^="max-width"]):not([pinned]),
+	.tabbrowser-tab[style^="max-width: 100px !important;"]:not([pinned]) {
+		max-width: 225px !important;
+	}
+}
+
+/* OPTIONAL: Add more contrast to the active tab */
+@supports -moz-bool-pref("gnomeTheme.activeTabContrast") {
+	.tab-background[selected=true],
+	:root:not(:-moz-window-inactive) .tabbrowser-tab:hover > .tab-stack > .tab-background:not(#hack) {
+		background: var(--gnome-tabbar-tab-active-background-contrast) !important;
+		border-bottom-width: 5px !important;
+		border-bottom-color: var(--gnome-tabbar-tab-active-border-bottom-color-contrast) !important;
+	}
+}
diff --git a/theme/square-title-buttons.css b/theme/square-title-buttons.css
deleted file mode 100644
index b692eca..0000000
--- a/theme/square-title-buttons.css
+++ /dev/null
@@ -1,14 +0,0 @@
-/* Square title buttons old style */
-
-@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-:root[tabsintitlebar] #titlebar .titlebar-button {
-	border-radius: 5px !important;
-	height: 34px !important;
-	margin: 0 3px !important;
-	width: 34px !important;
-}
-
-:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-button {
-	border-color: transparent !important;
-}
diff --git a/theme/symbolic-tab-icons.css b/theme/symbolic-tab-icons.css
index 4f78367..a409857 100644
--- a/theme/symbolic-tab-icons.css
+++ b/theme/symbolic-tab-icons.css
@@ -10,8 +10,10 @@
 	}
 }
 
-/* Make tab icons look kinda like symbolic icons */
-tab .tab-icon-image {
-	filter: var(--gnome-convert-icon-to-symbolic-hack-filter);
+/* OPTIONAL: Make all tab icons look kinda like symbolic icons */
+@supports -moz-bool-pref("gnomeTheme.symbolicTabIcons") {	
+	tab .tab-icon-image {
+		filter: var(--gnome-convert-icon-to-symbolic-hack-filter);
+	}
 }
 
diff --git a/theme/system-icons.css b/theme/system-icons.css
index 54492be..f8ed0be 100644
--- a/theme/system-icons.css
+++ b/theme/system-icons.css
@@ -12,189 +12,192 @@
 	}
 }
 
-/* Window buttons */
-:root[tabsintitlebar] #titlebar .titlebar-button .toolbarbutton-icon,
-:root[tabsintitlebar][inFullscreen] #window-controls toolbarbutton .toolbarbutton-icon {
-	filter: var(--gnome-window-icons-hack-filter) !important;
-	width: 16px;
-}
-:root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-close .toolbarbutton-icon,
-:root[tabsintitlebar] #titlebar #titlebar-close .toolbarbutton-icon {
-	list-style-image: url("moz-icon://stock/window-close-symbolic?size=dialog") !important;
-}
-:root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-max .toolbarbutton-icon,
-:root[tabsintitlebar] #titlebar #titlebar-max .toolbarbutton-icon {
-	list-style-image: url("moz-icon://stock/window-maximize-symbolic?size=dialog") !important;
-}
-:root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-restore .toolbarbutton-icon {
-	list-style-image: url("moz-icon://stock/window-restore-symbolic?size=dialog") !important;
-}
-:root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-min .toolbarbutton-icon,
-:root[tabsintitlebar] #titlebar #titlebar-min .toolbarbutton-icon {
-	list-style-image: url("moz-icon://stock/window-minimize-symbolic?size=dialog") !important;
-}
-:root[tabsintitlebar][inFullscreen] #window-controls #restore-button .toolbarbutton-icon {
-	list-style-image: url("moz-icon://stock/view-restore-symbolic?size=dialog") !important;
-}
-
-/* Toolbars close button */
-.close-icon:not(.tab-close-button) {	
-	list-style-image: url("moz-icon://stock/window-close-symbolic?size=dialog") !important;
-}
-.close-icon:not(.tab-close-button) image {
-	filter: var(--gnome-window-icons-hack-filter) !important;
-}
-
-/* Navbar icons */
-
-/* Back button */
-#nav-bar #back-button .toolbarbutton-icon {
-	filter: var(--gnome-icons-hack-filter);
-	list-style-image: url("moz-icon://stock/go-previous-symbolic?size=dialog") !important;
-}
-/* Forward button */
-#nav-bar #forward-button .toolbarbutton-icon {
-	filter: var(--gnome-icons-hack-filter);
-	list-style-image: url("moz-icon://stock/go-next-symbolic?size=dialog") !important;
-}
-/* Menu button */
-#PanelUI-menu-button .toolbarbutton-icon {
-	filter: var(--gnome-icons-hack-filter);
-	list-style-image: url("moz-icon://stock/open-menu-symbolic?size=dialog") !important;
-}
-/* New tab button */
-#new-tab-button .toolbarbutton-icon {
-	filter: var(--gnome-icons-hack-filter);
-	list-style-image: url("moz-icon://stock/tab-new-symbolic?size=dialog") !important;
-}
-/* Home button */
-#home-button .toolbarbutton-icon {
-	filter: var(--gnome-icons-hack-filter);
-	list-style-image: url("moz-icon://stock/user-home-symbolic?size=dialog") !important;
-}
-/* Preferences button */
-#preferences-button .toolbarbutton-icon {
-	filter: var(--gnome-icons-hack-filter);
-	list-style-image: url("moz-icon://stock/preferences-system-symbolic?size=dialog") !important;
-}
-/* Fullscreen button */
-#fullscreen-button .toolbarbutton-icon {
-	filter: var(--gnome-icons-hack-filter);
-	list-style-image: url("moz-icon://stock/view-fullscreen-symbolic?size=dialog") !important;
-}
-/* Zoom out button */
-#zoom-out-button .toolbarbutton-icon {
-	filter: var(--gnome-icons-hack-filter);
-	list-style-image: url("moz-icon://stock/zoom-out-symbolic?size=dialog") !important;
-}
-/* Zoom in button */
-#zoom-in-button .toolbarbutton-icon {
-	filter: var(--gnome-icons-hack-filter);
-	list-style-image: url("moz-icon://stock/zoom-in-symbolic?size=dialog") !important;
-}
-/* Developer button */
-#developer-button .toolbarbutton-icon {
-	filter: var(--gnome-icons-hack-filter);
-	list-style-image: url("moz-icon://stock/applications-engineering-symbolic?size=dialog") !important;
-}
-/* Email link button */
-#email-link-button .toolbarbutton-icon {
-	filter: var(--gnome-icons-hack-filter);
-	list-style-image: url("moz-icon://stock/mail-unread-symbolic?size=dialog") !important;
-}
-/* Print button */
-#print-button .toolbarbutton-icon {
-	filter: var(--gnome-icons-hack-filter);
-	list-style-image: url("moz-icon://stock/printer-symbolic?size=dialog") !important;
-}
-/* Addons button */
-#add-ons-button .toolbarbutton-icon {
-	filter: var(--gnome-icons-hack-filter);
-	list-style-image: url("moz-icon://stock/application-x-addon-symbolic?size=dialog") !important;
-}
-/* Find button */
-#find-button .toolbarbutton-icon {
-	filter: var(--gnome-icons-hack-filter);
-	list-style-image: url("moz-icon://stock/edit-find-symbolic?size=dialog") !important;
-}
-/* New window button */
-#new-window-button .toolbarbutton-icon {
-	filter: var(--gnome-icons-hack-filter);
-	list-style-image: url("moz-icon://stock/window-new-symbolic?size=dialog") !important;
-}
-/* Bookmarks menu button */
-#bookmarks-menu-button .toolbarbutton-icon {
-	filter: var(--gnome-icons-hack-filter);
-	list-style-image: url("moz-icon://stock/starred-symbolic?size=dialog") !important;
-}
-/* History button */
-#history-panelmenu .toolbarbutton-icon {
-	filter: var(--gnome-icons-hack-filter);
-	list-style-image: url("moz-icon://stock/preferences-system-time-symbolic?size=dialog") !important;
-}
-/* All tabs button */
-#alltabs-button {
-	list-style-image: url("moz-icon://stock/pan-down-symbolic?size=dialog") !important;
-}
-#alltabs-button .toolbarbutton-icon {
-	filter: var(--gnome-icons-hack-filter);
-}
-/* Cut button */
-#cut-button .toolbarbutton-icon {
-	filter: var(--gnome-icons-hack-filter);
-	list-style-image: url("moz-icon://stock/edit-cut-symbolic?size=dialog") !important;
-}
-/* Copy button */
-#copy-button .toolbarbutton-icon {
-	filter: var(--gnome-icons-hack-filter);
-	list-style-image: url("moz-icon://stock/edit-copy-symbolic?size=dialog") !important;
-}
-/* Paste button */
-#paste-button .toolbarbutton-icon {
-	filter: var(--gnome-icons-hack-filter);
-	list-style-image: url("moz-icon://stock/edit-paste-symbolic?size=dialog") !important;
-}
-
-/* Navbar overflow button */
-#nav-bar-overflow-button .toolbarbutton-icon {
-	filter: var(--gnome-icons-hack-filter);
-	list-style-image: url("moz-icon://stock/view-more-horizontal-symbolic?size=dialog") !important;
-}
-
-/* Context back button */	
-#context-back .menu-iconic-icon { 
-	filter: var(--gnome-icons-hack-filter);
-	list-style-image: url("moz-icon://stock/go-previous-symbolic?size=dialog") !important;
-}
-/* Context forward button */	
-#context-forward .menu-iconic-icon { 
-	filter: var(--gnome-icons-hack-filter);
-	list-style-image: url("moz-icon://stock/go-next-symbolic?size=dialog") !important;
-}
-
-/* Main menu buttons icons */
-#appMenu-zoomReduce-button .toolbarbutton-icon {
-	filter: var(--gnome-icons-hack-filter);
-	list-style-image: url("moz-icon://stock/zoom-out-symbolic?size=dialog") !important;
-}
-#appMenu-zoomEnlarge-button .toolbarbutton-icon {
-	filter: var(--gnome-icons-hack-filter);
-	list-style-image: url("moz-icon://stock/zoom-in-symbolic?size=dialog") !important;
-}
-#appMenu-fullscreen-button .toolbarbutton-icon {
-	filter: var(--gnome-icons-hack-filter);
-	list-style-image: url("moz-icon://stock/view-fullscreen-symbolic?size=dialog") !important;
-}
-#appMenu-cut-button .toolbarbutton-icon {
-	filter: var(--gnome-icons-hack-filter);
-	list-style-image: url("moz-icon://stock/edit-cut-symbolic?size=dialog") !important;
-}
-#appMenu-copy-button .toolbarbutton-icon {
-	filter: var(--gnome-icons-hack-filter);
-	list-style-image: url("moz-icon://stock/edit-copy-symbolic?size=dialog") !important;
-}
-#appMenu-paste-button .toolbarbutton-icon {
-	filter: var(--gnome-icons-hack-filter);
-	list-style-image: url("moz-icon://stock/edit-paste-symbolic?size=dialog") !important;
+/* OPTIONAL: Use system theme icons instead of Adwaita icons included by theme */
+@supports -moz-bool-pref("gnomeTheme.systemIcons") {
+	/* Window buttons */
+	:root[tabsintitlebar] #titlebar .titlebar-button .toolbarbutton-icon,
+	:root[tabsintitlebar][inFullscreen] #window-controls toolbarbutton .toolbarbutton-icon {
+		filter: var(--gnome-window-icons-hack-filter) !important;
+		width: 16px;
+	}
+	:root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-close .toolbarbutton-icon,
+	:root[tabsintitlebar] #titlebar #titlebar-close .toolbarbutton-icon {
+		list-style-image: url("moz-icon://stock/window-close-symbolic?size=dialog") !important;
+	}
+	:root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-max .toolbarbutton-icon,
+	:root[tabsintitlebar] #titlebar #titlebar-max .toolbarbutton-icon {
+		list-style-image: url("moz-icon://stock/window-maximize-symbolic?size=dialog") !important;
+	}
+	:root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-restore .toolbarbutton-icon {
+		list-style-image: url("moz-icon://stock/window-restore-symbolic?size=dialog") !important;
+	}
+	:root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-min .toolbarbutton-icon,
+	:root[tabsintitlebar] #titlebar #titlebar-min .toolbarbutton-icon {
+		list-style-image: url("moz-icon://stock/window-minimize-symbolic?size=dialog") !important;
+	}
+	:root[tabsintitlebar][inFullscreen] #window-controls #restore-button .toolbarbutton-icon {
+		list-style-image: url("moz-icon://stock/view-restore-symbolic?size=dialog") !important;
+	}
+
+	/* Toolbars close button */
+	.close-icon:not(.tab-close-button) {	
+		list-style-image: url("moz-icon://stock/window-close-symbolic?size=dialog") !important;
+	}
+	.close-icon:not(.tab-close-button) image {
+		filter: var(--gnome-window-icons-hack-filter) !important;
+	}
+
+	/* Navbar icons */
+
+	/* Back button */
+	#nav-bar #back-button .toolbarbutton-icon {
+		filter: var(--gnome-icons-hack-filter);
+		list-style-image: url("moz-icon://stock/go-previous-symbolic?size=dialog") !important;
+	}
+	/* Forward button */
+	#nav-bar #forward-button .toolbarbutton-icon {
+		filter: var(--gnome-icons-hack-filter);
+		list-style-image: url("moz-icon://stock/go-next-symbolic?size=dialog") !important;
+	}
+	/* Menu button */
+	#PanelUI-menu-button .toolbarbutton-icon {
+		filter: var(--gnome-icons-hack-filter);
+		list-style-image: url("moz-icon://stock/open-menu-symbolic?size=dialog") !important;
+	}
+	/* New tab button */
+	#new-tab-button .toolbarbutton-icon {
+		filter: var(--gnome-icons-hack-filter);
+		list-style-image: url("moz-icon://stock/tab-new-symbolic?size=dialog") !important;
+	}
+	/* Home button */
+	#home-button .toolbarbutton-icon {
+		filter: var(--gnome-icons-hack-filter);
+		list-style-image: url("moz-icon://stock/user-home-symbolic?size=dialog") !important;
+	}
+	/* Preferences button */
+	#preferences-button .toolbarbutton-icon {
+		filter: var(--gnome-icons-hack-filter);
+		list-style-image: url("moz-icon://stock/preferences-system-symbolic?size=dialog") !important;
+	}
+	/* Fullscreen button */
+	#fullscreen-button .toolbarbutton-icon {
+		filter: var(--gnome-icons-hack-filter);
+		list-style-image: url("moz-icon://stock/view-fullscreen-symbolic?size=dialog") !important;
+	}
+	/* Zoom out button */
+	#zoom-out-button .toolbarbutton-icon {
+		filter: var(--gnome-icons-hack-filter);
+		list-style-image: url("moz-icon://stock/zoom-out-symbolic?size=dialog") !important;
+	}
+	/* Zoom in button */
+	#zoom-in-button .toolbarbutton-icon {
+		filter: var(--gnome-icons-hack-filter);
+		list-style-image: url("moz-icon://stock/zoom-in-symbolic?size=dialog") !important;
+	}
+	/* Developer button */
+	#developer-button .toolbarbutton-icon {
+		filter: var(--gnome-icons-hack-filter);
+		list-style-image: url("moz-icon://stock/applications-engineering-symbolic?size=dialog") !important;
+	}
+	/* Email link button */
+	#email-link-button .toolbarbutton-icon {
+		filter: var(--gnome-icons-hack-filter);
+		list-style-image: url("moz-icon://stock/mail-unread-symbolic?size=dialog") !important;
+	}
+	/* Print button */
+	#print-button .toolbarbutton-icon {
+		filter: var(--gnome-icons-hack-filter);
+		list-style-image: url("moz-icon://stock/printer-symbolic?size=dialog") !important;
+	}
+	/* Addons button */
+	#add-ons-button .toolbarbutton-icon {
+		filter: var(--gnome-icons-hack-filter);
+		list-style-image: url("moz-icon://stock/application-x-addon-symbolic?size=dialog") !important;
+	}
+	/* Find button */
+	#find-button .toolbarbutton-icon {
+		filter: var(--gnome-icons-hack-filter);
+		list-style-image: url("moz-icon://stock/edit-find-symbolic?size=dialog") !important;
+	}
+	/* New window button */
+	#new-window-button .toolbarbutton-icon {
+		filter: var(--gnome-icons-hack-filter);
+		list-style-image: url("moz-icon://stock/window-new-symbolic?size=dialog") !important;
+	}
+	/* Bookmarks menu button */
+	#bookmarks-menu-button .toolbarbutton-icon {
+		filter: var(--gnome-icons-hack-filter);
+		list-style-image: url("moz-icon://stock/starred-symbolic?size=dialog") !important;
+	}
+	/* History button */
+	#history-panelmenu .toolbarbutton-icon {
+		filter: var(--gnome-icons-hack-filter);
+		list-style-image: url("moz-icon://stock/preferences-system-time-symbolic?size=dialog") !important;
+	}
+	/* All tabs button */
+	#alltabs-button {
+		list-style-image: url("moz-icon://stock/pan-down-symbolic?size=dialog") !important;
+	}
+	#alltabs-button .toolbarbutton-icon {
+		filter: var(--gnome-icons-hack-filter);
+	}
+	/* Cut button */
+	#cut-button .toolbarbutton-icon {
+		filter: var(--gnome-icons-hack-filter);
+		list-style-image: url("moz-icon://stock/edit-cut-symbolic?size=dialog") !important;
+	}
+	/* Copy button */
+	#copy-button .toolbarbutton-icon {
+		filter: var(--gnome-icons-hack-filter);
+		list-style-image: url("moz-icon://stock/edit-copy-symbolic?size=dialog") !important;
+	}
+	/* Paste button */
+	#paste-button .toolbarbutton-icon {
+		filter: var(--gnome-icons-hack-filter);
+		list-style-image: url("moz-icon://stock/edit-paste-symbolic?size=dialog") !important;
+	}
+
+	/* Navbar overflow button */
+	#nav-bar-overflow-button .toolbarbutton-icon {
+		filter: var(--gnome-icons-hack-filter);
+		list-style-image: url("moz-icon://stock/view-more-horizontal-symbolic?size=dialog") !important;
+	}
+
+	/* Context back button */	
+	#context-back .menu-iconic-icon { 
+		filter: var(--gnome-icons-hack-filter);
+		list-style-image: url("moz-icon://stock/go-previous-symbolic?size=dialog") !important;
+	}
+	/* Context forward button */	
+	#context-forward .menu-iconic-icon { 
+		filter: var(--gnome-icons-hack-filter);
+		list-style-image: url("moz-icon://stock/go-next-symbolic?size=dialog") !important;
+	}
+
+	/* Main menu buttons icons */
+	#appMenu-zoomReduce-button .toolbarbutton-icon {
+		filter: var(--gnome-icons-hack-filter);
+		list-style-image: url("moz-icon://stock/zoom-out-symbolic?size=dialog") !important;
+	}
+	#appMenu-zoomEnlarge-button .toolbarbutton-icon {
+		filter: var(--gnome-icons-hack-filter);
+		list-style-image: url("moz-icon://stock/zoom-in-symbolic?size=dialog") !important;
+	}
+	#appMenu-fullscreen-button .toolbarbutton-icon {
+		filter: var(--gnome-icons-hack-filter);
+		list-style-image: url("moz-icon://stock/view-fullscreen-symbolic?size=dialog") !important;
+	}
+	#appMenu-cut-button .toolbarbutton-icon {
+		filter: var(--gnome-icons-hack-filter);
+		list-style-image: url("moz-icon://stock/edit-cut-symbolic?size=dialog") !important;
+	}
+	#appMenu-copy-button .toolbarbutton-icon {
+		filter: var(--gnome-icons-hack-filter);
+		list-style-image: url("moz-icon://stock/edit-copy-symbolic?size=dialog") !important;
+	}
+	#appMenu-paste-button .toolbarbutton-icon {
+		filter: var(--gnome-icons-hack-filter);
+		list-style-image: url("moz-icon://stock/edit-paste-symbolic?size=dialog") !important;
+	}
 }
 
diff --git a/userChrome.css b/userChrome.css
index 8f6d49d..c8a72ee 100644
--- a/userChrome.css
+++ b/userChrome.css
@@ -2,39 +2,8 @@
 /* Import theme */
 @import "theme/gnome-theme.css";
 
-/*
- * Here you can enable other theme features not included by default.
- * To enable a specific feature, uncomment its @import line by removing "/*" at
- * the beginning of the line. To disable it, put the "/*" back.
- */
-
-/* Hide the tab bar when only one tab is open (GNOMISH)
- * You should move the new tab button somewhere else for this to work, because by
- * default it is on the tab bar too. */
-/*@import "theme/hide-single-tab.css"; /**/
-
-/* Use square title buttons old style */
-/*@import "theme/square-title-buttons.css"; /**/
-
-/* Use normal width tabs */
-/*@import "theme/normal-width-tabs.css"; /**/
-
-/* Active tab high contrast */
-/*@import "theme/active-tab-contrast.css"; /**/
-
-/* Use system theme icons instead of Adwaita icons included by theme */
-/*@import "theme/system-icons.css"; /**/
-
-/* Allow drag window from headerbar buttons (GNOMISH) [BUGGED] 
- * It can activate button action, with unpleasant behavior. */
-/*@import "theme/drag-window-headerbar-buttons.css"; /**/
-
-/* Make all tab icons look kinda like symbolic icons */
-/*@import "theme/symbolic-tab-icons.css"; /**/
-
 /* Import a custom stylesheet
  * Everything you add in your customChrome.css file (it doesn't exist by
- * default) will be included here and preserved between updates, so you can move
- * your configuration to that file if you don't like setting it up after every
- * update. You can also apply your own custom styles in that file. */
+ * default) will be included here and preserved between updates. 
+ * You can apply your own custom styles in that file. */
 @import "customChrome.css"; /**/