diff --git a/src/assets/cinnamon/assets-light/menu-solid.svg b/src/assets/cinnamon/assets-light/menu-solid.svg
index 9ca930cb..67ee5c74 100644
--- a/src/assets/cinnamon/assets-light/menu-solid.svg
+++ b/src/assets/cinnamon/assets-light/menu-solid.svg
@@ -1,113 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="78"
-   height="80"
-   version="1.1"
-   viewBox="0 0 78 80"
-   id="svg17"
-   sodipodi:docname="menu-solid.svg"
-   inkscape:version="1.0.2 (e86c870879, 2021-01-15, custom)">
-  <metadata
-     id="metadata21">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="957"
-     id="namedview19"
-     showgrid="false"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:zoom="4.5"
-     inkscape:cx="75.746908"
-     inkscape:cy="43.080028"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg17"
-     inkscape:document-rotation="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid846" />
-    <sodipodi:guide
-       position="59,74"
-       orientation="1,0"
-       id="guide864" />
-    <sodipodi:guide
-       position="59,62"
-       orientation="0,-1"
-       id="guide866" />
-  </sodipodi:namedview>
-  <defs
-     id="defs5">
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter852"
-       x="-0.108"
-       width="1.216"
-       y="-0.108"
-       height="1.216">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="2.88"
-         id="feGaussianBlur854" />
-    </filter>
-  </defs>
-  <rect
-     x="7"
-     y="9.0000248"
-     width="64"
-     height="64"
-     rx="12"
-     ry="12"
-     fill="#323232"
-     opacity="0.3325"
-     id="rect848"
-     style="fill:#000000;stroke-width:2.9091;filter:url(#filter852)" />
-  <path
-     id="rect869"
-     style="stroke-width:3.00001;fill:#000000;opacity:0.15"
-     d="M 19 5 C 11.798 5 6 10.797995 6 18 L 6 58 C 6 65.202005 11.798 71 19 71 L 59 71 C 66.202 71 72 65.202005 72 58 L 72 18 C 72 10.797995 66.202 5 59 5 L 19 5 z M 19 6 L 59 6 C 65.648 6 71 11.352 71 18 L 71 58 C 71 64.648 65.648 70 59 70 L 19 70 C 12.352 70 7 64.648 7 58 L 7 18 C 7 11.352 12.352 6 19 6 z " />
-  <rect
-     x="7"
-     y="6.0000243"
-     width="64"
-     height="64"
-     rx="12"
-     ry="12"
-     fill="#323232"
-     opacity="0.95"
-     id="rect11"
-     style="stroke-width:2.9091;fill:#f5f5f5;fill-opacity:1;opacity:1" />
-  <path
-     id="rect856"
-     style="opacity:0.1;fill:#ffffff;stroke-width:2.9091"
-     d="M 19,6 C 12.352,6 7,11.352 7,18 v 40 c 0,6.648 5.352,12 12,12 h 40 c 6.648,0 12,-5.352 12,-12 V 18 C 71,11.352 65.648,6 59,6 Z m 0,1 h 40 c 6.094,0 11,4.905995 11,11 v 40 c 0,6.094005 -4.906,11 -11,11 H 19 C 12.906,69 8,64.094005 8,58 V 18 C 8,11.905995 12.906,7 19,7 Z" />
+<svg width="78" height="80" version="1.1" viewBox="0 0 78 80" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <filter id="filter852" x="-.108" y="-.108" width="1.216" height="1.216" color-interpolation-filters="sRGB">
+   <feGaussianBlur stdDeviation="2.88"/>
+  </filter>
+ </defs>
+ <rect x="7" y="9" width="64" height="64" rx="12" ry="12" fill="#000000" filter="url(#filter852)" opacity=".3325" stroke-width="2.9091"/>
+ <path d="m19 5c-7.202 0-13 5.798-13 13v40c0 7.202 5.798 13 13 13h40c7.202 0 13-5.798 13-13v-40c0-7.202-5.798-13-13-13h-40zm0 1h40c6.648 0 12 5.352 12 12v40c0 6.648-5.352 12-12 12h-40c-6.648 0-12-5.352-12-12v-40c0-6.648 5.352-12 12-12z" fill="#000000" opacity=".15" stroke-width="3"/>
+ <rect x="7" y="6" width="64" height="64" rx="12" ry="12" fill="#f5f5f5" stroke-width="2.9091"/>
+ <path d="m19 6c-6.648 0-12 5.352-12 12v40c0 6.648 5.352 12 12 12h40c6.648 0 12-5.352 12-12v-40c0-6.648-5.352-12-12-12zm0 1h40c6.094 0 11 4.906 11 11v40c0 6.094-4.906 11-11 11h-40c-6.094 0-11-4.906-11-11v-40c0-6.094 4.906-11 11-11z" fill="#ffffff" opacity=".1" stroke-width="2.9091"/>
 </svg>
diff --git a/src/assets/cinnamon/assets-light/menu.svg b/src/assets/cinnamon/assets-light/menu.svg
index a42a0349..0c605ba3 100644
--- a/src/assets/cinnamon/assets-light/menu.svg
+++ b/src/assets/cinnamon/assets-light/menu.svg
@@ -1,113 +1,11 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="78"
-   height="80"
-   version="1.1"
-   viewBox="0 0 78 80"
-   id="svg17"
-   sodipodi:docname="menu.svg"
-   inkscape:version="1.0.2 (e86c870879, 2021-01-15, custom)">
-  <metadata
-     id="metadata21">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="957"
-     id="namedview19"
-     showgrid="false"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:zoom="4.5"
-     inkscape:cx="75.746908"
-     inkscape:cy="43.080028"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg17"
-     inkscape:document-rotation="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid846" />
-    <sodipodi:guide
-       position="59,74"
-       orientation="1,0"
-       id="guide864" />
-    <sodipodi:guide
-       position="59,62"
-       orientation="0,-1"
-       id="guide866" />
-  </sodipodi:namedview>
-  <defs
-     id="defs5">
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter852"
-       x="-0.108"
-       width="1.216"
-       y="-0.108"
-       height="1.216">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="2.88"
-         id="feGaussianBlur854" />
-    </filter>
-  </defs>
-  <rect
-     x="7"
-     y="9.0000248"
-     width="64"
-     height="64"
-     rx="12"
-     ry="12"
-     fill="#323232"
-     opacity="0.3325"
-     id="rect848"
-     style="fill:#000000;stroke-width:2.9091;filter:url(#filter852)" />
-  <path
-     id="rect869"
-     style="stroke-width:3.00001;fill:#000000;opacity:0.15"
-     d="M 19 5 C 11.798 5 6 10.797995 6 18 L 6 58 C 6 65.202005 11.798 71 19 71 L 59 71 C 66.202 71 72 65.202005 72 58 L 72 18 C 72 10.797995 66.202 5 59 5 L 19 5 z M 19 6 L 59 6 C 65.648 6 71 11.352 71 18 L 71 58 C 71 64.648 65.648 70 59 70 L 19 70 C 12.352 70 7 64.648 7 58 L 7 18 C 7 11.352 12.352 6 19 6 z " />
-  <rect
-     x="7"
-     y="6.0000243"
-     width="64"
-     height="64"
-     rx="12"
-     ry="12"
-     fill="#323232"
-     opacity="0.95"
-     id="rect11"
-     style="stroke-width:2.9091;fill:#f5f5f5;fill-opacity:1" />
-  <path
-     id="rect856"
-     style="opacity:0.1;fill:#ffffff;stroke-width:2.9091"
-     d="M 19,6 C 12.352,6 7,11.352 7,18 v 40 c 0,6.648 5.352,12 12,12 h 40 c 6.648,0 12,-5.352 12,-12 V 18 C 71,11.352 65.648,6 59,6 Z m 0,1 h 40 c 6.094,0 11,4.905995 11,11 v 40 c 0,6.094005 -4.906,11 -11,11 H 19 C 12.906,69 8,64.094005 8,58 V 18 C 8,11.905995 12.906,7 19,7 Z" />
+<svg width="78" height="80" version="1.1" viewBox="0 0 78 80" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <filter id="filter852" x="-.108" y="-.108" width="1.216" height="1.216" color-interpolation-filters="sRGB">
+   <feGaussianBlur stdDeviation="2.88"/>
+  </filter>
+ </defs>
+ <rect x="7" y="9" width="64" height="64" rx="12" ry="12" fill="#000000" filter="url(#filter852)" opacity=".3325" stroke-width="2.9091"/>
+ <path d="m19 5c-7.202 0-13 5.798-13 13v40c0 7.202 5.798 13 13 13h40c7.202 0 13-5.798 13-13v-40c0-7.202-5.798-13-13-13h-40zm0 1h40c6.648 0 12 5.352 12 12v40c0 6.648-5.352 12-12 12h-40c-6.648 0-12-5.352-12-12v-40c0-6.648 5.352-12 12-12z" fill="#000000" opacity=".15" stroke-width="3"/>
+ <rect x="7" y="6" width="64" height="64" rx="12" ry="12" fill="#f5f5f5" opacity=".95" stroke-width="2.9091"/>
+ <path d="m19 6c-6.648 0-12 5.352-12 12v40c0 6.648 5.352 12 12 12h40c6.648 0 12-5.352 12-12v-40c0-6.648-5.352-12-12-12zm0 1h40c6.094 0 11 4.906 11 11v40c0 6.094-4.906 11-11 11h-40c-6.094 0-11-4.906-11-11v-40c0-6.094 4.906-11 11-11z" fill="#ffffff" opacity=".1" stroke-width="2.9091"/>
 </svg>
