display icon + focus bug fix