Refactoring Button: remove painter