Fixed issues on icons