Wrap img tag with span instead of div

Includes test.