add add some icons and small refactoring