Merge change 26630 into eclair

* changes:
  Tweaks to improve the look of the bookmarks page.