VID-1821 Tweaks to when to show info icon

Woops. Changed the implementation last minute as I was leaving. Forgot to update here. Good catch.