diff --git a/stylesheets/components/ContactListItem.scss b/stylesheets/components/ContactListItem.scss
index 87e1ae85005f..6f0aaf9b17b1 100644
--- a/stylesheets/components/ContactListItem.scss
+++ b/stylesheets/components/ContactListItem.scss
@@ -121,3 +121,9 @@
     }
   }
 }
+
+.ContactListItem__contact-icon {
+  width: 14px;
+  height: 14px;
+  color: currentColor;
+}
diff --git a/stylesheets/components/ContactModal.scss b/stylesheets/components/ContactModal.scss
index 9aec8074ff16..44ed2700f089 100644
--- a/stylesheets/components/ContactModal.scss
+++ b/stylesheets/components/ContactModal.scss
@@ -29,6 +29,14 @@
     white-space: nowrap;
   }
 
+  &__name__contact-icon {
+    height: 22px;
+    width: 22px;
+    @include any-theme {
+      background-color: currentColor;
+    }
+  }
+
   &__name__chevron {
     flex-shrink: 0;
 
diff --git a/stylesheets/components/ConversationDetailsHeader.scss b/stylesheets/components/ConversationDetailsHeader.scss
index 282c6ea85037..55beee476a7c 100644
--- a/stylesheets/components/ConversationDetailsHeader.scss
+++ b/stylesheets/components/ConversationDetailsHeader.scss
@@ -21,14 +21,17 @@
   &__title {
     @include font-title-1;
     font-weight: 400;
-    align-items: baseline;
-    display: flex;
-    justify-content: center;
     padding-bottom: 8px;
     padding-top: 12px;
     user-select: text;
   }
 
+  &__title-contact-icon {
+    width: 22px;
+    height: 22px;
+    background-color: currentColor;
+  }
+
   &__subtitle {
     @include font-body-1;
     color: $color-gray-60;
diff --git a/ts/components/ConversationList.stories.tsx b/ts/components/ConversationList.stories.tsx
index 2f131450bfe3..84ba517863d1 100644
--- a/ts/components/ConversationList.stories.tsx
+++ b/ts/components/ConversationList.stories.tsx
@@ -140,6 +140,20 @@ export function ContactDirect(): JSX.Element {
   );
 }
 
+export function ContactInSystemContacts(): JSX.Element {
+  const contact = defaultConversations[0];
+  return (
+    <Wrapper
+      rows={[
+        {
+          type: RowType.Contact,
+          contact: { ...contact, systemGivenName: contact.title },
+        },
+      ]}
+    />
+  );
+}
+
 export function ContactDirectWithContextMenu(): JSX.Element {
   return (
     <Wrapper
diff --git a/ts/components/Tooltip.tsx b/ts/components/Tooltip.tsx
index d07a9a3a129f..aacedb82e716 100644
--- a/ts/components/Tooltip.tsx
+++ b/ts/components/Tooltip.tsx
@@ -6,6 +6,7 @@ import classNames from 'classnames';
 import { noop } from 'lodash';
 import { Manager, Reference, Popper } from 'react-popper';
 import type { StrictModifiers } from '@popperjs/core';
+import { createPortal } from 'react-dom';
 import type { Theme } from '../util/theme';
 import { themeClassName } from '../util/theme';
 import { refMerger } from '../util/refMerger';
@@ -169,34 +170,37 @@ export function Tooltip({
           </TooltipEventWrapper>
         )}
       </Reference>
-      <Popper
-        placement={direction}
-        modifiers={[offsetDistanceModifier(12), ...popperModifiers]}
-      >
-        {({ arrowProps, placement, ref, style }) =>
-          showTooltip && (
-            <div
-              className={classNames(
-                'module-tooltip',
-                tooltipThemeClassName,
-                className
-              )}
-              ref={ref}
-              style={style}
-              data-placement={placement}
-            >
-              {content}
-              {!hideArrow ? (
-                <div
-                  className="module-tooltip-arrow"
-                  ref={arrowProps.ref}
-                  style={arrowProps.style}
-                />
-              ) : null}
-            </div>
-          )
-        }
-      </Popper>
+      {createPortal(
+        <Popper
+          placement={direction}
+          modifiers={[offsetDistanceModifier(12), ...popperModifiers]}
+        >
+          {({ arrowProps, placement, ref, style }) =>
+            showTooltip && (
+              <div
+                className={classNames(
+                  'module-tooltip',
+                  tooltipThemeClassName,
+                  className
+                )}
+                ref={ref}
+                style={style}
+                data-placement={placement}
+              >
+                {content}
+                {!hideArrow ? (
+                  <div
+                    className="module-tooltip-arrow"
+                    ref={arrowProps.ref}
+                    style={arrowProps.style}
+                  />
+                ) : null}
+              </div>
+            )
+          }
+        </Popper>,
+        document.body
+      )}
     </Manager>
   );
 }
diff --git a/ts/components/conversation/ContactModal.stories.tsx b/ts/components/conversation/ContactModal.stories.tsx
index 4350efd4a384..437c4b77e6e8 100644
--- a/ts/components/conversation/ContactModal.stories.tsx
+++ b/ts/components/conversation/ContactModal.stories.tsx
@@ -119,3 +119,11 @@ WithUnreadStories.args = {
   hasStories: HasStories.Unread,
 };
 WithUnreadStories.storyName = 'Unread Stories';
+
+export const InSystemContacts = Template.bind({});
+InSystemContacts.args = {
+  contact: {
+    ...defaultContact,
+    systemGivenName: defaultContact.title,
+  },
+};
diff --git a/ts/components/conversation/ContactModal.tsx b/ts/components/conversation/ContactModal.tsx
index 9d552cc886a2..e2943d25470d 100644
--- a/ts/components/conversation/ContactModal.tsx
+++ b/ts/components/conversation/ContactModal.tsx
@@ -23,6 +23,8 @@ import { RemoveGroupMemberConfirmationDialog } from './RemoveGroupMemberConfirma
 import { missingCaseError } from '../../util/missingCaseError';
 import { UserText } from '../UserText';
 import { Button, ButtonIconType, ButtonVariant } from '../Button';
+import { isInSystemContacts } from '../../util/isInSystemContacts';
+import { InContactsIcon } from '../InContactsIcon';
 
 export type PropsDataType = {
   areWeASubscriber: boolean;
@@ -200,7 +202,6 @@ export function ContactModal({
   switch (view) {
     case ContactModalView.Default: {
       const preferredBadge: undefined | BadgeType = badges[0];
-
       return (
         <Modal
           modalName="ContactModal"
@@ -249,6 +250,15 @@ export function ContactModal({
             >
               <div className="ContactModal__name__text">
                 <UserText text={contact.title} />
+                {isInSystemContacts(contact) && (
+                  <span>
+                    {' '}
+                    <InContactsIcon
+                      className="ContactModal__name__contact-icon"
+                      i18n={i18n}
+                    />
+                  </span>
+                )}
               </div>
               <i className="ContactModal__name__chevron" />
             </button>
diff --git a/ts/components/conversation/conversation-details/ConversationDetails.stories.tsx b/ts/components/conversation/conversation-details/ConversationDetails.stories.tsx
index d0d3f2bf4980..1968fba2669c 100644
--- a/ts/components/conversation/conversation-details/ConversationDetails.stories.tsx
+++ b/ts/components/conversation/conversation-details/ConversationDetails.stories.tsx
@@ -142,6 +142,22 @@ export function Basic(): JSX.Element {
   return <ConversationDetails {...props} />;
 }
 
+export function SystemContact(): JSX.Element {
+  const props = createProps();
+  const contact = getDefaultConversation();
+
+  return (
+    <ConversationDetails
+      {...props}
+      isGroup={false}
+      conversation={{
+        ...contact,
+        systemGivenName: contact.title,
+      }}
+    />
+  );
+}
+
 export function AsAdmin(): JSX.Element {
   const props = createProps();
 
diff --git a/ts/components/conversation/conversation-details/ConversationDetailsHeader.tsx b/ts/components/conversation/conversation-details/ConversationDetailsHeader.tsx
index 450e61dc6538..5e8c89ac3406 100644
--- a/ts/components/conversation/conversation-details/ConversationDetailsHeader.tsx
+++ b/ts/components/conversation/conversation-details/ConversationDetailsHeader.tsx
@@ -15,6 +15,8 @@ import { assertDev } from '../../../util/assert';
 import { BadgeDialog } from '../../BadgeDialog';
 import type { BadgeType } from '../../../badges/types';
 import { UserText } from '../../UserText';
+import { isInSystemContacts } from '../../../util/isInSystemContacts';
+import { InContactsIcon } from '../../InContactsIcon';
 
 export type Props = {
   areWeASubscriber: boolean;
@@ -211,7 +213,15 @@ export function ConversationDetailsHeader({
       >
         <div className="ConversationDetailsHeader__title">
           <UserText text={conversation.title} />
-
+          {isInSystemContacts(conversation) && (
+            <span>
+              {' '}
+              <InContactsIcon
+                className="ConversationDetailsHeader__title-contact-icon"
+                i18n={i18n}
+              />
+            </span>
+          )}
           <span className="ConversationDetailsHeader__about-icon" />
         </div>
       </button>
diff --git a/ts/components/conversationList/ContactListItem.tsx b/ts/components/conversationList/ContactListItem.tsx
index 9702c83c43ac..17c96d73b999 100644
--- a/ts/components/conversationList/ContactListItem.tsx
+++ b/ts/components/conversationList/ContactListItem.tsx
@@ -17,6 +17,7 @@ import { Intl } from '../Intl';
 import { ConfirmationDialog } from '../ConfirmationDialog';
 import { isSignalConversation } from '../../util/isSignalConversation';
 import { isInSystemContacts } from '../../util/isInSystemContacts';
+import { InContactsIcon } from '../InContactsIcon';
 
 export type ContactListItemConversationType = Pick<
   ConversationType,
@@ -281,7 +282,25 @@ export const ContactListItem: FunctionComponent<PropsType> = React.memo(
             />
           }
           trailing={trailing}
-          title={headerName}
+          title={
+            <>
+              {headerName}
+              {isInSystemContacts({
+                type,
+                name,
+                systemGivenName,
+                systemFamilyName,
+              }) && (
+                <span>
+                  {' '}
+                  <InContactsIcon
+                    className="ContactListItem__contact-icon"
+                    i18n={i18n}
+                  />
+                </span>
+              )}
+            </>
+          }
           subtitle={messageText}
           subtitleMaxLines={1}
           onClick={onClick ? () => onClick(id) : undefined}