added icons and bug fixed