New icons, added the tracjking stuff, fixed padding