National: converted some elements to use the new icon set sprite. Various fixes.