visual cleanup for email icon and discussion context label post branch merge