Vnext updates for templates and icons