Grab bag of commits [GITHUB]

Use different toolbar buttons.
Keep in mind that this is pure styling. Functionality will be PR later because it is too much wired inside the image uploading branch.