Fix some more icon issues.