Icon & emblem rendering fixes