Fix FC on Lollipop when control connection times out
Add icons for menu items that don't have them