diff --git a/src/other/firefox/WhiteSur/icons/screenshot-symbolic.svg b/src/other/firefox/WhiteSur/icons/screenshot-symbolic.svg
new file mode 100644
index 00000000..3232ca15
--- /dev/null
+++ b/src/other/firefox/WhiteSur/icons/screenshot-symbolic.svg
@@ -0,0 +1 @@
+<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg"><g fill="#363636"><path d="M11 12h5v1h-5z"/><path d="M13 10h1v5h-1zM13 8h1v1h-1zM1 8h1v1H1zM13 4h1v1h-1zM1 4h1v1H1zM13 2h1v1h-1zM1 2h1v1H1zM1 10h1v1H1zM1 12h1v1H1zM3 12h1v1H3zM5 12h1v1H5zM7 12h1v1H7zM3 2h1v1H3zM5 2h1v1H5zM7 2h1v1H7zM11 2h1v1h-1zM9 12h1v1H9zM9 2h1v1H9zM13 6h1v1h-1zM1 6h1v1H1z"/></g></svg>
\ No newline at end of file
diff --git a/src/other/firefox/WhiteSur/icons/tab-sync-symbolic.svg b/src/other/firefox/WhiteSur/icons/tab-sync-symbolic.svg
index 4afe2c13..4129e6fa 100644
--- a/src/other/firefox/WhiteSur/icons/tab-sync-symbolic.svg
+++ b/src/other/firefox/WhiteSur/icons/tab-sync-symbolic.svg
@@ -1,4 +1,4 @@
-<svg version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
  <defs>
   <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
         color:#363636;
diff --git a/src/other/firefox/WhiteSur/icons/window-new-symbolic.svg b/src/other/firefox/WhiteSur/icons/window-new-symbolic.svg
index 7aef9541..4e50a7c0 100644
--- a/src/other/firefox/WhiteSur/icons/window-new-symbolic.svg
+++ b/src/other/firefox/WhiteSur/icons/window-new-symbolic.svg
@@ -1,4 +1,4 @@
-<svg version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity">
  <defs>
   <style id="current-color-scheme" type="text/css">.ColorScheme-Text {
         color:#363636;
diff --git a/src/other/firefox/WhiteSur/parts/buttons-fixes.css b/src/other/firefox/WhiteSur/parts/buttons-fixes.css
index ab5bb633..36211fc7 100644
--- a/src/other/firefox/WhiteSur/parts/buttons-fixes.css
+++ b/src/other/firefox/WhiteSur/parts/buttons-fixes.css
@@ -1,6 +1,21 @@
 /* Buttons Issues/Glitches fixes */
 @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
+/* Fix hover background */
+.toolbarbutton-badge-stack:not(#hack), .toolbarbutton-icon:not(#hack), .toolbarbutton-text:not(#hack) {
+	background: transparent !important;
+}
+
+/* Fix button box */
+.panel-footer.panel-footer-menulike > button > .button-box {
+	display: -moz-box !important;
+}
+
+/* menulist */
+#label-box:not([native]) {
+	font-weight: 400 !important;
+}
+
 /* Overrides: Make the back button the same as other buttons */
 :root:not([uidensity=compact]) #back-button {
 	border-radius: var(--toolbarbutton-border-radius) !important;
@@ -92,6 +107,17 @@
 	fill: transparent !important;
 }
 
+/* Fix toolbars close icons */
+.close-icon:not(.tab-close-button) .toolbarbutton-icon {
+	height: 16px !important;
+	width: 16px !important;
+	margin: 6px !important;
+	padding: 0 !important;
+}
+button.close {
+	margin: 0 !important;
+}
+
 /* */
 #appMenu-popup .panel-banner-item[notificationid="update-restart"]::after {
 	display: none !important;
@@ -139,6 +165,11 @@
 	margin-right: 0 !important;
 }
 
+/* Auto complete popup button*/
+.autocomplete-richlistitem[type="loginsFooter"] {
+	margin: 4px 4px 0 4px !important;
+}
+
 /* Bookmarks editor buttons */
 .expander-down image, .expander-up image {
 	margin: 6px !important;
@@ -164,3 +195,25 @@
 #identity-popup-security-expander .button-icon {
 	margin: 0 !important;
 }
+
+/* Protections popup */
+#protections-popup-info-button {
+	margin: 0 !important;
+	margin-inline-end: 0 !important;
+}
+.protections-popup-footer-icon {
+	display: none !important;
+}
+.protections-popup-footer-button-label {
+    margin-inline-start: 0 !important;
+}
+#protections-popup-footer-protection-type-label {
+    margin-inline-end: 0 !important;
+	margin-block: 0 !important;
+}
+
+/* Close button */
+.close-icon:not(.tab-close-button) .toolbarbutton-icon {
+	outline:  0 !important;
+}
+
diff --git a/src/other/firefox/WhiteSur/parts/buttons.css b/src/other/firefox/WhiteSur/parts/buttons.css
index 4e94af1f..f8bae09b 100644
--- a/src/other/firefox/WhiteSur/parts/buttons.css
+++ b/src/other/firefox/WhiteSur/parts/buttons.css
@@ -12,6 +12,8 @@
 }
 
 /* Buttons  */
+menulist,
+/*#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton),*/
 .subviewbutton.panel-subview-footer,
 .panel-footer button,
 #downloadsHistory,
@@ -25,15 +27,22 @@
 .findbar-container toolbarbutton,
 #sidebar-switcher-target,
 #viewButton,
+.close-icon:not(.tab-close-button),
+button.close,
+#TabsToolbar .toolbarbutton-1,
 .menulist-label-box,
 .expander-down, .expander-up,
 .notification-button,
 .protections-popup-footer-button,
-.identity-popup-permission-remove-button,
 #identity-popup-security-expander,
+#protections-popup-info-button,
 #PanelUI-panic-view-button,
 .tracking-protection-button,
