diff --git a/README.md b/README.md
index 19041226..0b89caee 100644
--- a/README.md
+++ b/README.md
@@ -75,7 +75,7 @@ Usage:  `./install.sh [OPTIONS...]`
 
 -b, --background [default|blank|IMAGE_PATH] # Set gnome-shell background image. Default is BigSur-like wallpaper
 
--N, --nautilus-style [default|stable|mojave|glassy] # Set Nautilus style. Default is stable (stabled sidebar)
+-N, --nautilus-style [stable|normal|mojave|glassy] # Set Nautilus style. Default is stable (stabled sidebar)
 
 --round, --roundedmaxwindow # Set maximized window to rounded. Default is square
 
diff --git a/install.sh b/install.sh
index a9cdeab3..8ab7f93d 100755
--- a/install.sh
+++ b/install.sh
@@ -32,7 +32,7 @@ usage() {
   helpify "-i, --icon"           "[$(IFS='|'; echo "${ICON_VARIANTS[*]}")]"           "Set 'Activities' icon"                            "Default is 'standard'"
   # Not sure if "background" is even needed here
   helpify "-b, --background"     "[default|blank|IMAGE_PATH]"                         "Set gnome-shell background image"                 "Default is BigSur-like wallpaper"
-  helpify "-N, --nautilus-style" "[$(IFS='|'; echo "${NAUTILUS_STYLE_VARIANTS[*]}")]" "Set Nautilus style"                               "Default is BigSur-like style"
+  helpify "-N, --nautilus-style" "[$(IFS='|'; echo "${NAUTILUS_STYLE_VARIANTS[*]}")]" "Set Nautilus style"                               "Default is BigSur-like style (stabled sidebar)"
   helpify "-HD, --highdefinition"         ""                                          "Set to High Definition size"                      "Default is laptop size"
   helpify "--normal, --normalshowapps"    ""                                          "Set gnome-shell show apps button style to normal" "Default is bigsur"
   helpify "--round, --roundedmaxwindow"   ""                                          "Set maximized window to rounded"                  "Default is square"
diff --git a/lib-core.sh b/lib-core.sh
index 27d5c92f..d4f4c062 100755
--- a/lib-core.sh
+++ b/lib-core.sh
@@ -85,7 +85,7 @@ THEME_VARIANTS=('default' 'blue' 'purple' 'pink' 'red' 'orange' 'yellow' 'green'
 ICON_VARIANTS=('standard' 'simple' 'gnome' 'ubuntu' 'arch' 'manjaro' 'fedora' 'debian' 'void')
 SIDEBAR_SIZE_VARIANTS=('default' '220' '240' '260' '280')
 PANEL_OPACITY_VARIANTS=('default' '30' '45' '60' '75')
-NAUTILUS_STYLE_VARIANTS=('default' 'stable' 'mojave' 'glassy')
+NAUTILUS_STYLE_VARIANTS=('stable' 'normal' 'mojave' 'glassy')
 
 #--------Customization, default values----------#
 dest="${THEME_DIR}"
@@ -97,7 +97,7 @@ themes=("${THEME_VARIANTS[0]}")
 icon="${ICON_VARIANTS[0]}"
 sidebar_size="${SIDEBAR_SIZE_VARIANTS[0]}"
 panel_opacity="${PANEL_OPACITY_VARIANTS[0]}"
-nautilus_style="${NAUTILUS_STYLE_VARIANTS[1]}"
+nautilus_style="${NAUTILUS_STYLE_VARIANTS[0]}"
 background="default"
 compact="true"
 
diff --git a/src/other/firefox/WhiteSur/parts/buttons-fixes.css b/src/other/firefox/WhiteSur/parts/buttons-fixes.css
index 36211fc7..24417241 100644
--- a/src/other/firefox/WhiteSur/parts/buttons-fixes.css
+++ b/src/other/firefox/WhiteSur/parts/buttons-fixes.css
@@ -205,10 +205,10 @@ button.close {
 	display: none !important;
 }
 .protections-popup-footer-button-label {
-    margin-inline-start: 0 !important;
+	margin-inline-start: 0 !important;
 }
 #protections-popup-footer-protection-type-label {
-    margin-inline-end: 0 !important;
+	margin-inline-end: 0 !important;
 	margin-block: 0 !important;
 }
 
diff --git a/src/other/firefox/WhiteSur/parts/buttons.css b/src/other/firefox/WhiteSur/parts/buttons.css
index f8bae09b..0404e6d3 100644
--- a/src/other/firefox/WhiteSur/parts/buttons.css
+++ b/src/other/firefox/WhiteSur/parts/buttons.css
@@ -229,11 +229,20 @@ button.close:not(:active):hover,
 #TabsToolbar .toolbarbutton-1:not(:active):not([open]):hover,
 #protections-popup-info-button:hover,
 .permission-popup-permission-remove-button:not(:active):hover {
-	box-shadow: var(--gnome-button-box-shadow) !important;
+	box-shadow: none !important;
 	border-color: var(--gnome-button-border-color) !important;
 	border-bottom-color: var(--gnome-button-border-accent-color) !important;
 }
 
+.subviewbutton-back:not(#hack):active,
+.close-icon:not(.tab-close-button):active,
+button.close:active,
+#TabsToolbar .toolbarbutton-1:active,
+#protections-popup-info-button:active,
+.permission-popup-permission-remove-button:active {
+	box-shadow: none !important;
+}
+
 .close-icon:not(.tab-close-button) {
 	background: transparent !important;
 	box-shadow: none !important;
diff --git a/src/other/firefox/WhiteSur/parts/icons.css b/src/other/firefox/WhiteSur/parts/icons.css
index c71e83b6..06fbd76b 100644
--- a/src/other/firefox/WhiteSur/parts/icons.css
+++ b/src/other/firefox/WhiteSur/parts/icons.css
@@ -498,8 +498,9 @@ menuitem[type="radio"]:not([disabled="true"]):hover .menu-iconic-icon {
 	#reload-button .toolbarbutton-icon,
 	#stop-button .toolbarbutton-icon,
 	#downloads-button .toolbarbutton-icon,
-	#nav-bar #sync-button .toolbarbutton-icon,
-	#nav-bar #new-window-button .toolbarbutton-icon,
+	#sync-button .toolbarbutton-icon,
+	#new-window-button .toolbarbutton-icon,
+	#screenshot-button .toolbarbutton-icon,
 	#tracking-protection-icon,
 	#identity-icon,
 	#pageActionButton,
diff --git a/src/other/firefox/WhiteSur/system-icons.css b/src/other/firefox/WhiteSur/system-icons.css
index 928f9248..3f229952 100644
--- a/src/other/firefox/WhiteSur/system-icons.css
+++ b/src/other/firefox/WhiteSur/system-icons.css
@@ -12,164 +12,192 @@
 	}
 }
 
-/* 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/pan-down-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/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index bdc959f3..15937ee8 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -185,17 +185,6 @@ $list_shadow: if($variant == 'light',
   background-image: none;
   box-shadow: none;
 
-  &.flat {
-    @include button(undecorated);
-    color: $selected_fg_color;
-    background-color: transparentize($selected_fg_color, 1);
-    background-image: none;
-  }
-
-  &.flat:disabled {
-    &, label { color: transparentize($selected_fg_color, 0.6); }
-  }
-
   &:hover {
     color: $selected_fg_color;
     background-color: transparentize($selected_fg_color, 0.8);
@@ -203,7 +192,7 @@ $list_shadow: if($variant == 'light',
     box-shadow: none;
   }
 
-  &:active, &:active:hover, &:checked {
+  &:active, &:checked {
     color: $selected_fg_color;
     background-color: transparentize($selected_fg_color, 0.6);
     border-color: transparentize($selected_fg_color, 0.5);
@@ -1501,7 +1490,7 @@ actionbar {
       transition: $button_transition;
     }
 
-    &:active, &:active:hover {
+    &:active {
       @include button(header-active);
       transition: $button_transition;
       transition-duration: 300ms;
@@ -1620,7 +1609,7 @@ actionbar {
       transition: $button_transition;
     }
 
-    &:active, &:active:hover {
+    &:active {
       @include button(header-active);
       transition: $button_transition;
       transition-duration: 300ms;
@@ -1740,7 +1729,7 @@ actionbar {
         @include button(header-hover);
       }
 
-      &:active, &:active:hover {
+      &:active {
         @include button(header-active);
       }
 
@@ -1766,8 +1755,8 @@ actionbar {
       border-color: darken($selection_mode_bg, 4%);
     }
 
-    button {
-      @include button(undecorated);
+    button:not(.flat):not(.suggested-action):not(.destructive-action):not(.titlebutton) {
+      // @include button(undecorated);
       @extend %selected-button;
     }
 
@@ -2618,7 +2607,7 @@ notebook {
           background-color: rgba($borders_color, 0.1);
         }
 
-        &:active, &:active:hover {
+        &:active {
           @extend %undecorated_button;
           color: if($variant == 'light', darken($fg_color, 10%), lighten($fg_color, 10%));
           background-color: rgba($borders_color, 0.2);
@@ -3446,8 +3435,6 @@ row {
     background-color: if($variant == 'light', rgba(black, 0.15), rgba(white, 0.15));
 
     label { color: $fg_color; }
-
-    // button { @extend %selected-button; }
   }
 
   &.activatable {
@@ -3905,7 +3892,7 @@ paned {
 //
 
 infobar {
-  border-style: none;
+  border: none;
 
   &.info {
     & > revealer > box,
@@ -3949,7 +3936,7 @@ infobar {
       color: $selected_fg_color;
       caret-color: currentColor;
 
-      button {
+      button:not(.flat) {
         min-height: 28px;
         @extend %selected-button;
       }
diff --git a/src/sass/gtk/apps/_gnome-3.22.scss b/src/sass/gtk/apps/_gnome-3.22.scss
index fbc5d12a..04fdcaa5 100644
--- a/src/sass/gtk/apps/_gnome-3.22.scss
+++ b/src/sass/gtk/apps/_gnome-3.22.scss
@@ -30,7 +30,7 @@ $nautilus_sidebar_image: image($dark_sidebar_bg);
                                              $base_color 100%);
 }
 
-@if $nautilus_style == 'default' or $nautilus_style == 'glassy' {
+@if $nautilus_style == 'normal' or $nautilus_style == 'glassy' {
   $dialog_header_image: linear-gradient(90deg, $dialog_bg_color 5%,
                                                $dark_header_bg 40%);
 
@@ -44,12 +44,12 @@ $nautilus_sidebar_image: image($dark_sidebar_bg);
                                                             $header_border 25%);
 }
 
-@if $nautilus_style == 'default' or $nautilus_style == 'stable' {
+@if $nautilus_style == 'normal' or $nautilus_style == 'stable' {
   $nautilus_header_borders_image: linear-gradient(90deg, rgba($header_border, 0) $nautilus_sidebar_size,
                                                          $header_border $nautilus_sidebar_size);
 }
 
-@if $nautilus_style == 'stable' or $nautilus_style == 'default' {
+@if $nautilus_style == 'normal' or $nautilus_style == 'stable' {
     $nautilus_header_image: linear-gradient(90deg, $dark_sidebar_bg $nautilus_sidebar_size,
                                                    $nautilus_borders_color $nautilus_sidebar_size,
                                                    $nautilus_borders_color ($nautilus_sidebar_size + 1px),
@@ -79,7 +79,7 @@ $nautilus_sidebar_image: image($dark_sidebar_bg);
       }
 
       > deck > box.vertical > headerbar.titlebar {
-        @if $nautilus_style == 'stable' or $nautilus_style == 'default' {
+        @if $nautilus_style == 'normal' or $nautilus_style == 'stable' {
           background-image: linear-gradient(90deg, rgba($dark_header_bg, 0) $nautilus_sidebar_size,
                                                    $nautilus_borders_color $nautilus_sidebar_size,
                                                    $nautilus_borders_color ($nautilus_sidebar_size + 1px),
@@ -91,13 +91,13 @@ $nautilus_sidebar_image: image($dark_sidebar_bg);
         > box.horizontal:first-child { // move the search button to right side
           margin-right: -74px;
 
-          @if $nautilus_style == 'default' or $nautilus_style == 'stable' {
+          @if $nautilus_style == 'normal' or $nautilus_style == 'stable' {
             entry.search { margin-left: if($placement == 'left', $container_padding, $nautilus_sidebar_size - 74px); }
           }
         }
       }
 
-      @if $nautilus_style == 'default' or $nautilus_style == 'stable' {
+      @if $nautilus_style == 'normal' or $nautilus_style == 'stable' {
         &.maximized {
           > deck > box.vertical > headerbar.titlebar {
             > box.horizontal:first-child { // move the search button to right side
@@ -124,7 +124,7 @@ $nautilus_sidebar_image: image($dark_sidebar_bg);
         }
       }
 
-      @if $nautilus_style == 'default' or $nautilus_style == 'stable' {
+      @if $nautilus_style == 'normal' or $nautilus_style == 'stable' {
         @if $placement == 'left' {
           > .linked.raised > button:first-child { margin-left: $nautilus_sidebar_size - (48px + $container_padding * 6); }
         }
@@ -138,7 +138,7 @@ $nautilus_sidebar_image: image($dark_sidebar_bg);
     &.maximized {
       > headerbar.titlebar,
       > deck > box.vertical > headerbar.titlebar {
-        @if $nautilus_style == 'default' or $nautilus_style == 'stable' {
+        @if $nautilus_style == 'normal' or $nautilus_style == 'stable' {
           @if $placement == 'right' {
             .path-bar-box { margin-left: 0; }
             entry.search { margin-left: 0; }
@@ -152,7 +152,7 @@ $nautilus_sidebar_image: image($dark_sidebar_bg);
       border: none;
       border-bottom-left-radius: $wm_radius;
 
-      @if $nautilus_style == 'stable' or $nautilus_style == 'default' {
+      @if $nautilus_style == 'normal' or $nautilus_style == 'stable' {
         min-width: $nautilus_sidebar_size;
       }
 
diff --git a/src/sass/gtk/apps/_nemo.scss b/src/sass/gtk/apps/_nemo.scss
index 68b4853f..bed8e561 100644
--- a/src/sass/gtk/apps/_nemo.scss
+++ b/src/sass/gtk/apps/_nemo.scss
@@ -41,13 +41,8 @@
 
   paned > separator { background-image: image($solid_borders_color); }
 
-  notebook {
-    background-color: $base_color;
-  }
-
-  // Rename entry
   .nemo-window-pane {
-    widget.entry {
+    widget.entry { // Rename entry
       border: 2px solid if($variant =='light', $entry_highlight, $selected_bg_color);
       background-color: $entry_bg;
       border-radius: $bt_radius;
@@ -60,7 +55,7 @@
       }
     }
 
-    treeview.view {
+    treeview.view { // Treeview rename entry
       &, &:selected {
         entry {
           color: $fg_color;
@@ -69,6 +64,14 @@
         }
       }
     }
+
+    > notebook {
+      background-color: $base_color;
+
+      infobar > revealer > box { border-bottom: 1px solid $borders_color; }
+
+      box.vertical > separator { background: none; }
+    }
   }
 
   .toolbar {
diff --git a/src/sass/gtk/apps/_xfce.scss b/src/sass/gtk/apps/_xfce.scss
index ccacd8df..bec5a003 100644
--- a/src/sass/gtk/apps/_xfce.scss
+++ b/src/sass/gtk/apps/_xfce.scss
@@ -226,3 +226,23 @@ window.thunar {
     }
   }
 }
+
+
+//
+// mousepad
+//
+
+window.background.csd {
+  > box.vertical > notebook > stack > scrolledwindow.frame {
+    border: none;
+
+    > textview {
+      background-color: $base_color;
+
+      > text {
+        background-color: transparent;
+        border-radius: 0 0 $wm_radius $wm_radius;
+      }
+    }
+  }
+}