Wrapped the brackets of the collapse buttons with spans

To make them accessible via CSS, similarly to what has been done with
the brackets of the edit buttons.

Change-Id: I6b961b5f11f81e6e8ef768ba43fe7f20b886051a
Merge "Wrapped the brackets of the collapse buttons with spans"