NXP-10932: Cleanup
NXP-10932: Cosmit
NXP-9739: Fix retina display icons on Safari based browser