Fixed #162 a thrown error by CloseIcon
Merge branch '162_Close-icon'