Just replace wrappers with "img"

A bit simplier wrapper cleanup.