refactoring icons and buttons in bars