better handling of ShapeIcon drawable state changing