From 165251a9f5d635087dc50573e446eedf4c1d811d Mon Sep 17 00:00:00 2001
From: vinceliuice <vinceliuice@hotmail.com>
Date: Sat, 15 Apr 2023 23:12:29 +0800
Subject: [PATCH] Fixed issues

---
 src/other/firefox/Monterey/parts/dialogs.css  |   8 +
 src/other/firefox/Monterey/parts/icons.css    |  53 +++++
 .../firefox/WhiteSur/icons/phone-symbolic.svg |   4 +
 .../icons/screenshot-symbolic-light.svg       |   6 +
 .../icons/tab-restore-symbolic-light.svg      |   5 +
 .../WhiteSur/icons/tab-restore-symbolic.svg   |   5 +
 .../WhiteSur/icons/url2qr-icon-light.svg      | 182 ++++++++++++++++++
 .../firefox/WhiteSur/icons/url2qr-icon.svg    | 182 ++++++++++++++++++
 src/other/firefox/WhiteSur/parts/dialogs.css  |   8 +
 .../firefox/WhiteSur/parts/headerbar.css      |   2 +-
 src/other/firefox/WhiteSur/parts/icons.css    |  53 +++++
 src/other/firefox/WhiteSur/parts/tabsbar.css  |   4 +
 12 files changed, 511 insertions(+), 1 deletion(-)
 create mode 100644 src/other/firefox/WhiteSur/icons/phone-symbolic.svg
 create mode 100644 src/other/firefox/WhiteSur/icons/screenshot-symbolic-light.svg
 create mode 100644 src/other/firefox/WhiteSur/icons/tab-restore-symbolic-light.svg
 create mode 100644 src/other/firefox/WhiteSur/icons/tab-restore-symbolic.svg
 create mode 100644 src/other/firefox/WhiteSur/icons/url2qr-icon-light.svg
 create mode 100644 src/other/firefox/WhiteSur/icons/url2qr-icon.svg

diff --git a/src/other/firefox/Monterey/parts/dialogs.css b/src/other/firefox/Monterey/parts/dialogs.css
index 735f19c..9484bea 100644
--- a/src/other/firefox/Monterey/parts/dialogs.css
+++ b/src/other/firefox/Monterey/parts/dialogs.css
@@ -55,6 +55,14 @@ dialog[subdialog] {
 	padding-bottom: 0;
 }
 
+#description-box {
+	margin: 24px 24px 0 !important;
+}
+
+#rememberContainer {
+	margin: 0 24px 16px !important;
+}
+
 #titleContainer {
 	padding: 6px !important;
 	margin-top: 6px !important;
diff --git a/src/other/firefox/Monterey/parts/icons.css b/src/other/firefox/Monterey/parts/icons.css
index 0b591e2..e1b3bcf 100644
--- a/src/other/firefox/Monterey/parts/icons.css
+++ b/src/other/firefox/Monterey/parts/icons.css
@@ -325,6 +325,14 @@ menu[disabled] > .menu-right {
 	list-style-image: url("../icons/view-more-horizontal-symbolic.svg") !important;
 }
 
+#mozcn-mobile-bookmarks-button {
+	list-style-image: url("../icons/phone-symbolic.svg") !important;
+}
+
+#bookmarks-toolbar-button, #bookmarks-toolbar-placeholder {
+	list-style-image: url("../icons/star-symbolic.svg") !important;
+}
+
 /* Glitch - animations (may be possible to fix in about:config) */
 #reload-button,
 .downloadIconRetry > .button-box > .button-icon,
@@ -469,6 +477,44 @@ menu[disabled] > .menu-right {
 	list-style-image: url("../icons/screenshot-symbolic.svg") !important;
 }
 
