#11 menus and icons fixed