Refactoring
Add icon custume
Finish icon-size