Issue #3364776: Fix display issues in "dark mode"

Merge request reports