diff --git a/tensorboard/webapp/theme/_tb_theme.template.scss b/tensorboard/webapp/theme/_tb_theme.template.scss
index 9bef0a5674..a257ce771e 100644
--- a/tensorboard/webapp/theme/_tb_theme.template.scss
+++ b/tensorboard/webapp/theme/_tb_theme.template.scss
@@ -93,6 +93,16 @@ $tb-theme: map_merge(
     color: $color,
   )
 );
+$tb-theme: map_merge(
+  $tb-theme,
+  color,
+  system,
+  (
+    on-surface: /*m2*/
+      mat.get-color-from-palette(/*m2$*/ mat.$gray-palette, 900),
+
+  )
+);
 
 $tb-dark-theme: mat.define-dark-theme(
   (