* fix Icon
* refactoring