[3.8.4] Fix square thumbnail position calculation