Added programmatic drawing for some icons, and inner circle animations