-.dialog-button {
+.dialog-button,
+.autocomplete-richlistitem[type="loginsFooter"],
+.dialog-button-box button,
+.searchbar-engine-one-off-item,
+.permission-popup-permission-remove-button {
 	-moz-appearance: none !important;
 	background: var(--gnome-button-background) !important;
 	box-shadow: var(--gnome-button-box-shadow) !important;
@@ -95,6 +104,8 @@
 }
 
 /* Hover buttons */
+menulist:hover,
+/*#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton):not([open]):not([disabled]):not([checked]):hover,*/
 .subviewbutton.panel-subview-footer:hover,
 .panel-footer button:hover,
 #downloadsHistory:hover,
@@ -106,21 +117,33 @@
 #context-navigation menuitem:not([disabled]):hover,
 .identity-popup-preferences-button:not(#hack):hover,
 .findbar-container toolbarbutton:hover,
+.findbar-closebutton .toolbarbutton-icon:hover,
 #sidebar-switcher-target:hover,
 #viewButton:hover,
+.close-icon:not(.tab-close-button):hover,
+button.close:hover,
+#TabsToolbar .toolbarbutton-1:hover,
 menulist:hover .menulist-label-box,
 .expander-down:hover, .expander-up:hover,
 .notification-button:hover,
 .protections-popup-footer-button:hover,
-.identity-popup-permission-remove-button:hover,
 #identity-popup-security-expander:hover,
+#protections-popup-info-button:hover,
 .tracking-protection-button:hover,
-.dialog-button:hover {
+.dialog-button:hover,
+.autocomplete-richlistitem[type="loginsFooter"]:hover,
+.dialog-button-box button:hover,
+.searchbar-engine-one-off-item:hover,
+.permission-popup-permission-remove-button:hover {
 	outline: 0 !important;
 	background: var(--gnome-button-hover-background) !important;
 }
 
 /* Active buttons */
+menulist[open],
+/*#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton):not([disabled]):not(#hack):active,*/
+/*#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton):not(.subviewbutton):not([disabled])[open],*/
+/*#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton):not([disabled])[checked],*/
 .subviewbutton.panel-subview-footer:active,
 .panel-footer button:active,
 #downloadsHistory:active,
@@ -135,20 +158,28 @@ menulist:hover .menulist-label-box,
 .findbar-container toolbarbutton:active,
 #sidebar-switcher-target:active, #sidebar-switcher-target.active,
 #viewButton[open],
+.close-icon:not(.tab-close-button):active,
+button.close:active,
+#TabsToolbar .toolbarbutton-1:active, #TabsToolbar .toolbarbutton-1[open],
 menulist[open] .menulist-label-box,
 .expander-down:active, .expander-up:active,
 .notification-button:active,
 .protections-popup-footer-button:not(#hack):active,
-.identity-popup-permission-remove-button:active,
 #identity-popup-security-expander:active,
+#protections-popup-info-button:not(#hack):active,
+#protections-popup-info-button:not(#hack)[checked],
 .tracking-protection-button:active,
-.dialog-button:active {
+.dialog-button:active,
+.autocomplete-richlistitem[type="loginsFooter"]:active,
+.dialog-button-box button:active,
+.permission-popup-permission-remove-button:active {
 	background: var(--gnome-button-active-background) !important;
 	box-shadow: var(--gnome-button-active-box-shadow) !important;
 	border-color: var(--gnome-button-active-border-color) !important;
 }
 
 /* Disabled buttons */
+#nav-bar toolbarbutton:not(#urlbar-zoom-button)[disabled],
 #appMenu-popup .toolbaritem-combined-buttons toolbarbutton[disabled],
 #context-navigation menuitem[disabled] {
 	background: var(--gnome-button-disabled-background) !important;
@@ -163,14 +194,17 @@ menulist[open] .menulist-label-box,
 	opacity: .4 !important;
 }
 
+#nav-bar toolbarbutton:not(#urlbar-zoom-button)[disabled]:hover,
 #appMenu-popup .toolbaritem-combined-buttons toolbarbutton[disabled]:hover {
-	background: var(--gnome-button-disabled-background) !important;
+	background: transparent !important;
 }
 
 /* Inactive window buttons */
+#nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton):-moz-window-inactive,
 .findbar-container toolbarbutton:-moz-window-inactive,
 #sidebar-switcher-target:-moz-window-inactive,
-#viewButton:-moz-window-inactive {
+#viewButton:-moz-window-inactive,
+.notification-button:-moz-window-inactive {
 	background: var(--gnome-inactive-button-background) !important;
 	box-shadow: var(--gnome-inactive-button-box-shadow) !important;
 	border-color: var(--gnome-inactive-button-border-color) !important;
@@ -178,7 +212,11 @@ menulist[open] .menulist-label-box,
 
 /* Flat buttons */
 .subviewbutton-back:not(#hack),
-#TabsToolbar .toolbarbutton-1 {
+.close-icon:not(.tab-close-button),
+button.close,
+#TabsToolbar .toolbarbutton-1,
+#protections-popup-info-button,
+.permission-popup-permission-remove-button {
 	background: transparent !important;
 	box-shadow: none !important;
 	border-color: transparent !important;
@@ -186,7 +224,11 @@ menulist[open] .menulist-label-box,
 }
 
 .subviewbutton-back:not(#hack):not(:active):hover,
-#protections-popup-show-report-button:not(:active):hover {
+.close-icon:not(.tab-close-button):not(:active):hover,
+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;
 	border-color: var(--gnome-button-border-color) !important;
 	border-bottom-color: var(--gnome-button-border-accent-color) !important;
@@ -203,6 +245,7 @@ menulist[open] .menulist-label-box,
 	min-width: 24px !important;
 }
 
+#sidebar-close.close-icon,
 .findbar-closebutton.close-icon {
 	min-width: 28px !important;
 }
@@ -257,12 +300,12 @@ menulist[open] .menulist-label-box,
 
 /* Combined buttons */
 #nav-bar .toolbaritem-combined-buttons toolbarbutton:not(:last-of-type):not(#hack),
-.subviewbutton.panel-subview-footer:not(:only-of-type):not(:last-of-type),
-.panel-footer button:not(:only-of-type):not(:last-of-type),
+/*#nav-bar #back-button:not(#hack),*/
 #appMenu-popup .toolbaritem-combined-buttons toolbarbutton:not(:last-of-type):not(#appMenu-zoomEnlarge-button),
-#context-navigation menuitem:not(:only-of-type):not(:last-of-type),
+#context-navigation menuitem:not(:last-of-type),
 .findbar-container toolbarbutton.findbar-find-previous,
-.findbar-button:not(:last-of-type) {
+.findbar-button:not(:last-of-type),
+.search-panel-one-offs .searchbar-engine-one-off-item:not(:last-child) {
 	border-top-right-radius: 0 !important;
 	border-bottom-right-radius: 0 !important;
 	border-right-width: 0 !important;
@@ -270,13 +313,13 @@ menulist[open] .menulist-label-box,
 }
 
 #nav-bar .toolbaritem-combined-buttons toolbarbutton:not(:first-of-type):not(#hack),
-.subviewbutton.panel-subview-footer:not(:only-of-type):not(:first-of-type),
-.panel-footer button:not(:only-of-type):not(:first-of-type),
+/*#nav-bar #forward-button:not(#hack),*/
 #appMenu-popup .toolbaritem-combined-buttons toolbarbutton:not(:first-of-type):not(#appMenu-fullscreen-button),
-#context-navigation menuitem:not(:only-of-type):not(:first-of-type),
+#context-navigation menuitem:not(:first-of-type),
 .findbar-container toolbarbutton.findbar-find-previous,
 .findbar-container toolbarbutton.findbar-find-next,
-.findbar-button:not(:first-of-type) {
+.findbar-button:not(:first-of-type),
+.search-panel-one-offs .searchbar-engine-one-off-item:not(:first-child) {
 	border-top-left-radius: 0 !important;
 	border-bottom-left-radius: 0 !important;
 	margin-left: 0 !important;
@@ -317,6 +360,7 @@ button.popup-notification-primary-button.popup-notification-button:active,
 
 /* Buttons with destructive action */
 #editBookmarkPanelRemoveButton,
+.identity-popup-permission-remove-button,
 #PanelUI-panic-view-button {
 	color: white !important;
 	background: var(--gnome-button-destructive-action-background) !important;
@@ -348,16 +392,3 @@ button.popup-notification-primary-button.popup-notification-button:active,
 .identity-popup-permission-remove-button:not(#hack):hover .button-icon {
 	filter: invert(100%) brightness(200%);
 }
-
-/* User sync menu, bigger avatar */
-#fxa-toolbar-menu-button .toolbarbutton-badge-stack {
-	padding: 0 !important;
-	margin: 0 !important;
-}
-
-#fxa-avatar-image {
-	height: 26px !important;
-	margin: 0 !important;
-	padding: 0 !important;
-	width: 26px !important;
-}
diff --git a/src/other/firefox/WhiteSur/parts/controls.css b/src/other/firefox/WhiteSur/parts/controls.css
new file mode 100644
index 00000000..a4d6bfeb
--- /dev/null
+++ b/src/other/firefox/WhiteSur/parts/controls.css
@@ -0,0 +1,53 @@
+/* Controls */
+/* Switchers, Checkboxes, etc. */
+
+@namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+
+/* Switchers */
+.protections-popup-tp-switch-box {
+	padding: 0 !important;
+	-moz-box-pack: start !important;
+}
+#protections-popup-tp-switch:not([enabled])[showdotindicator]::after {
+	display: none !important;
+}
+#protections-popup-tp-switch {
+	background: var(--gnome-switch-background) !important;
+	border: 1px solid var(--gnome-switch-border-color) !important;
+	border-radius: 24px !important;
+	min-width: 50px !important;
+	width: 50px !important;
+	min-height: 26px !important;
+	padding: 0 !important;
+	position: relative !important;
+	display: block !important;
+	margin: 0 !important;
+}
+#protections-popup-tp-switch:hover {
+	border-color: var(--gnome-switch-border-color) !important;
+}
+#protections-popup-tp-switch::before {
+	position: absolute !important;
+	top: 0px;
+	left: 0px;
+	background: var(--gnome-switch-slider-background) !important;
+	border: 1px solid var(--gnome-switch-slider-border-color) !important;
+	box-shadow: var(--gnome-switch-slider-box-shadow);
+	border-radius: 24px !important;
+	height: 24px !important;
+	width: 24px !important;
+	transition: left .2s ease;
+	outline: 0 !important;
+}
+#protections-popup-tp-switch[enabled] {
+	background: var(--gnome-switch-active-background) !important;
+	border-color: var(--gnome-switch-active-border-color) !important;
+	padding-inline-start: 24px !important;
+}
+#protections-popup-tp-switch[enabled]:hover {
+	border-color: var(--gnome-switch-active-border-color) !important;
+}
+#protections-popup-tp-switch[enabled]::before {
+	border-color: var(--gnome-switch-active-slider-border-color) !important;
+	left: 24px;
+}
diff --git a/src/other/firefox/WhiteSur/parts/dialogs.css b/src/other/firefox/WhiteSur/parts/dialogs.css
new file mode 100644
index 00000000..24f872ab
--- /dev/null
+++ b/src/other/firefox/WhiteSur/parts/dialogs.css
@@ -0,0 +1,59 @@
+/* Dialogs */
+
+@namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+
+/* Browser dialog prompts center */
+.content-prompt {
+    display: flex !important;
+    align-items: center;
+    justify-content: center;
+}
+
+/* Dialog */
+.dialogBox {
+    border-radius: 9px !important;
+	margin-top: 0 !important;
+}
+
+#commonDialog {
+	background: var(--gnome-popover-background) !important;
+	border: 0 !important;
+	box-shadow: var(--gnome-popover-shadow) !important;
+	padding: 0 !important;
+}
+
+dialog {
+	padding: 0 !important;
+}
+
+/* Content */
+.dialog-content-box {
+	padding: 24px;
+}
+#titleContainer {
+	justify-content: center !important;
+}
+
+/* Buttons */
+.dialog-button-box {
+	display: flex !important;
+}
+
+.dialog-button-box button:not(#hack) {
+	height: auto !important;
+	max-height: unset !important;
+	padding: 10px 14px !important;
+	margin: 0 !important;
+	border-radius: 0 !important;
+	flex: 1;
+	border-bottom: 0 !important;
+}
+
+/* Buttons borders - only suppor for cancel/ok */
+.dialog-button-box button[dlgtype="accept"] {
+	border-right: 0 !important;
+	border-left: 0 !important;
+}
+.dialog-button-box button[dlgtype="cancel"]:not(#hack) {
+	border-left: 0 !important;
+}
diff --git a/src/other/firefox/WhiteSur/parts/entries.css b/src/other/firefox/WhiteSur/parts/entries.css
index bd0ad750..00adf4be 100644
--- a/src/other/firefox/WhiteSur/parts/entries.css
+++ b/src/other/firefox/WhiteSur/parts/entries.css
@@ -5,7 +5,9 @@
 /* Entries */
 #searchbar,
 #search-box,
