WIP #10

Add icons to buttons