+toolbarbutton#easyscreenshot_mozillaonline_com-BAP {
+	--webextension-menupanel-image: url("../icons/screenshot-symbolic.svg") !important;
+	--webextension-menupanel-image-2x: url("../icons/screenshot-symbolic.svg") !important;
+	--webextension-menupanel-image-light: url("../icons/screenshot-symbolic-light.svg") !important;
+	--webextension-menupanel-image-2x-light: url("../icons/screenshot-symbolic-light.svg") !important;
+	--webextension-menupanel-image-dark: url("../icons/screenshot-symbolic.svg") !important;
+	--webextension-menupanel-image-2x-dark: url("../icons/screenshot-symbolic.svg") !important;
+	--webextension-toolbar-image: url("../icons/screenshot-symbolic.svg") !important;
+	--webextension-toolbar-image-2x: url("../icons/screenshot-symbolic.svg") !important;
+	--webextension-toolbar-image-light: url("../icons/screenshot-symbolic-light.svg") !important;
+	--webextension-toolbar-image-2x-light: url("../icons/screenshot-symbolic-light.svg") !important;
+	--webextension-toolbar-image-dark: url("../icons/screenshot-symbolic.svg") !important;
+	--webextension-toolbar-image-2x-dark: url("../icons/screenshot-symbolic.svg") !important;
+}
+
+toolbarbutton#cpmanager_mozillaonline_com-BAP {
+	--webextension-menupanel-image: url("../icons/tab-restore-symbolic.svg") !important;
+	--webextension-menupanel-image-2x: url("../icons/tab-restore-symbolic.svg") !important;
+	--webextension-menupanel-image-light: url("../icons/tab-restore-symbolic-light.svg") !important;
+	--webextension-menupanel-image-2x-light: url("../icons/tab-restore-symbolic-light.svg") !important;
+	--webextension-menupanel-image-dark: url("../icons/tab-restore-symbolic.svg") !important;
+	--webextension-menupanel-image-2x-dark: url("../icons/tab-restore-symbolic.svg") !important;
+	--webextension-toolbar-image: url("../icons/tab-restore-symbolic.svg") !important;
+	--webextension-toolbar-image-2x: url("../icons/tab-restore-symbolic.svg") !important;
+	--webextension-toolbar-image-light: url("../icons/tab-restore-symbolic-light.svg") !important;
+	--webextension-toolbar-image-2x-light: url("../icons/tab-restore-symbolic-light.svg") !important;
+	--webextension-toolbar-image-dark: url("../icons/tab-restore-symbolic.svg") !important;
+	--webextension-toolbar-image-2x-dark: url("../icons/tab-restore-symbolic.svg") !important;
+}
+
+toolbar:not([brighttext]) .webextension-browser-action:-moz-lwtheme {
+	list-style-image: var(--webextension-toolbar-image-2x-dark, var(--gnome-toolbar-color)) !important;
+}
+
+#mo-url2qr-icon {
+	list-style-image: url("../icons/url2qr-icon.svg") !important;
+}
+
 .popup-notification-icon[popupid="web-notifications"], .desktop-notification-icon {
 	list-style-image: url("../icons/notification-symbolic.svg") !important;
 }
