Refactoring and new icons