Adding icon and bug fix.