@@ -649,6 +695,9 @@ treechildren::-moz-tree-image {
 	#downloads-button .toolbarbutton-icon,
 	#sync-button .toolbarbutton-icon,
 	#new-window-button .toolbarbutton-icon,
+	#mozcn-mobile-bookmarks-button .toolbarbutton-icon,
+	#bookmarks-toolbar-button .toolbarbutton-icon,
+	#bookmarks-toolbar-placeholder .toolbarbutton-icon,
 	#screenshot-button .toolbarbutton-icon,
 	#tracking-protection-icon,
 	#pageActionButton,
@@ -700,6 +749,10 @@ treechildren::-moz-tree-image {
 		list-style-image: url("../icons/save-to-pocket-open-light.svg") !important;
 	}
 
+	#mo-url2qr-icon {
+		list-style-image: url("../icons/url2qr-icon-light.svg") !important;
+	}
+
 	/* Tree views */
 	treechildren::-moz-tree-twisty,
 	.item.client .item-twisty-container {
diff --git a/src/other/firefox/WhiteSur/icons/phone-symbolic.svg b/src/other/firefox/WhiteSur/icons/phone-symbolic.svg
new file mode 100644
index 0000000..dc74770
--- /dev/null
+++ b/src/other/firefox/WhiteSur/icons/phone-symbolic.svg
@@ -0,0 +1,4 @@
+<svg width="4.2333mm" height="4.2333mm" version="1.1" viewBox="0 0 4.2333 4.2333" xmlns="http://www.w3.org/2000/svg">
+ <path d="m0.79375 0.52917c0-0.29316 0.23601-0.52917 0.52917-0.52917h1.5875c0.29316 0 0.52917 0.23601 0.52917 0.52917v3.175c0 0.29316-0.23601 0.52917-0.52917 0.52917h-1.5875c-0.29316 0-0.52917-0.23601-0.52917-0.52917zm0.26458 0v3.175c0 0.14658 0.118 0.26458 0.26458 0.26458h1.5875c0.14658 0 0.26458-0.118 0.26458-0.26458v-3.175c0-0.14658-0.118-0.26458-0.26458-0.26458h-1.5875c-0.14658 0-0.26458 0.118-0.26458 0.26458z" color="#363636" fill="#333333" stroke-width=".26458"/>
+ <rect x="1.5875" y="3.4396" width="1.0583" height=".26458" rx=".13229" ry=".13229" fill="#333333" stroke-linecap="square" stroke-width=".40002"/>
+</svg>
diff --git a/src/other/firefox/WhiteSur/icons/screenshot-symbolic-light.svg b/src/other/firefox/WhiteSur/icons/screenshot-symbolic-light.svg
new file mode 100644
index 0000000..fa6d8e8
--- /dev/null
+++ b/src/other/firefox/WhiteSur/icons/screenshot-symbolic-light.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <g fill="#dedede">
+  <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>
diff --git a/src/other/firefox/WhiteSur/icons/tab-restore-symbolic-light.svg b/src/other/firefox/WhiteSur/icons/tab-restore-symbolic-light.svg
new file mode 100644
index 0000000..3b3bda6
--- /dev/null
+++ b/src/other/firefox/WhiteSur/icons/tab-restore-symbolic-light.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <path d="m5.2426 9.7427 0.70703-0.70703-3.5356-3.5356 3.5356-3.5356-0.70703-0.70703-4.2426 4.2426 0.70703 0.70703z" fill="#dedede"/>
+ <rect x="2" y="5" width="7" height="1" fill="#dedede" stroke-width="1.8708"/>
+ <path d="m7 5v1h3c2.216 0 4 1.784 4 4 0 2.216-1.784 4-4 4h-7v1h7c2.77 0 5-2.23 5-5 0-2.77-2.23-5-5-5z" fill="#dedede" stop-color="#000000" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/src/other/firefox/WhiteSur/icons/tab-restore-symbolic.svg b/src/other/firefox/WhiteSur/icons/tab-restore-symbolic.svg
new file mode 100644
index 0000000..5342d92
--- /dev/null
+++ b/src/other/firefox/WhiteSur/icons/tab-restore-symbolic.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <path d="m5.2426 9.7427 0.70703-0.70703-3.5356-3.5356 3.5356-3.5356-0.70703-0.70703-4.2426 4.2426 0.70703 0.70703z" fill="#363636"/>
+ <rect x="2" y="5" width="7" height="1" fill="#363636" stroke-width="1.8708"/>
+ <path d="m7 5v1h3c2.216 0 4 1.784 4 4 0 2.216-1.784 4-4 4h-7v1h7c2.77 0 5-2.23 5-5 0-2.77-2.23-5-5-5z" fill="#363636" stop-color="#000000" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/src/other/firefox/WhiteSur/icons/url2qr-icon-light.svg b/src/other/firefox/WhiteSur/icons/url2qr-icon-light.svg
new file mode 100644
index 0000000..0bf3009
--- /dev/null
+++ b/src/other/firefox/WhiteSur/icons/url2qr-icon-light.svg
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="16"
+   height="16"
+   version="1.1"
+   id="svg112"
+   sodipodi:docname="url2qr-icon-light.svg"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs116" />
+  <sodipodi:namedview
+     id="namedview114"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="true"
+     inkscape:zoom="7.375"
+     inkscape:cx="-32.745763"
+     inkscape:cy="1.7627119"
+     inkscape:window-width="1920"
+     inkscape:window-height="1030"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg112">
+    <inkscape:grid
+       type="xygrid"
+       id="grid399" />
+  </sodipodi:namedview>
+  <rect
+     x="3"
+     y="6"
+     width="1"
+     height="4"
+     fill="#4d4d4d"
+     stop-color="#000000"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     stroke-width="2.8284"
+     style="paint-order:fill markers stroke;fill:#dedede;fill-opacity:1"
+     id="rect2" />
+  <rect
+     x="3"
+     y="12"
+     width="1"
+     height="1"
+     fill="#4d4d4d"
+     stop-color="#000000"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     style="paint-order:fill markers stroke;fill:#dedede;fill-opacity:1"
+     id="rect4" />
+  <rect
+     x="6"
+     y="3"
+     width="4"
+     height="1"
+     fill="#4d4d4d"
+     stop-color="#000000"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     stroke-width="2.8284"
+     style="paint-order:fill markers stroke;fill:#dedede;fill-opacity:1"
+     id="rect6" />
+  <path
+     d="m1 10v5h5v-5h-5zm1 1h3v3h-3v-3z"
+     fill="#4d4d4d"
+     stop-color="#000000"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     stroke-width="2"
+     style="paint-order:fill markers stroke;fill:#dedede;fill-opacity:1"
+     id="path60" />
+  <rect
+     x="3"
+     y="3"
+     width="1"
+     height="1"
+     fill="#4d4d4d"
+     stop-color="#000000"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     style="paint-order:fill markers stroke;fill:#dedede;fill-opacity:1"
+     id="rect62" />
+  <path
+     d="m1 1v5h5v-5zm1 1h3v3h-3z"
+     fill="#4d4d4d"
+     stop-color="#000000"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     stroke-width="2"
+     style="paint-order:fill markers stroke;fill:#dedede;fill-opacity:1"
+     id="path64" />
+  <rect
+     x="12"
+     y="3"
+     width="1"
+     height="1"
+     fill="#4d4d4d"
+     stop-color="#000000"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     style="paint-order:fill markers stroke;fill:#dedede;fill-opacity:1"
+     id="rect66" />
+  <path
+     d="m10 1v5h5v-5zm1 1h3v3h-3z"
+     fill="#4d4d4d"
+     stop-color="#000000"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     stroke-width="2"
+     style="paint-order:fill markers stroke;fill:#dedede;fill-opacity:1"
+     id="path68" />
+  <rect
+     style="fill:#dedede;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000;fill-opacity:1"
+     id="rect453"
+     width="2"
+     height="2"
+     x="6"
+     y="6" />
+  <rect
+     style="fill:#dedede;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000;fill-opacity:1"
+     id="rect455"
+     width="2"
+     height="2"
+     x="6"
+     y="10" />
+  <rect
+     style="fill:#dedede;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000;fill-opacity:1"
+     id="rect457"
+     width="2"
+     height="2"
+     x="8"
+     y="8" />
+  <rect
+     style="fill:#dedede;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000;fill-opacity:1"
+     id="rect459"
+     width="2"
+     height="2"
+     x="10"
+     y="10" />
+  <rect
+     style="fill:#dedede;stroke-width:1.99999;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000;fill-opacity:1"
+     id="rect465"
+     width="2"
+     height="2"
+     x="8"
+     y="12" />
+  <rect
+     style="fill:#dedede;stroke-width:1.99999;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000;fill-opacity:1"
+     id="rect467"
+     width="2"
+     height="2"
+     x="12"
+     y="8" />
+  <rect
+     x="12"
+     y="12"
+     width="2"
+     height="2"
+     fill="#4d4d4d"
+     stop-color="#000000"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     style="stroke-width:2;paint-order:fill markers stroke;fill:#dedede;fill-opacity:1"
+     id="rect491" />
+  <rect
+     style="fill:#dedede;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000;fill-opacity:1"
+     id="rect493"
+     width="2"
+     height="2"
+     x="10"
+     y="6" />
+</svg>
diff --git a/src/other/firefox/WhiteSur/icons/url2qr-icon.svg b/src/other/firefox/WhiteSur/icons/url2qr-icon.svg
new file mode 100644
index 0000000..6e87af6
--- /dev/null
+++ b/src/other/firefox/WhiteSur/icons/url2qr-icon.svg
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="16"
+   height="16"
+   version="1.1"
+   id="svg112"
+   sodipodi:docname="url2qr-icon.svg"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs116" />
+  <sodipodi:namedview
+     id="namedview114"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="true"
+     inkscape:zoom="7.375"
+     inkscape:cx="-42.237288"
+     inkscape:cy="1.7627119"
+     inkscape:window-width="1920"
+     inkscape:window-height="1030"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg112">
+    <inkscape:grid
+       type="xygrid"
+       id="grid399" />
+  </sodipodi:namedview>
+  <rect
+     x="3"
+     y="6"
+     width="1"
+     height="4"
+     fill="#4d4d4d"
+     stop-color="#000000"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     stroke-width="2.8284"
+     style="paint-order:fill markers stroke;fill:#363636;fill-opacity:1"
+     id="rect2" />
+  <rect
+     x="3"
+     y="12"
+     width="1"
+     height="1"
+     fill="#4d4d4d"
+     stop-color="#000000"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     style="paint-order:fill markers stroke;fill:#363636;fill-opacity:1"
+     id="rect4" />
+  <rect
+     x="6"
+     y="3"
+     width="4"
+     height="1"
+     fill="#4d4d4d"
+     stop-color="#000000"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     stroke-width="2.8284"
+     style="paint-order:fill markers stroke;fill:#363636;fill-opacity:1"
+     id="rect6" />
+  <path
+     d="m1 10v5h5v-5h-5zm1 1h3v3h-3v-3z"
+     fill="#4d4d4d"
+     stop-color="#000000"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     stroke-width="2"
+     style="paint-order:fill markers stroke;fill:#363636;fill-opacity:1"
+     id="path60" />
+  <rect
+     x="3"
+     y="3"
+     width="1"
+     height="1"
+     fill="#4d4d4d"
+     stop-color="#000000"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     style="paint-order:fill markers stroke;fill:#363636;fill-opacity:1"
+     id="rect62" />
+  <path
+     d="m1 1v5h5v-5zm1 1h3v3h-3z"
+     fill="#4d4d4d"
+     stop-color="#000000"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     stroke-width="2"
+     style="paint-order:fill markers stroke;fill:#363636;fill-opacity:1"
+     id="path64" />
+  <rect
+     x="12"
+     y="3"
+     width="1"
+     height="1"
+     fill="#4d4d4d"
+     stop-color="#000000"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     style="paint-order:fill markers stroke;fill:#363636;fill-opacity:1"
+     id="rect66" />
+  <path
+     d="m10 1v5h5v-5zm1 1h3v3h-3z"
+     fill="#4d4d4d"
+     stop-color="#000000"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     stroke-width="2"
+     style="paint-order:fill markers stroke;fill:#363636;fill-opacity:1"
+     id="path68" />
+  <rect
+     style="fill:#363636;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000;fill-opacity:1"
+     id="rect453"
+     width="2"
+     height="2"
+     x="6"
+     y="6" />
+  <rect
+     style="fill:#363636;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000;fill-opacity:1"
+     id="rect455"
+     width="2"
+     height="2"
+     x="6"
+     y="10" />
+  <rect
+     style="fill:#363636;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000;fill-opacity:1"
+     id="rect457"
+     width="2"
+     height="2"
+     x="8"
+     y="8" />
+  <rect
+     style="fill:#363636;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000;fill-opacity:1"
+     id="rect459"
+     width="2"
+     height="2"
+     x="10"
+     y="10" />
+  <rect
+     style="fill:#363636;stroke-width:1.99999;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000;fill-opacity:1"
+     id="rect465"
+     width="2"
+     height="2"
+     x="8"
+     y="12" />
+  <rect
+     style="fill:#363636;stroke-width:1.99999;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000;fill-opacity:1"
+     id="rect467"
+     width="2"
+     height="2"
+     x="12"
+     y="8" />
+  <rect
+     x="12"
+     y="12"
+     width="2"
+     height="2"
+     fill="#4d4d4d"
+     stop-color="#000000"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     style="stroke-width:2;paint-order:fill markers stroke;fill:#363636;fill-opacity:1"
+     id="rect491" />
+  <rect
+     style="fill:#363636;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stop-color:#000000;fill-opacity:1"
+     id="rect493"
+     width="2"
+     height="2"
+     x="10"
+     y="6" />
+</svg>
diff --git a/src/other/firefox/WhiteSur/parts/dialogs.css b/src/other/firefox/WhiteSur/parts/dialogs.css
index 735f19c..9484bea 100644
--- a/src/other/firefox/WhiteSur/parts/dialogs.css
+++ b/src/other/firefox/WhiteSur/parts/dialogs.css
@@ -55,6 +55,14 @@ dialog[subdialog] {
 	padding-bottom: 0;
 }
 
+#description-box {
+	margin: 24px 24px 0 !important;
+}
+
+#rememberContainer {
+	margin: 0 24px 16px !important;
+}
+
 #titleContainer {
 	padding: 6px !important;
 	margin-top: 6px !important;
