Minor Icon improvements