diff --git a/css/icons.css b/css/icons.css
index 0c857cf7bf0..d45ce208eed 100644
--- a/css/icons.css
+++ b/css/icons.css
@@ -77,6 +77,16 @@
 	background-image: url(../img/icon-mail-white.svg);
 }
 
+.app-talk .icon-team,
+.talk-modal .icon-team,
+.sidebar-callview .icon-team,
+#talk-panel .icon-team,
+#talk-sidebar .icon-team,
+#call-container .icon-team,
+.talkChatTab .icon-team {
+	background-image: url(../img/icon-team-white.svg);
+}
+
 .app-talk .icon-changelog,
 .talk-modal .icon-changelog,
 .sidebar-callview .icon-changelog,
diff --git a/img/icon-team-white.svg b/img/icon-team-white.svg
new file mode 100644
index 00000000000..dfc8800d2d9
--- /dev/null
+++ b/img/icon-team-white.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" height="24" width="24" version="1.1">
+	<path fill="#fff" d="M12,5.5A3.5,3.5 0 0,1 15.5,9A3.5,3.5 0 0,1 12,12.5A3.5,3.5 0 0,1 8.5,9A3.5,3.5 0 0,1 12,5.5M5,8C5.56,8 6.08,8.15 6.53,8.42C6.38,9.85 6.8,11.27 7.66,12.38C7.16,13.34 6.16,14 5,14A3,3 0 0,1 2,11A3,3 0 0,1 5,8M19,8A3,3 0 0,1 22,11A3,3 0 0,1 19,14C17.84,14 16.84,13.34 16.34,12.38C17.2,11.27 17.62,9.85 17.47,8.42C17.92,8.15 18.44,8 19,8M5.5,18.25C5.5,16.18 8.41,14.5 12,14.5C15.59,14.5 18.5,16.18 18.5,18.25V20H5.5V18.25M0,20V18.5C0,17.11 1.89,15.94 4.45,15.6C3.86,16.28 3.5,17.22 3.5,18.25V20H0M24,20H20.5V18.25C20.5,17.22 20.14,16.28 19.55,15.6C22.11,15.94 24,17.11 24,18.5V20Z"/>
+</svg>
diff --git a/src/components/ConversationIcon.vue b/src/components/ConversationIcon.vue
index 21e82c1b3b8..47534661570 100644
--- a/src/components/ConversationIcon.vue
+++ b/src/components/ConversationIcon.vue
@@ -193,6 +193,8 @@ export default {
 					return 'icon-mail'
 				} else if (this.item.objectType === CONVERSATION.OBJECT_TYPE.PHONE) {
 					return 'icon-phone'
+				} else if (this.item.objectType === CONVERSATION.OBJECT_TYPE.CIRCLES) {
+					return 'icon-team'
 				} else if (this.item.type === CONVERSATION.TYPE.CHANGELOG) {
 					return 'icon-changelog'
 				} else if (this.item.type === CONVERSATION.TYPE.ONE_TO_ONE_FORMER) {
@@ -210,6 +212,11 @@ export default {
 				return undefined
 			}
 
+			if (this.item.objectType === CONVERSATION.OBJECT_TYPE.CIRCLES) {
+				// Team icon for group conversation suggestions
+				return 'icon-team'
+			}
+
 			if (this.item.type === CONVERSATION.TYPE.GROUP) {
 				// Group icon for group conversation suggestions
 				return 'icon-contacts'
diff --git a/src/components/LeftSidebar/LeftSidebar.vue b/src/components/LeftSidebar/LeftSidebar.vue
index 68807a21ad4..b258e82f01d 100644
--- a/src/components/LeftSidebar/LeftSidebar.vue
+++ b/src/components/LeftSidebar/LeftSidebar.vue
@@ -1031,6 +1031,16 @@ export default {
 	overflow-y: auto !important;
 	overflow-x: hidden !important;
 	padding: 0;
+
+	// FIXME upstream: subname color was dropped
+	:deep(.list-item-content__subname) {
+		color: var(--color-text-maxcontrast);
+	}
+
+	:deep(.list-item-content__name),
+	:deep(.list-item-content__subname--bold) {
+		font-weight: 500;
+	}
 }
 
 .unread-mention-button {
diff --git a/src/components/PollViewer/PollVotersDetails.vue b/src/components/PollViewer/PollVotersDetails.vue
index ce5def5e196..7d4574bac1a 100644
--- a/src/components/PollViewer/PollVotersDetails.vue
+++ b/src/components/PollViewer/PollVotersDetails.vue
@@ -29,6 +29,7 @@
 					<AvatarWrapper v-for="(item, index) in details.slice(0, 8)"
 						:id="item.actorId"
 						:key="index"
+						:token="token"
 						:name="getDisplayName(item)"
 						:source="item.actorType"
 						:size="AVATAR.SIZE.EXTRA_SMALL"
diff --git a/src/constants.js b/src/constants.js
index 8aaf8059a13..1897adc4302 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -100,6 +100,7 @@ export const CONVERSATION = {
 		EMAIL: 'emails',
 		FILE: 'file',
 		PHONE: 'phone',
+		CIRCLES: 'circles',
 		VIDEO_VERIFICATION: 'share:password',
 		BREAKOUT_ROOM: 'room',
 		DEFAULT: '',