Added support for icons in menus