Further work on the nav bar icons, see #21.