Remove origin-x/origin-y and add scale-x/scale-y to shape