* Some refactoring
+ Tag icon