Integrated the new Buttons

Changed the toolbar buttons to the new ones.