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

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