Added Genericons
Tweaks