Feature/Task buttons labels

Minor changes that add a bit to the functionality and look of the taskbar.
![icons_and_labels](https://f.cloud.github.com/assets/6335290/1855914/7d06216c-773d-11e3-8e18-9a3c062ecd4b.png)