Shouldn't you be using reside_png here? Or is the original sufficient (if so, can all the new _png image fields go away)?