More icons and rendering changes