Add Genericons and clean some stuff up