Use `margin` instead of `padding` for image containers (see #5607)