Merge "Update nav bar icons." into mnc-dev