Fix for menu_icon bug in #1739