Refactoring toolbar-action