Add icons to form buttons

This one replaces #158