core change revert, have topbar avatar for users, hard coded size