Merge change 27095 into eclair

* changes:
  Use new, consistent assets for adding a bookmark.