diff --git a/web/comment_manager.css b/web/comment_manager.css
index 1de8962fb..c40b1bbce 100644
--- a/web/comment_manager.css
+++ b/web/comment_manager.css
@@ -211,9 +211,9 @@
   @media screen and (forced-colors: active) {
     --comment-date-fg-color: CanvasText;
     --comment-bg-color: Canvas;
-    --comment-hover-bg-color: SelectedItemText;
+    --comment-hover-bg-color: Canvas;
     --comment-hover-filter: none;
-    --comment-active-bg-color: SelectedItemText;
+    --comment-active-bg-color: Canvas;
     --comment-active-filter: none;
     --comment-border-color: CanvasText;
     --comment-fg-color: CanvasText;
@@ -222,7 +222,7 @@
     --comment-indicator-focus-fg-color: CanvasText;
     --comment-indicator-hover-fg-color: CanvasText;
     --comment-indicator-selected-fg-color: SelectedItem;
-    --button-comment-bg: HighlightText;
+    --button-comment-bg: ButtonFace;
     --button-comment-color: ButtonText;
     --button-comment-active-bg: ButtonText;
     --button-comment-active-color: HighlightText;
diff --git a/web/dialog.css b/web/dialog.css
index c32097f82..af9bc4f9f 100644
--- a/web/dialog.css
+++ b/web/dialog.css
@@ -99,7 +99,7 @@
     --radio-border-color: ButtonText;
     --radio-checked-border-color: ButtonText;
 
-    --button-secondary-bg-color: HighlightText;
+    --button-secondary-bg-color: ButtonFace;
     --button-secondary-fg-color: ButtonText;
     --button-secondary-border-color: ButtonText;
     --button-secondary-active-bg-color: HighlightText;
@@ -112,7 +112,7 @@
     --button-secondary-disabled-border-color: GrayText;
 
     --button-primary-bg-color: ButtonText;
-    --button-primary-fg-color: HighlightText;
+    --button-primary-fg-color: ButtonFace;
     --button-primary-border-color: ButtonText;
     --button-primary-active-bg-color: SelectedItem;
     --button-primary-active-fg-color: HighlightText;
@@ -125,7 +125,7 @@
     --button-primary-disabled-border-color: GrayText;
     --button-disabled-opacity: 1;
 
-    --input-text-bg-color: HighlightText;
+    --input-text-bg-color: Field;
     --input-text-fg-color: FieldText;
   }