Updated icons, added NoContainerAttribute