Better icon class naming