-.findbar-textbox {
+.findbar-textbox,
+#loginTextbox,
+#password1Textbox {
 	-moz-appearance: none !important;
 	background: var(--gnome-urlbar-background) !important;
 	border: 1px solid var(--gnome-urlbar-border-color) !important;
@@ -23,19 +25,30 @@
 /* Entries focused */
 #urlbar[breakout][breakout-extend],
 #searchbar:focus-within,
-#search-box[focused],
-.findbar-textbox[focused],
-.findbar-textbox:focus {
+#search-box[focused], 
+/*.findbar-textbox[focused],*/
+/*.findbar-textbox:focus,*/
+#loginTextbox:focus,
+#password1Textbox:focus {
 	outline: 2px solid var(--gnome-focused-urlbar-border-color) !important;
 	outline-offset: -2px;
 	-moz-outline-radius: 8px;
 	transition: all 100ms;
 }
 
+.findbar-textbox[focused],
+.findbar-textbox:focus {
+	outline: none !important;
+	box-shadow: inset 0 0 0 1px var(--gnome-focused-urlbar-border-color) !important;
+	border: 1px solid var(--gnome-focused-urlbar-border-color) !important;
+}
+
 /* Inactive window entries */
 #searchbar:-moz-window-inactive,
 #search-box:-moz-window-inactive,
-.findbar-textbox:-moz-window-inactive {
+.findbar-textbox:-moz-window-inactive,
+#loginTextbox:-moz-window-inactive,
+#password1Textbox:-moz-window-inactive {
 	background: var(--gnome-inactive-urlbar-background) !important;
 	border-color: var(--gnome-inactive-urlbar-border-color) !important;
 	color: var(--gnome-inactive-urlbar-color) !important;
diff --git a/src/other/firefox/WhiteSur/parts/findbar.css b/src/other/firefox/WhiteSur/parts/findbar.css
index b2f33355..3c46da76 100644
--- a/src/other/firefox/WhiteSur/parts/findbar.css
+++ b/src/other/firefox/WhiteSur/parts/findbar.css
@@ -31,6 +31,15 @@ hbox[anonid="findbar-textbox-wrapper"] {
 	flex: 1;
 }
 
+.findbar-textbox:focus + .findbar-find-previous {
+	border-left-color: var(--gnome-focused-urlbar-border-color) !important;
+}
+
+.findbar-highlight, .findbar-case-sensitive, .findbar-match-diacritics, .findbar-entire-word, .findbar-label {
+	margin: 0 3px !important;
+	font-size: 0.9em !important;
+}
+
 .findbar-closebutton.close-icon {
 	margin: 6px 6px 6px 0 !important;
 	padding: 0 0 !important;
diff --git a/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css b/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css
index ae259fdf..351b8c8c 100644
--- a/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css
+++ b/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css
@@ -3,8 +3,10 @@
 @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
 #urlbar {
-	--urlbar-height: 32.00px;
-	--urlbar-toolbar-height: 32.00px !important;
+	--urlbar-height: 32px !important;
+	--urlbar-container-height: 32px !important;
+	--urlbar-toolbar-height: 32px !important;
+	--urlbar-inner-padding: 0 !important;
 }
 
 /* Center the URL bar */
@@ -14,23 +16,34 @@ toolbarspring {
 
 /* URL bar */
 #urlbar {
+	margin-top: -2px !important;
 	box-shadow: none !important;
 	background: var(--gnome-popover-background) !important;
 	border-radius: 8px !important;
+	border: 1px solid transparent !important;
+	padding: 0 0 !important;
 }
 #urlbar-background {
 	box-shadow: none !important;
 	border: 0 !important;
 	background: transparent !important;
 	border-radius: 8px !important;
+	padding: 0 0 !important;
 }
 
+#urlbar:-moz-window-inactive {
+	border-color: var(--gnome-inactive-headerbar-background) !important;
+}
+
+#urlbar #urlbar-input-container {
+	padding: 0 !important;
+}
 #urlbar[breakout][breakout-extend] {
 	left: 0 !important;
 	top: 0 !important;
 	width: 100% !important;
 	z-index: 5 !important;
