Changing right bar icon + fixing issue with user info