Merge "Clean up logic around user icons"