-	padding: 0 !important;
+	padding: 0 0 !important;
 }
 #urlbar[breakout][breakout-extend][open] {
 	height: auto !important;
@@ -50,7 +63,7 @@ toolbarspring {
 .urlbarView {
 	background: transparent !important;
 	color: var(--gnome-toolbar-color) !important;
-	margin: -2px 0 0 0 !important;
+	margin: 0 !important;
 	width: 100% !important;
 }
 
@@ -70,17 +83,18 @@ toolbarspring {
 	align-items: center !important;
 }
 .urlbarView-row-inner {
-	padding-block: 8px !important;
-	border-radius: 8px !important;
+	padding-block: 5px !important;
+	border-radius: 5px !important;
+}
+.urlbarView-action {
+	background: transparent !important;
 }
-
 /* Search engines buttons */
 .search-one-offs {
-	margin-top: 6px !important;
-	margin-bottom: 2px !important;
+	margin: 0 0 2px !important;
 	padding: 8px !important;
-	background: none !important;
-	border-top: 1px solid var(--gnome-entry-border-color) !important;
+	background: var(--gnome-popover-background) !important;
+	border-top: 1px solid var(--gnome-button-border-color) !important;
 	border-radius: 0 0 8px 8px !important;
 }
 
@@ -103,17 +117,17 @@ toolbarspring {
 	color: unset !important;
 }
 .searchbar-engine-one-off-item:first-child {
-	border-radius: 8px 0 0 8px;
+	border-radius: 5px 0 0 5px;
 	border-left-width: 1px !important;
 }
 .searchbar-engine-one-off-item.last-engine, .searchbar-engine-one-off-item:last-child {
-	border-radius: 0 8px 8px 0;
+	border-radius: 0 5px 5px 0;
 }
 
 #urlbar-anon-search-settings-compact {
 	border-left-width: 1px !important;
 	border-bottom: 1px solid var(--gnome-button-border-accent-color) !important;
-	border-radius: 8px;
+	border-radius: 5px;
 	margin-left: 6px !important;
 }
 
@@ -151,5 +165,22 @@ toolbarspring {
 #page-action-buttons {
 	padding: 2px 0 !important;
 }
-
+/* Search mode indicator */
+#urlbar-search-mode-indicator,
+#urlbar-label-box {
+	background: var(--gnome-popover-background) !important;
+	border: 1px solid var(--gnome-popover-border-color) !important;
+	border-radius: 9px;
+	outline: 0 !important;
+	margin: 4px 0;
+}
+#urlbar-search-mode-indicator-title {
+    color: #0060df;
+    padding-inline: 4px !important;;
+}
+#urlbar-search-mode-indicator-close {
+	background-size: contain !important;
+	border-radius: 0 9px 9px 0;
+	opacity: 0.8;
+}
 
diff --git a/src/other/firefox/WhiteSur/parts/headerbar.css b/src/other/firefox/WhiteSur/parts/headerbar.css
index 52258d36..95ce4f22 100644
--- a/src/other/firefox/WhiteSur/parts/headerbar.css
+++ b/src/other/firefox/WhiteSur/parts/headerbar.css
@@ -27,11 +27,13 @@
 	background: none !important;
 	-moz-appearance: none !important;
 	border-radius: 8px !important;
-	padding: 0 4px !important;
-	min-height: 28px !important;
-	min-width: 28px !important;
+	margin: 10px 2px !important;
+	padding: 0 10px !important;
+	max-height: 30px !important;
+	min-width: 32px !important;
 	color: var(--gnome-toolbar-color) !important;
 	transition: background 200ms;
+	--toolbarbutton-inner-padding: 0 !important;
 }
 
 /* Hover headerbar buttons */
diff --git a/src/other/firefox/WhiteSur/parts/icons.css b/src/other/firefox/WhiteSur/parts/icons.css
index cd627001..c71e83b6 100644
--- a/src/other/firefox/WhiteSur/parts/icons.css
+++ b/src/other/firefox/WhiteSur/parts/icons.css
@@ -229,7 +229,7 @@ menuitem[type="radio"]:not([disabled="true"]):hover .menu-iconic-icon {
 	list-style-image: url("../icons/edit-find-symbolic.svg") !important;
 }
 /* New window button */
-#nav-bar #new-window-button {
+#new-window-button {
 	list-style-image: url("../icons/window-new-symbolic.svg") !important;
 }
 /* Bookmarks menu button */
@@ -356,7 +356,7 @@ menuitem[type="radio"]:not([disabled="true"]):hover .menu-iconic-icon {
 	list-style-image: url("../icons/forget-history-symbolic.svg") !important;
 }
 
-#nav-bar #sync-button {
+#sync-button {
 	list-style-image: url("../icons/tab-sync-symbolic.svg") !important;
 }
 
@@ -372,6 +372,10 @@ menuitem[type="radio"]:not([disabled="true"]):hover .menu-iconic-icon {
 	list-style-image: url("../icons/character-symbolic.svg") !important;
 }
 
+#screenshot-button {
+	list-style-image: url("../icons/screenshot-symbolic.svg") !important;
+}
+
 .popup-notification-icon[popupid="web-notifications"], .desktop-notification-icon {
 	list-style-image: url("../icons/notification-symbolic.svg") !important;
 }
diff --git a/src/other/firefox/WhiteSur/parts/popups-contents.css b/src/other/firefox/WhiteSur/parts/popups-contents.css
index 36b87b60..73e73291 100644
--- a/src/other/firefox/WhiteSur/parts/popups-contents.css
+++ b/src/other/firefox/WhiteSur/parts/popups-contents.css
@@ -2,6 +2,24 @@
 
 @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
