Fixed an icon resolution and a bug after hitting confirm button