Remove necessity of icon class

Only the icon specific class is needed
Merge pull request #7382 from jbtbnl/master

Remove necessity of icon class