[AB] [57256458] Image counter tweaks

Round 2 for [#57256458](https://www.pivotaltracker.com/story/show/57256458)