PIM-1716 : refactor image form type