+/* Main menu fxa */
+#appMenu-fxa-status[fxastatus="signedin"] > #appMenu-fxa-label {
+	padding-left: 22px !important;
+	margin-inline-start: -22px !important;
+}
+#appMenu-fxa-status[fxastatus="signedin"] > #appMenu-fxa-avatar {
+	margin-inline-start: 5px !important;
+}
+#appMenu-fxa-status2[fxastatus] > #appMenu-fxa-label2 > vbox > #appMenu-header-description, #appMenu-fxa-text {
+	font-weight: 400 !important;
+}
+#appMenu-fxa-label2 {
+	padding: 0 !important;
+	background: none !important;
+	border: none !important;
+	box-shadow: none !important;
+}
+
 /* Style main context menu & buttons */
 #context-navigation {
 	padding: 2px 6px 6px;
@@ -32,11 +50,7 @@
 	margin-inline-end: 0 !important;
 }
 #appMenu-popup .toolbaritem-combined-buttons .before-label {
-	width: 5px !important;
-}
-#appMenu-fxa-status[fxastatus="signedin"] > #appMenu-fxa-label,
-#appMenu-fxa-container[fxastatus="signedin"] > #appMenu-fxa-status > #appMenu-fxa-label {
-	padding-left: 28px !important;
+	width: 32px !important;
 }
 
 /* User sync account remove avatar */
@@ -148,93 +162,72 @@
 	margin-left: 1.4em !important;
 }
 
-#identity-popup-content-blocking-category-list, #identity-popup-permission-list {
-	margin-inline-start: 0 !important;
-}
-
-.identity-popup-security-connection {	/* FF70 */
-	background-position: 0 50% !important;
-	padding-inline-start: 16px !important;
-}
-#identity-popup-security-description { /* FF70 */
-	padding-inline-start: 0 !important;
-}
-
-.identity-popup-content-blocking-category-icon, .identity-popup-permission-icon {
-	margin-inline-start: 0 !important;
-}
-.identity-popup-content-blocking-category-label {
-	margin-inline-start: 6px !important;
-}
-.identity-popup-content-blocking-category-state-label {
-	opacity: 0.7;
-}
-
-#identity-popup-permissions-content {
-	padding-right: 0 !important;
-}
-#identity-popup-permissions-content description  {
-	margin-inline-start: 0 !important;
-}
-#identity-popup-permissions-content {
-	padding-bottom: 10px !important;
-}
-
-/* TODO: create custom --gnome-list vars */
-#identity-popup-permission-list:not(:empty) {
-	border: 1px solid var(--gnome-button-border-color);
-	border-bottom: 0 !important;
-	padding: 0 !important;
-}
-.identity-popup-permission-item {
-	background: var(--gnome-menu-background);
-	border-bottom: 1px solid var(--gnome-button-border-color);
-	padding: 6px !important;
-	margin: 0 !important;
-}
-
 /* Protections popup */
 .protections-popup-section,
 #protections-popup-not-blocking-section-header {
 	border: 0 !important;
 }
+#protections-popup-mainView-panel-header-section {
+	background: transparent !important;
+}
 
 #protections-popup-mainView-panel-header {
-	background: var(--gnome-button-suggested-action-background) !important;
-	border: 1px solid var(--gnome-button-suggested-action-border-color) !important;
-	border-radius: 8px 8px 0 0;
-	min-height: 34px !important;
+	color: var(--gnome-toolbar-color) !important;
+	padding: 0 !important;
+}
+#protections-popup[hasException] #protections-popup-mainView-panel-header {
+	background: none !important;
 }
 
+#protections-popup-main-header-label {
+	height: auto !important;
+	margin-inline-start: 6px !important;
+	text-align: left !important;
+}
+#protections-popup-mainView-panel-header-span {
+	margin: 0 !important;
+	margin-inline-start: 0 !important
+}
 #protections-popup[toast] #protections-popup-mainView-panel-header {
-	border-radius: 8px 8px 8px 8px !important;
+	border-bottom-width: 1px !important;
+	border-radius: 5px !important;
+	padding: 0px !important;
 }
 
+#messaging-system-message-container {
+	height: 150px !important;
+	border: 0 !important;
+}
+#protections-popup #messaging-system-message-container[disabled] {
+	margin-bottom: -150px !important;
+}
 #protections-popup-message {
+	background: none !important;
+	border: 0 !important;
+	color: var(--gnome-toolbar-color) !important;
 	height: 100% !important;
 	margin: 0 !important;
-	border-radius: 0 !important;
+}
+#protections-popup-message .text-link {
+	color: var(--gnome-toolbar-color) !important;
 }
 
 #protections-popup-tp-switch-section {
-	background: var(--gnome-button-background) !important;
+	background: var(--gnome-menu-background);
 	border: 1px solid var(--gnome-button-border-color) !important;
-	border-top: 0 !important;
-	border-radius: 0 0 8px 8px;
+	border-radius: 6px;
+	padding: 12px !important;
 }
 #protections-popup[hasException] #protections-popup-tp-switch-section {
-	margin-bottom: 10px !important;
-	color: white !important;
+	background: var(--gnome-menu-background) !important;
 }
-
-#protections-popup[hasException] #protections-popup-tp-switch-section,
-#protections-popup[hasException] #protections-popup-mainView-panel-header{
-	background: var(--gnome-button-destructive-action-background) !important;
-	border-color: var(--gnome-button-destructive-action-border-color) !important;
+.protections-popup-tp-switch-label-box label {
+	font-weight: normal !important;
 }
 
 #protections-popup-no-trackers-found-description {
-	margin: 10px 0 !important;
+	margin: 12px 0 !important;
+	text-align: left !important;
 }
 
 #protections-popup-blocking-section-header,
@@ -262,9 +255,9 @@
 
 #protections-popup-footer  {
 	display: flex;
-	justify-content: flex-end;
+	justify-content: flex-start;
 	flex-wrap: wrap;
-	margin-top: 3px;
+	margin-top: 12px;
 }
 #protections-popup-show-report-stack {
 	width: 100% !important;
@@ -278,57 +271,25 @@
 	margin-inline-end: 0 !important;
 }
 
-/* TODO: consider switchers section */
-.protections-popup-tp-switch-box {
-	margin-top: 16px;
-	padding: 0 !important;
-	-moz-box-pack: start !important;
+.protections-popup-description {
+	border-bottom: 0 !important;
 }
-#protections-popup-tp-switch:not([enabled])[showdotindicator]::after {
-	display: none !important;
-}
-#protections-popup-tp-switch {
-	background: var(--gnome-switch-background) !important;
-	border: 1px solid var(--gnome-switch-border-color) !important;
-	border-radius: 24px !important;
-	min-width: 50px !important;
-	width: 50px !important;
-	min-height: 26px !important;
-	padding: 0 !important;
-	position: relative !important;
-	display: block !important;
-	margin: 0 !important;
-}
-#protections-popup-tp-switch:hover {
-	border-color: var(--gnome-switch-border-color) !important;
-}
-#protections-popup-tp-switch::before {
-	position: absolute !important;
-	top: 0px;
-	left: 0px;
-	background: var(--gnome-switch-slider-background) !important;
-	border: 1px solid var(--gnome-switch-slider-border-color) !important;
-	box-shadow: var(--gnome-switch-slider-box-shadow);
-	border-radius: 24px !important;
-	height: 24px !important;
-	width: 24px !important;
-	transition: left .2s ease;
-	outline: 0 !important;
-}
-#protections-popup-tp-switch[enabled] {
-	background: var(--gnome-switch-active-background) !important;
-	border-color: var(--gnome-switch-active-border-color) !important;
-	padding-inline-start: 24px !important;
-}
-#protections-popup-tp-switch[enabled]:hover {
-	border-color: var(--gnome-switch-active-border-color) !important;
-}
-#protections-popup-tp-switch[enabled]::before {
-	border-color: var(--gnome-switch-active-slider-border-color) !important;
-	left: 24px;
+.protections-popup-description > description {
+	margin: 8px !important;
 }
 
 /* Feature recommendation notification, fix width */
 #contextual-feature-recommendation-notification {
 	width: auto !important;
 }
