more consistent thumbnail source & size handling