Fix to current menu item icon and subnav close button