List toolbar refactor