[IMP] Improved background-image behavior