Icons in the Navigation, routing done for Calendar, To-Do, and Settings need input from Chris on connect and merging.