Fixed multiple icon iissue