Merge change 7429

* changes:
  Work on the Bookmark Grid, including the favicon.