small refactor: icons, text, code clean