+
+/* Notification popups */
+.popup-notification-learnmore-link {
+	margin-top: 40px !important;
+}
+
+/* Extensions sometimes assume a white background */
+.webextension-popup-browser {
+	background-color: #fff !important;
+}
+
diff --git a/src/other/firefox/WhiteSur/parts/popups.css b/src/other/firefox/WhiteSur/parts/popups.css
index 6947ba25..7d442125 100644
--- a/src/other/firefox/WhiteSur/parts/popups.css
+++ b/src/other/firefox/WhiteSur/parts/popups.css
@@ -9,7 +9,7 @@ menupopup {
 	background: var(--gnome-menu-background) !important;
 	border: 1px solid var(--gnome-menu-border-color) !important;
 	border-radius: 8px !important;
-	padding: 4px 0 !important;
+	padding: 8px 0 !important;
 	color: var(--gnome-toolbar-color) !important;
 	box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1), inset 0 0 0 1px rgba(255, 255, 255, 0.06) !important;
 }
@@ -37,8 +37,7 @@ menuitem[disabled="true"]:hover, menupopup menu[disabled="true"]:hover {
 
 /* Adjust popovers position */
 panel[type=arrow] {
-	margin-top: 9px !important;
-	max-height: 80vh !important;
+	margin-top: 8px !important;
 }
 
 /* Style popovers */
@@ -54,16 +53,18 @@ panelview {
 	background: var(--gnome-popover-background) !important;
 	border: 1px solid !important;
 	border-color: var(--gnome-popover-border-color) !important;
-	border-radius: 9px !important;
-	/* box-shadow: var(--gnome-popover-shadow) !important; */
+	border-radius: 8px!important;
 	padding: 12px !important;
 	color: var(--gnome-toolbar-color) !important;
 }
 .panel-arrow {
 	fill: var(--gnome-popover-background) !important;
 	stroke: var(--gnome-popover-border-color) !important;
+	display: -moz-inline-box !important;
+}
+panel:not([remote]), #BMB_bookmarksPopup {
+	--arrowpanel-background: var(--gnome-popover-background) !important;
 }
-
 .PanelUI-subView toolbarseparator:not([orient="vertical"]) {
 	margin: 10px 2px !important;
 }
@@ -71,16 +72,28 @@ panelview {
 .panel-header {
 	padding: 0 0 10px 0 !important;
 }
+.panel-header + toolbarseparator,
+#identity-popup-mainView-panel-header + toolbarseparator,
+#permission-popup-mainView-panel-header + toolbarseparator,
+#protections-popup-mainView-panel-header-section + toolbarseparator {
+	display: none !important;
+}
 .panel-footer {
 	background-color: transparent !important;
 	display: flex;
 	justify-content: flex-end;
 	padding-top: 0px !important;
 }
+.panel-footer.panel-footer-menulike {
+	border-top: 0 !important;
+	margin-top: 8px !important;
+}
 .panel-footer toolbarseparator {
 	display: none !important;
 }
-
+.proton-zap {
+	border-image: unset !important;
+}
 .panel-subview-body {
 	padding: 0 !important;
 }
@@ -100,6 +113,7 @@ panelview {
 .protections-popup-category,
 .identity-popup-content-blocking-category {
 	padding: 5px !important;
+	margin: 0 !important;
 }
 
 .subviewbutton[disabled], .toolbarbutton-1[disabled],
@@ -116,7 +130,7 @@ panelview {
 
 .subviewbutton:not([disabled]):hover, .toolbarbutton-1:not([disabled]):hover, .protections-popup-category:not([disabled]):hover,
 .identity-popup-content-blocking-category:not([disabled]):hover {
-	background: var(--gnome-popover-button-hover-background) !important;
+	background-color: var(--gnome-popover-button-hover-background) !important;
 }
 
 /* Style popover separators */
@@ -129,3 +143,31 @@ toolbarseparator:not([orient="vertical"]) {
 toolbarseparator[orient="vertical"] {
 	margin: 0 3px !important;
 }
+
+/* Auto complete popups */
+panel[type="autocomplete-richlistbox"] {
+	background: var(--gnome-menu-background) !important;
+	border: 1px solid var(--gnome-menu-border-color) !important;
+	padding: 4px 0 !important;
+	color: var(--gnome-toolbar-color) !important;
+}
+.autocomplete-richlistbox {
+	margin: 0 !important;
+}
+
+.autocomplete-richlistitem:not([type="loginsFooter"]) {
+	color: var(--gnome-toolbar-color) !important;
+	font: menu !important;
+	margin: 0 !important;
+}
+.autocomplete-richlistitem:not([type="loginsFooter"]) .ac-site-icon {
+	fill: var(--gnome-toolbar-color) !important;
+	opacity: 0.5;
+}
+.autocomplete-richlistitem:not([type="loginsFooter"]):hover {
+	color: #fff !important;
+	background-color: Highlight !important;
+}
+.autocomplete-richlistitem:not([type="loginsFooter"]):hover .ac-site-icon {
+	fill: #fff !important;
+}
diff --git a/src/other/firefox/WhiteSur/parts/scrollbars.css b/src/other/firefox/WhiteSur/parts/scrollbars.css
deleted file mode 100644
index befb75b6..00000000
--- a/src/other/firefox/WhiteSur/parts/scrollbars.css
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Scrollbars hack */
-
-@namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-
-#alltabs-button:not(#hack) {
-	list-style-image: none !important;
-	position: relative;
-}
-
-#alltabs-button:not(#hack) .toolbarbutton-icon {
-	display: none !important;
-}
-#alltabs-button:not(#hack) .toolbarbutton-badge-stack {
-	position: absolute;
-}
-
-#alltabs-button::before {
-	position: relative;
-	top: 2px;
-	content: url("../icons/pan-down-symbolic.svg");
-}
-@media (prefers-color-scheme: dark) {
-	#alltabs-button::before {
-		filter: invert(100%) brightness(200%);
-	}
-}
-
-#alltabs-button:-moz-window-inactive::before {
-	opacity: 0.7 !important;
-}
diff --git a/src/other/firefox/WhiteSur/parts/tabsbar.css b/src/other/firefox/WhiteSur/parts/tabsbar.css
index 00cd743c..0d3c8c03 100644
--- a/src/other/firefox/WhiteSur/parts/tabsbar.css
+++ b/src/other/firefox/WhiteSur/parts/tabsbar.css
@@ -2,6 +2,19 @@
 
 @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
+:root {
+	--space-above-tabbar: 0 !important;
+}
+
+#TabsToolbar:not([inFullscreen]) > .toolbar-items {
+	margin-bottom: -1px !important;
+}
+
+/* Fix tabs bar icon sizes */
+#TabsToolbar {
+	--toolbarbutton-inner-padding: var(--toolbarbutton-inner-padding) !important;
+}
+
 /* Tabs bar height */
 #tabbrowser-tabs,
 #tabbrowser-tabs arrowscrollbox {
