Finish transition to UINavBars, improved iconography