Minor refactoring and new icon