VID-1854 square thumbs

/CC @lizlux 
whitespace