Improved logo handling