diff --git a/src/components/LHNOptionsList/OptionRowLHN.js b/src/components/LHNOptionsList/OptionRowLHN.js
index 732051e6553e..2fae4b095e83 100644
--- a/src/components/LHNOptionsList/OptionRowLHN.js
+++ b/src/components/LHNOptionsList/OptionRowLHN.js
@@ -146,8 +146,8 @@ const OptionRowLHN = (props) => {
                                             backgroundColor={props.isFocused ? themeColors.activeComponentBG : themeColors.sidebar}
                                             mainAvatar={optionItem.icons[0]}
                                             secondaryAvatar={optionItem.icons[1]}
-                                            mainTooltip={optionItem.ownerEmail}
-                                            secondaryTooltip={optionItem.subtitle}
+                                            mainTooltip={optionItem.icons[0].name}
+                                            secondaryTooltip={optionItem.icons[1].name}
                                             size={props.viewMode === CONST.OPTION_MODE.COMPACT ? CONST.AVATAR_SIZE.SMALL : CONST.AVATAR_SIZE.DEFAULT}
                                         />
                                     ) : (
@@ -160,7 +160,7 @@ const OptionRowLHN = (props) => {
                                                 props.isFocused ? StyleUtils.getBackgroundAndBorderStyle(focusedBackgroundColor) : undefined,
                                                 hovered && !props.isFocused ? StyleUtils.getBackgroundAndBorderStyle(hoveredBackgroundColor) : undefined,
                                             ]}
-                                            shouldShowTooltip={!optionItem.isChatRoom && !optionItem.isArchivedRoom}
+                                            shouldShowTooltip={!optionItem.isArchivedRoom}
                                         />
                                     ))}
                                 <View style={contentContainerStyles}>
