More icons and bug fix