Updates to button icons and ui layout

In the future we can make layout more customizable but I'd prefer to move forward with other issues atm.

![buttondev](https://cloud.githubusercontent.com/assets/45583/5328786/31991c9a-7d43-11e4-8a65-dbf7a155f373.png)