Updated icons. Cleanup old code