Fixed #1032: broken dark theme

Merged Agate requested to merge 1032-brokenn-dark-theme into develop

Merge request reports