A style pass.

Added a better default toolbar style; positioned several button icons correctly.

Sorry about the weird pull request that includes a commit from another pull request... didn't organize this quite right ahead of time.