diff --git a/src/components/MultipleAvatars.js b/src/components/MultipleAvatars.js
index fa6330d4703f..8046c03c7699 100644
--- a/src/components/MultipleAvatars.js
+++ b/src/components/MultipleAvatars.js
@@ -64,7 +64,7 @@ const defaultProps = {
 
 const MultipleAvatars = (props) => {
     let avatarContainerStyles = props.size === CONST.AVATAR_SIZE.SMALL ? [styles.emptyAvatarSmall, styles.emptyAvatarMarginSmall] : [styles.emptyAvatar, styles.emptyAvatarMargin];
-    const singleAvatarStyles = props.size === CONST.AVATAR_SIZE.SMALL ? styles.singleAvatarSmall : styles.singleAvatar;
+    const singleAvatarStyle = props.size === CONST.AVATAR_SIZE.SMALL ? styles.singleAvatarSmall : styles.singleAvatar;
     const secondAvatarStyles = [props.size === CONST.AVATAR_SIZE.SMALL ? styles.secondAvatarSmall : styles.secondAvatar, ...props.secondAvatarStyle];
     const tooltipTexts = props.shouldShowTooltip ? _.pluck(props.icons, 'name') : [];
 
@@ -172,7 +172,7 @@ const MultipleAvatars = (props) => {
                     )}
                 </>
             ) : (
-                <View style={singleAvatarStyles}>
+                <View style={[singleAvatarStyle, props.icons[0].type === CONST.ICON_TYPE_WORKSPACE ? StyleUtils.getAvatarBorderRadius(props.size, props.icons[0].type) : {}]}>
                     <Tooltip text={tooltipTexts[0]}>
                         {/* View is necessary for tooltip to show for multiple avatars in LHN */}
                         <View>
@@ -180,13 +180,13 @@ const MultipleAvatars = (props) => {
                                 source={props.icons[0].source || props.fallbackIcon}
                                 fill={themeColors.iconSuccessFill}
                                 size={props.isFocusMode ? CONST.AVATAR_SIZE.MID_SUBSCRIPT : CONST.AVATAR_SIZE.SMALLER}
-                                imageStyles={[singleAvatarStyles]}
+                                imageStyles={[singleAvatarStyle]}
                                 name={props.icons[0].name}
                                 type={props.icons[0].type}
                             />
                         </View>
                     </Tooltip>
-                    <View style={secondAvatarStyles}>
+                    <View style={[[...secondAvatarStyles, props.icons[1].type === CONST.ICON_TYPE_WORKSPACE ? StyleUtils.getAvatarBorderRadius(props.size, props.icons[1].type) : {}]]}>
                         {props.icons.length === 2 ? (
                             <Tooltip text={tooltipTexts[1]}>
                                 <View>
@@ -194,7 +194,7 @@ const MultipleAvatars = (props) => {
                                         source={props.icons[1].source || props.fallbackIcon}
                                         fill={themeColors.iconSuccessFill}
                                         size={props.isFocusMode ? CONST.AVATAR_SIZE.MID_SUBSCRIPT : CONST.AVATAR_SIZE.SMALLER}
-                                        imageStyles={[singleAvatarStyles]}
+                                        imageStyles={[singleAvatarStyle]}
                                         name={props.icons[1].name}
                                         type={props.icons[1].type}
                                     />
@@ -202,7 +202,7 @@ const MultipleAvatars = (props) => {
                             </Tooltip>
                         ) : (
                             <Tooltip text={tooltipTexts.slice(1).join(', ')}>
-                                <View style={[singleAvatarStyles, styles.alignItemsCenter, styles.justifyContentCenter]}>
+                                <View style={[singleAvatarStyle, styles.alignItemsCenter, styles.justifyContentCenter]}>
                                     <Text
                                         selectable={false}
                                         style={props.size === CONST.AVATAR_SIZE.SMALL ? styles.avatarInnerTextSmall : styles.avatarInnerText}
diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index c34eefb4fc05..d360609abf84 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -511,15 +511,24 @@ function isThread(report) {
     return Boolean(report && report.parentReportID && report.parentReportActionID && report.type === CONST.REPORT.TYPE.CHAT);
 }
 
+/**
+ * Returns true if report is a DM/Group DM chat.
+ *
+ * @param {Object} report
+ * @returns {Boolean}
+ */
+function isDM(report) {
+    return Boolean(!getChatType(report));
+}
 
 /**
- * If the report has a chat type, it is a workspace chat.
+ * If the report is a thread and has a chat type set, it is a workspace chat.
  *
  * @param {Object} report
  * @returns {Boolean}
  */
 function isWorkspaceThread(report) {
-    return Boolean(isThread(report) && getChatType(report));
+    return Boolean(isThread(report) && !isDM(report));
 }
 
 /**
@@ -771,13 +780,13 @@ function getIcons(report, personalDetails, defaultIcon = null, isPayer = false)
         type: CONST.ICON_TYPE_AVATAR,
         name: '',
     };
-
     if (_.isEmpty(report)) {
         result.source = defaultIcon || Expensicons.FallbackAvatar;
         return [result];
     }
     if (isConciergeChatReport(report)) {
         result.source = CONST.CONCIERGE_ICON_URL;
+        result.name = CONST.EMAIL.CONCIERGE;
         return [result];
     }
     if (isThread(report)) {
@@ -813,34 +822,27 @@ function getIcons(report, personalDetails, defaultIcon = null, isPayer = false)
     }
     if (isPolicyExpenseChat(report) || isExpenseReport(report)) {
         const workspaceIcon = getWorkspaceIcon(report);
-        const adminIcon = {
+        const memberIcon = {
             source: UserUtils.getAvatar(lodashGet(personalDetails, [report.ownerEmail, 'avatar']), report.ownerEmail),
             name: report.ownerEmail,
             type: CONST.ICON_TYPE_AVATAR,
         };
-
-        // Return the workspace avatar if the user is the owner of the policy expense chat
-        if (report.isOwnPolicyExpenseChat && !isExpenseReport(report)) {
-            return [workspaceIcon, adminIcon];
-        }
-
-        // if (isExpenseReport(report)) {
-        //     return [adminIcon, workspaceIcon]
-        // }
-
-        // If the user is an admin, return avatar source of the other participant of the report
-        // (their workspace chat) and the avatar source of the workspace
-        return [adminIcon, workspaceIcon];
+        return isExpenseReport(report) ? [memberIcon, workspaceIcon] : [workspaceIcon, memberIcon];
     }
     if (isIOUReport(report)) {
-        const email = isPayer ? report.managerEmail : report.ownerEmail;
-        return [
-            {
-                source: UserUtils.getAvatar(lodashGet(personalDetails, [email, 'avatar']), email),
-                name: email,
-                type: CONST.ICON_TYPE_AVATAR,
-            },
-        ];
+        const managerIcon = {
+            source: UserUtils.getAvatar(lodashGet(personalDetails, [report.managerEmail, 'avatar']), report.managerEmail),
+            name: report.managerEmail,
+            type: CONST.ICON_TYPE_AVATAR,
+        };
+
+        const ownerIcon = {
+            source: UserUtils.getAvatar(lodashGet(personalDetails, [report.ownerEmail, 'avatar']), report.ownerEmail),
+            name: report.ownerEmail,
+            type: CONST.ICON_TYPE_AVATAR,
+        };
+
+        return isPayer ? [managerIcon, ownerIcon] : [ownerIcon, managerIcon];
     }
 
     return getIconsForParticipants(report.participants, personalDetails);
@@ -2135,7 +2137,7 @@ function getWhisperDisplayNames(participants) {
 }
 
 /**
- * Show subscript on IOU or expense report
+ * Show subscript on workspace chats and workspace threads and expense requests
  * @param {Object} report
  * @returns {Boolean}
  */
@@ -2152,7 +2154,7 @@ function shouldReportShowSubscript(report) {
         return true;
     }
 
-    return isExpenseReport(report);
+    return false;
 }
 
 /**