Merge "Make toolbox top a little more like everyone else\'s." am: d1ec9c450d
am: be44dba86d

* commit 'be44dba86d57b9c071b6ced625d569f8f4be719d':
  Make toolbox top a little more like everyone else's.