TFS 13125 - Refactor menus. Add icons.