VID-1821 Tweaks to when to show info icon

I wasn't sure what the best place to put this was. If someone has a better idea, let me know.