Merge "Fix custom mode icons not displayed in modes dialog" into main