exeption fixed
icon added