Merge "Revert "Update icons and text for guest user"" into sc-dev