VID-1854 square thumbs

/CC @lizlux 
looks like some of my logic was removed here but I can work it back in after we merge this.