Resolve #3567871: Port changes from Byte theme

Merge request reports

Loading