Changing icon-xxxx definitions to allow custom classes to use them as mix-ins