New icons and updated menu code