Genericons clean up