Fix bug, draw icon if need