Background thumbnails too big when display is scaled

Split out from here. See image below. Seems to be a regression from !959 (merged)