diff --git a/src/other/firefox/WhiteSur/parts/headerbar.css b/src/other/firefox/WhiteSur/parts/headerbar.css
index 09f7257..9aff8fb 100644
--- a/src/other/firefox/WhiteSur/parts/headerbar.css
+++ b/src/other/firefox/WhiteSur/parts/headerbar.css
@@ -65,7 +65,7 @@ toolbar .toolbaritem-combined-buttons > .toolbarbutton-1 {
 #nav-bar toolbarbutton:not(#urlbar-zoom-button)[disabled] {
 	background: transparent !important;
 	border-color: var(--gnome-button-disabled-border-color) !important;
-	box-shadow: var(--gnome-button-disabled-box-shadow) !important;
+	box-shadow: none !important;
 	opacity: 1 !important;
 }
 
diff --git a/src/other/firefox/WhiteSur/parts/icons.css b/src/other/firefox/WhiteSur/parts/icons.css
index 0b591e2..e1b3bcf 100644
--- a/src/other/firefox/WhiteSur/parts/icons.css
+++ b/src/other/firefox/WhiteSur/parts/icons.css
@@ -325,6 +325,14 @@ menu[disabled] > .menu-right {
 	list-style-image: url("../icons/view-more-horizontal-symbolic.svg") !important;
 }
 
