Merge change 25777 into eclair

* changes:
  Give more space to the close button, and highlight separately from tab.