Replace inconsistent icon styles in toolbars

Closes #533 

---
![a](https://cloud.githubusercontent.com/assets/302258/3654460/4a754f30-116a-11e4-83e2-5c48486a2db6.png)