Icon improvements

preferred