Remove necessity of icon class

This removes the necessity of an icon class and therefore reduces the amount of classes for HTML elements containing an icon with one.

@jancborchardt please review.
Let's wait for #7366 to be fixed before merging this.