Widen arrow and acorn bboxes

Fix #1854