Fixed #140, Updated icons and order of Toolbar