Fix even more icon issues.