benefit icons and neutral class refactoring