Case 2787 - Changed markup for add/remove bookmark.
Merge branch 'case-2787' into new-buttons

* case-2787:
  Case 2787 - Changed markup for add/remove bookmark.