diff --git a/other/firefox/common/pages/common.css b/other/firefox/common/pages/common.css
index dbbdf7e8..2b8e23ae 100644
--- a/other/firefox/common/pages/common.css
+++ b/other/firefox/common/pages/common.css
@@ -2,6 +2,7 @@
   :host,
   :host(.anonymous-content-host),
   :root {
+    accent-color: var(--theme-primary-color) !important;
     --color-accent-primary: var(--theme-primary-active-color) !important;
     --in-content-page-color: var(--gnome-content-page-color) !important;
     --in-content-page-background: var(--gnome-content-page-background) !important;
@@ -21,6 +22,7 @@
     --in-content-primary-button-background-active: var(--theme-primary-active-color) !important;
 
     --in-content-table-background: var(--gnome-browser-before-load-background) !important;
+    --in-content-table-header-background: var(--theme-primary-color) !important;
 
     --newtab-background-color: var(--gnome-browser-before-load-background) !important;
     --newtab-background-color-secondary: var(--gnome-content-page-dialog-background) !important;
@@ -29,6 +31,7 @@
     --fxview-background-color-secondary: var(--gnome-menu-background) !important;
     scrollbar-color: rgba(250,250,250,.4) rgba(22,22,22,.3) !important;
     --background-color-box: var(--gnome-content-box-background) !important;
+    --background-color-canvas: var(--gnome-browser-before-load-background) !important;
   }
 
   @media not (prefers-contrast) {
@@ -39,6 +42,19 @@
   }
 }
 
+@media (forced-colors) {
+  :host(.anonymous-content-host),
+  :root {
+    --in-content-box-info-background: var(--gnome-content-box-background) !important;
+
+    --in-content-item-hover: var(--theme-primary-color) !important;
+    --in-content-item-selected: var(--theme-primary-color) !important;
+
+    --in-content-table-background: var(--gnome-content-page-dialog-background) !important;
+    --in-content-table-header-background: var(--gnome-content-page-dialog-background) !important;
+  }
+}
+
 @media (prefers-color-scheme: dark) {
   @media not (forced-colors) {
     html|dialog,
@@ -58,7 +74,12 @@
 }
 
 .dialogBox window, .dialogBox dialog {
-	background: none !important;
+	background-color: transparent !important;
+}
+
+:root[dialogroot], :host(dialog) {
+	--in-content-page-background: var(--gnome-toolbar-background) !important;
+	--background-color-canvas: var(--gnome-toolbar-background) !important;
 }
 
 .close-icon {
diff --git a/other/firefox/common/parts/dialogs.css b/other/firefox/common/parts/dialogs.css
index 5afa7d19..9c4a343a 100644
--- a/other/firefox/common/parts/dialogs.css
+++ b/other/firefox/common/parts/dialogs.css
@@ -27,14 +27,6 @@ window {
 }
 
 /* Dialog */
-.dialogBox {
-	margin: 0 !important;
-	background-color: var(--gnome-popover-background) !important;
-	border-radius: 12px !important;
-	border: none !important;
-	box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.08) !important;
-}
-
 window[role="dialog"] {
 	background: none !important;
 	border: none !important;
@@ -53,17 +45,26 @@ dialog#handling {
 dialog[subdialog] {
 	background-color: var(--gnome-popover-background) !important;
 	border-radius: 12px !important;
-	border: 1px solid var(--gnome-menu-border-color) !important;
+	border: none !important;
 	box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.08) !important;
 }
 
 .dialogBox {
+	border-radius: 12px !important;
+	margin: 0 !important;
+
 	&:not(.spotlightBox) {
 		box-shadow: 0 2px 14px 0 rgba(0, 0, 0, 0.2), 0 0 0 1px #000000 !important;
 		border-radius: 12px !important;
+		outline: 1px solid rgba(255, 255, 255, 0.15) !important;
+		outline-offset: -1px;
 	}
 }
 
+.dialogBox window, .dialogBox dialog {
+	background: none !important;
+}
+
 /* Content */
 .dialog-content-box,
 #dialogGrid {
@@ -130,6 +131,11 @@ dialog[subdialog] {
 /* Print dialog */
 :root[dialogroot], :host(dialog) {
 	--in-content-page-background: var(--gnome-toolbar-background) !important;
+	--background-color-canvas: var(--gnome-toolbar-background) !important;
+}
+
+browser.printSettingsBrowser, .header-container, .body-container {
+	background-color: var(--gnome-toolbar-background) !important;
 }
 
 #editBookmarkPanelContent > input,
@@ -150,24 +156,6 @@ dialog[subdialog] {
 	-moz-outline-radius: 8px;
 }
 
-:root[dialogroot] select,
-:host(dialog) select {
-	background-image: url("chrome://global/skin/icons/arrow-down-12.svg") !important;
-	background-color: #ffffff !important;
-	background-position: right 12px center !important;
-	background-repeat: no-repeat !important;
-	background-size: auto 12px !important;
-	background-clip: padding-box !important;
-	border: 1px solid var(--gnome-button-border-color) !important;
-	border-bottom-color: var(--gnome-button-border-bottom-color) !important;
-	border-radius: 8px !important;
-	padding: 2px 12px !important;
-	min-height: 28px !important;
-	min-width: 28px !important;
-	color: var(--gnome-toolbar-color) !important;
-	box-shadow: var(--gnome-button-box-shadow) !important;
-}
-
 #cancel-button,
 #print-button.primary {
 	min-width: 7em !important;
@@ -185,20 +173,10 @@ dialog[subdialog] {
 	border-color: var(--theme-primary-color) !important;
 }
 
-:root[dialogroot] select:not([disabled]):hover,
-:host(dialog) select:not([disabled]):hover {
-	background-color: #f5f5f5 !important;
-}
-
 #print-button.primary:hover {
 	background-color: var(--theme-primary-hover-color) !important;
 }
 
-:root[dialogroot] select:not([disabled]):active,
-:host(dialog) select:not([disabled]):active {
-	background-color: #efefef !important;
-}
-
 #print-button.primary:active {
 	background-color: var(--theme-primary-active-color) !important;
 }
@@ -252,16 +230,29 @@ dialog[subdialog] {
 
 :root[dialogroot] select,
 :host(dialog) select {
-	background-color: #666666 !important;
+	background-image: url("chrome://global/skin/icons/arrow-down-12.svg") !important;
+	background-color: var(--gnome-button-background-color) !important;
+	background-position: right 12px center !important;
+	background-repeat: no-repeat !important;
+	background-size: auto 12px !important;
+	background-clip: padding-box !important;
+	border: 1px solid var(--gnome-button-border-color) !important;
+	border-bottom-color: var(--gnome-button-border-bottom-color) !important;
+	border-radius: 8px !important;
+	padding: 2px 12px !important;
+	min-height: 28px !important;
+	min-width: 28px !important;
+	color: var(--gnome-toolbar-color) !important;
+	box-shadow: var(--gnome-button-box-shadow) !important;
 }
 
 :root[dialogroot] select:not([disabled]):hover,
 :host(dialog) select:not([disabled]):hover {
-	background-color: #777777 !important;
+	background-color: var(--gnome-button-hover-background-color) !important;
 }
 
 :root[dialogroot] select:not([disabled]):active,
 :host(dialog) select:not([disabled]):active {
-	background-color: #888888 !important;
-}
+	background-color: var(--gnome-button-active-background-color) !important;
 }
+