BUG: Fix menu-icon to work with 3.1