SMN-84 fixed image overlapping