Looks better than the odd forced gray used for all themes (cherry picked from commit 4ce4ee3c007a500cfb3833b5dda87af812bfd814)
Looks better than the odd forced gray used for all themes (cherry picked from commit 4ce4ee3c007a500cfb3833b5dda87af812bfd814)