+#mozcn-mobile-bookmarks-button {
+	list-style-image: url("../icons/phone-symbolic.svg") !important;
+}
+
+#bookmarks-toolbar-button, #bookmarks-toolbar-placeholder {
+	list-style-image: url("../icons/star-symbolic.svg") !important;
+}
+
 /* Glitch - animations (may be possible to fix in about:config) */
 #reload-button,
 .downloadIconRetry > .button-box > .button-icon,
@@ -469,6 +477,44 @@ menu[disabled] > .menu-right {
 	list-style-image: url("../icons/screenshot-symbolic.svg") !important;
 }
 
+toolbarbutton#easyscreenshot_mozillaonline_com-BAP {
+	--webextension-menupanel-image: url("../icons/screenshot-symbolic.svg") !important;
+	--webextension-menupanel-image-2x: url("../icons/screenshot-symbolic.svg") !important;
+	--webextension-menupanel-image-light: url("../icons/screenshot-symbolic-light.svg") !important;
+	--webextension-menupanel-image-2x-light: url("../icons/screenshot-symbolic-light.svg") !important;
+	--webextension-menupanel-image-dark: url("../icons/screenshot-symbolic.svg") !important;
+	--webextension-menupanel-image-2x-dark: url("../icons/screenshot-symbolic.svg") !important;
+	--webextension-toolbar-image: url("../icons/screenshot-symbolic.svg") !important;
+	--webextension-toolbar-image-2x: url("../icons/screenshot-symbolic.svg") !important;
+	--webextension-toolbar-image-light: url("../icons/screenshot-symbolic-light.svg") !important;
+	--webextension-toolbar-image-2x-light: url("../icons/screenshot-symbolic-light.svg") !important;
+	--webextension-toolbar-image-dark: url("../icons/screenshot-symbolic.svg") !important;
+	--webextension-toolbar-image-2x-dark: url("../icons/screenshot-symbolic.svg") !important;
+}
+
+toolbarbutton#cpmanager_mozillaonline_com-BAP {
+	--webextension-menupanel-image: url("../icons/tab-restore-symbolic.svg") !important;
+	--webextension-menupanel-image-2x: url("../icons/tab-restore-symbolic.svg") !important;
+	--webextension-menupanel-image-light: url("../icons/tab-restore-symbolic-light.svg") !important;
+	--webextension-menupanel-image-2x-light: url("../icons/tab-restore-symbolic-light.svg") !important;
+	--webextension-menupanel-image-dark: url("../icons/tab-restore-symbolic.svg") !important;
+	--webextension-menupanel-image-2x-dark: url("../icons/tab-restore-symbolic.svg") !important;
+	--webextension-toolbar-image: url("../icons/tab-restore-symbolic.svg") !important;
+	--webextension-toolbar-image-2x: url("../icons/tab-restore-symbolic.svg") !important;
+	--webextension-toolbar-image-light: url("../icons/tab-restore-symbolic-light.svg") !important;
+	--webextension-toolbar-image-2x-light: url("../icons/tab-restore-symbolic-light.svg") !important;
+	--webextension-toolbar-image-dark: url("../icons/tab-restore-symbolic.svg") !important;
+	--webextension-toolbar-image-2x-dark: url("../icons/tab-restore-symbolic.svg") !important;
+}
+
+toolbar:not([brighttext]) .webextension-browser-action:-moz-lwtheme {
+	list-style-image: var(--webextension-toolbar-image-2x-dark, var(--gnome-toolbar-color)) !important;
+}
+
+#mo-url2qr-icon {
+	list-style-image: url("../icons/url2qr-icon.svg") !important;
+}
+
 .popup-notification-icon[popupid="web-notifications"], .desktop-notification-icon {
 	list-style-image: url("../icons/notification-symbolic.svg") !important;
 }
