Corrected indentation and cleaned menu_icons work for current branch