Refactor class names and add oil-barrel icon