simplify shape creation, since the case of returning a possible null shape for ShapeIcons is no longer needed