@@ -649,6 +695,9 @@ treechildren::-moz-tree-image {
 	#downloads-button .toolbarbutton-icon,
 	#sync-button .toolbarbutton-icon,
 	#new-window-button .toolbarbutton-icon,
+	#mozcn-mobile-bookmarks-button .toolbarbutton-icon,
+	#bookmarks-toolbar-button .toolbarbutton-icon,
+	#bookmarks-toolbar-placeholder .toolbarbutton-icon,
 	#screenshot-button .toolbarbutton-icon,
 	#tracking-protection-icon,
 	#pageActionButton,
@@ -700,6 +749,10 @@ treechildren::-moz-tree-image {
 		list-style-image: url("../icons/save-to-pocket-open-light.svg") !important;
 	}
 
+	#mo-url2qr-icon {
+		list-style-image: url("../icons/url2qr-icon-light.svg") !important;
+	}
+
 	/* Tree views */
 	treechildren::-moz-tree-twisty,
 	.item.client .item-twisty-container {
diff --git a/src/other/firefox/WhiteSur/parts/tabsbar.css b/src/other/firefox/WhiteSur/parts/tabsbar.css
index 6f1082f..3f196ca 100644
--- a/src/other/firefox/WhiteSur/parts/tabsbar.css
+++ b/src/other/firefox/WhiteSur/parts/tabsbar.css
@@ -360,6 +360,10 @@ tab[selected]:-moz-window-inactive {
 	height: 32px !important;
 }
 
+#alltabs-button {
+	display: none !important;
+}
+
 /* firefox-view-button */
 :root:not([privatebrowsingmode="temporary"]):not([firefoxviewhidden]) :is(#firefox-view-button, #wrapper-firefox-view-button) + #tabbrowser-tabs {
 	border-inline-start: 1px solid var(--gnome-toolbar-border-color) !important;