Code review, icon updated, UI optimization