Issue #8806 by tuj: Changed how the logo is set