Merge change 24688 into eclair

* changes:
  Adjustments for the look of the tab page.