Remove necessity of icon class

Only the icon specific class is needed