Updated icons. Changed to using user menu