new version: refactoring, icons