WP-1671: Image overlapping FIXED.