Fix some icon issues.