Annotation link border

Rebase of #2995