@@ -154,7 +167,6 @@ tab[selected]:-moz-window-inactive {
 }
 
 @media (-moz-proton) {
-
 	/* Firefox v89 beta tab fix */
 	.tab-background {
 		border-radius: 0 !important;
@@ -168,6 +180,7 @@ tab[selected]:-moz-window-inactive {
 
 	/* fix misc spacing between tabs */
 	.tabbrowser-tab {
+		min-height: 28px !important;
 		padding-inline: 0px !important;
 	}
 
@@ -201,15 +214,17 @@ tab[selected]:-moz-window-inactive {
 
 .tab-close-button {
 	-moz-appearance: none !important;
+	margin-inline-end: 0 !important;
 	border: none !important;
 	box-sizing: content-box; /* Avoid deformation on flexbox */
-	border-radius: 2px;
+	border-radius: 3px !important;
 	list-style-image: url("../icons/window-close-symbolic.svg") !important;
 	height: 16px;
 	opacity: .3;
 	padding: 0;
 	width: 16px;
 }
+
 @media (prefers-color-scheme: dark) {
 	.tab-close-button {
 		list-style-image: url("../icons/window-close-symbolic-light.svg") !important;
@@ -349,10 +364,6 @@ tab[selected]:-moz-window-inactive {
 	max-height: 10px;
 }
 
-.tab-close-button {
-	margin-inline-end: -6px !important;
-}
-
 /* fix spacing on too many tabs */
 
 .tab-icon-overlay:not([pinned], [sharing]),
diff --git a/src/other/firefox/WhiteSur/theme.css b/src/other/firefox/WhiteSur/theme.css
index 4fb63755..758ce19b 100644
--- a/src/other/firefox/WhiteSur/theme.css
+++ b/src/other/firefox/WhiteSur/theme.css
@@ -1,6 +1,7 @@
 @import "parts/toolbox.css";
 @import "parts/buttons.css";
 @import "parts/entries.css";
+@import "parts/controls.css";
 @import "parts/headerbar.css";
 @import "parts/csd.css";
 @import "parts/titlebutton-light.css";
@@ -8,7 +9,7 @@
 @import "parts/popups.css";
 @import "parts/tabsbar.css";
 @import "parts/findbar.css";
-@import "parts/scrollbars.css";
+@import "parts/dialogs.css";
 @import "parts/remove-white-flash.css";
 @import "parts/custom-icons.css";
 @import "parts/icons.css";
diff --git a/src/sass/gnome-shell/widgets-3-28/_app-grid.scss b/src/sass/gnome-shell/widgets-3-28/_app-grid.scss
index 931dfb46..a8bc36d5 100644
--- a/src/sass/gnome-shell/widgets-3-28/_app-grid.scss
+++ b/src/sass/gnome-shell/widgets-3-28/_app-grid.scss
@@ -42,7 +42,6 @@ $app_icon_padding: 24px;
 
 //Some hacks I don't even
 .all-apps,
-.search-display > StBoxLayout,
 .frequent-apps > StBoxLayout {
   // horizontal padding to make sure scrollbars or dash don't overlap content
   padding: 0px 88px 10px 88px;
@@ -100,8 +99,7 @@ $app_icon_padding: 24px;
   color: $light_hint_fg_color;
 }
 
-.overview-icon.overview-icon-with-label,
-.grid-search-result .overview-icon.overview-icon-with-label {
+.overview-icon.overview-icon-with-label {
   padding: 10px 8px 5px 8px;
   spacing: 6px;
 
diff --git a/src/sass/gnome-shell/widgets-3-28/_workspace-thumbnails.scss b/src/sass/gnome-shell/widgets-3-28/_workspace-thumbnails.scss
index 1401d75d..13e236aa 100644
--- a/src/sass/gnome-shell/widgets-3-28/_workspace-thumbnails.scss
+++ b/src/sass/gnome-shell/widgets-3-28/_workspace-thumbnails.scss
@@ -18,16 +18,9 @@
     height: 24px;
   }
 }
+
 .workspace-thumbnail-indicator {
   border: 2px solid $primary_color;
   padding: 6px;
-  border-radius: 2px;
-}
-
-//Some hacks I don't even
-.all-apps,
-.search-display > StBoxLayout,
-.frequent-apps > StBoxLayout {
-  // horizontal padding to make sure scrollbars or dash don't overlap content
-  padding: 0px 88px 10px 88px;
+  border-radius: 3px;
 }
diff --git a/stable-release/Gnome-3-28/WhiteSur-dark-Gnome-3-28.tar.xz b/stable-release/Gnome-3-28/WhiteSur-dark-Gnome-3-28.tar.xz
index d4cf1c17..b61165b2 100644
Binary files a/stable-release/Gnome-3-28/WhiteSur-dark-Gnome-3-28.tar.xz and b/stable-release/Gnome-3-28/WhiteSur-dark-Gnome-3-28.tar.xz differ
diff --git a/stable-release/Gnome-3-28/WhiteSur-dark-solid-Gnome-3-28.tar.xz b/stable-release/Gnome-3-28/WhiteSur-dark-solid-Gnome-3-28.tar.xz
index e1b1a55d..5448e65c 100644
Binary files a/stable-release/Gnome-3-28/WhiteSur-dark-solid-Gnome-3-28.tar.xz and b/stable-release/Gnome-3-28/WhiteSur-dark-solid-Gnome-3-28.tar.xz differ
diff --git a/stable-release/Gnome-3-28/WhiteSur-light-Gnome-3-28.tar.xz b/stable-release/Gnome-3-28/WhiteSur-light-Gnome-3-28.tar.xz
index 9fcce8c4..713b781d 100644
Binary files a/stable-release/Gnome-3-28/WhiteSur-light-Gnome-3-28.tar.xz and b/stable-release/Gnome-3-28/WhiteSur-light-Gnome-3-28.tar.xz differ
diff --git a/stable-release/Gnome-3-28/WhiteSur-light-solid-Gnome-3-28.tar.xz b/stable-release/Gnome-3-28/WhiteSur-light-solid-Gnome-3-28.tar.xz
index 6f9008fa..13a4869c 100644
Binary files a/stable-release/Gnome-3-28/WhiteSur-light-solid-Gnome-3-28.tar.xz and b/stable-release/Gnome-3-28/WhiteSur-light-solid-Gnome-3-28.tar.xz differ
diff --git a/stable-release/Gnome-40-0/WhiteSur-dark-Gnome-40-0.tar.xz b/stable-release/Gnome-40-0/WhiteSur-dark-Gnome-40-0.tar.xz
index 3c615834..7a608dc6 100644
Binary files a/stable-release/Gnome-40-0/WhiteSur-dark-Gnome-40-0.tar.xz and b/stable-release/Gnome-40-0/WhiteSur-dark-Gnome-40-0.tar.xz differ
diff --git a/stable-release/Gnome-40-0/WhiteSur-dark-solid-Gnome-40-0.tar.xz b/stable-release/Gnome-40-0/WhiteSur-dark-solid-Gnome-40-0.tar.xz
index ded353a5..33c5d27f 100644
Binary files a/stable-release/Gnome-40-0/WhiteSur-dark-solid-Gnome-40-0.tar.xz and b/stable-release/Gnome-40-0/WhiteSur-dark-solid-Gnome-40-0.tar.xz differ
diff --git a/stable-release/Gnome-40-0/WhiteSur-light-Gnome-40-0.tar.xz b/stable-release/Gnome-40-0/WhiteSur-light-Gnome-40-0.tar.xz
index 7e1b9d52..dd70ae49 100644
Binary files a/stable-release/Gnome-40-0/WhiteSur-light-Gnome-40-0.tar.xz and b/stable-release/Gnome-40-0/WhiteSur-light-Gnome-40-0.tar.xz differ
diff --git a/stable-release/Gnome-40-0/WhiteSur-light-solid-Gnome-40-0.tar.xz b/stable-release/Gnome-40-0/WhiteSur-light-solid-Gnome-40-0.tar.xz
index 50b8ab78..632cafd6 100644
Binary files a/stable-release/Gnome-40-0/WhiteSur-light-solid-Gnome-40-0.tar.xz and b/stable-release/Gnome-40-0/WhiteSur-light-solid-Gnome-40-0.tar.xz differ