Bug: Options icon is not displayed in annotation panel

The options icon appears in the content panel.

The options belong to the annotation panel and should be displayed there.

Edited by Kristine Voigt