Refactoring

and icons!