Fix + [IOS-141]
Fix issue with additional black border