Backport some upstream fixes

Guido Güntherrequested to merge
fixes into debian/latest

Fixes a background load crash and folder icons being too large.

Merge request reports