Added features to allow better icons