Merge "Fix mode icon sharing in modes list" into main