icon and menu updated

icon and menu updated, rearrange buttons and menu options