Resolve #3581049 "Various theme improvements"

Closes #3581049

Merge request reports

Loading