Change compose icon
Refactor icon names