Fixed icon issues