updated icons & logo handling