diff --git a/source/frontend/src/components/common/form/PrimaryContactSelector/PrimaryContactSelectorView.tsx b/source/frontend/src/components/common/form/PrimaryContactSelector/PrimaryContactSelectorView.tsx
new file mode 100644
index 0000000000..6a3884afe9
--- /dev/null
+++ b/source/frontend/src/components/common/form/PrimaryContactSelector/PrimaryContactSelectorView.tsx
@@ -0,0 +1,56 @@
+import { FaExternalLinkAlt } from 'react-icons/fa';
+
+import { SectionField } from '../../Section/SectionField';
+import { StyledLink } from '../../styles';
+
+interface PrimaryContactSelectorViewProps {
+  label: string;
+  teamMemberName: string;
+  teamMemberUrl: string;
+  primaryContactName: string;
+  primaryContactUrl: string;
+  showPrimaryContact: boolean;
+  index?: number;
+  tooltip?: string;
+}
+
+export const PrimaryContactSelectorView = ({
+  label,
+  teamMemberName,
+  teamMemberUrl,
+  primaryContactName,
+  primaryContactUrl,
+  showPrimaryContact = false,
+  index = 0,
+  tooltip,
+}: PrimaryContactSelectorViewProps) => (
+  <>
+    <SectionField label={label} valueTestId={`teamMember[${index}]`} tooltip={tooltip}>
+      {teamMemberName && teamMemberUrl ? (
+        <StyledLink target="_blank" rel="noopener noreferrer" to={teamMemberUrl}>
+          <span>{teamMemberName}</span>
+          <FaExternalLinkAlt className="ml-2" size="1rem" />
+        </StyledLink>
+      ) : (
+        ''
+      )}
+    </SectionField>
+
+    {showPrimaryContact && (
+      <SectionField
+        label="Primary contact"
+        valueTestId={`primaryContact[${index}]`}
+        className="pl-4 mb-3"
+      >
+        {primaryContactName && primaryContactUrl ? (
+          <StyledLink target="_blank" rel="noopener noreferrer" to={primaryContactUrl}>
+            <span>{primaryContactName}</span>
+            <FaExternalLinkAlt className="ml-2" size="1rem" />
+          </StyledLink>
+        ) : (
+          'No contacts available'
+        )}
+      </SectionField>
+    )}
+  </>
+);
diff --git a/source/frontend/src/features/leases/detail/LeasePages/details/LeaseTeamView.tsx b/source/frontend/src/features/leases/detail/LeasePages/details/LeaseTeamView.tsx
index 50bfe92506..40844d77b9 100644
--- a/source/frontend/src/features/leases/detail/LeasePages/details/LeaseTeamView.tsx
+++ b/source/frontend/src/features/leases/detail/LeasePages/details/LeaseTeamView.tsx
@@ -1,11 +1,8 @@
 import React from 'react';
-import { FaExternalLinkAlt } from 'react-icons/fa';
 
+import { PrimaryContactSelectorView } from '@/components/common/form/PrimaryContactSelector/PrimaryContactSelectorView';
 import { Section } from '@/components/common/Section/Section';
-import { SectionField } from '@/components/common/Section/SectionField';
-import { StyledLink } from '@/components/common/styles';
 import { ApiGen_Concepts_Lease } from '@/models/api/generated/ApiGen_Concepts_Lease';
-import { exists } from '@/utils';
 import { formatApiPersonNames } from '@/utils/personUtils';
 
 export interface ILeaseTeamProps {
@@ -18,47 +15,26 @@ export const LeaseTeamView: React.FunctionComponent<React.PropsWithChildren<ILea
     <Section header="Lease & Licence Team">
       {lease.leaseTeam.map((teamMember, index) => (
         <React.Fragment key={`lease-team-${teamMember?.id ?? index}`}>
-          <SectionField
+          <PrimaryContactSelectorView
             label={teamMember?.teamProfileType.description || ''}
-            valueTestId={`teamMember[${index}]`}
-          >
-            <StyledLink
-              target="_blank"
-              rel="noopener noreferrer"
-              to={
-                teamMember?.personId
-                  ? `/contact/P${teamMember?.personId}`
-                  : `/contact/O${teamMember?.organizationId}`
-              }
-            >
-              <span>
-                {teamMember?.person
-                  ? formatApiPersonNames(teamMember?.person)
-                  : teamMember?.organization?.name ?? ''}
-              </span>
-              <FaExternalLinkAlt className="ml-2" size="1rem" />
-            </StyledLink>
-          </SectionField>
-          {exists(teamMember?.organizationId) && (
-            <SectionField label="Primary contact" valueTestId={`primaryContact[${index}]`}>
-              {teamMember?.primaryContactId ? (
-                <StyledLink
-                  target="_blank"
-                  rel="noopener noreferrer"
-                  to={`/contact/P${teamMember?.primaryContactId}`}
-                >
-                  <span>
-                    {teamMember?.primaryContact
-                      ? formatApiPersonNames(teamMember.primaryContact)
-                      : ''}
-                  </span>
-                  <FaExternalLinkAlt className="m1-2" size="1rem" />
-                </StyledLink>
-              ) : (
-                'No contacts available'
-              )}
-            </SectionField>
-          )}
+            teamMemberName={
+              teamMember?.person
+                ? formatApiPersonNames(teamMember.person)
+                : teamMember?.organization?.name ?? ''
+            }
+            teamMemberUrl={
+              teamMember?.personId
+                ? `/contact/P${teamMember?.personId}`
+                : `/contact/O${teamMember?.organizationId}`
+            }
+            primaryContactName={
+              teamMember?.primaryContact ? formatApiPersonNames(teamMember.primaryContact) : ''
+            }
+            primaryContactUrl={
+              teamMember?.primaryContactId ? `/contact/P${teamMember?.primaryContactId}` : undefined
+            }
+            showPrimaryContact={!!teamMember?.organizationId}
+          />
         </React.Fragment>
       ))}
     </Section>
diff --git a/source/frontend/src/features/mapSideBar/acquisition/__snapshots__/AcquisitionView.test.tsx.snap b/source/frontend/src/features/mapSideBar/acquisition/__snapshots__/AcquisitionView.test.tsx.snap
index f849b98154..8b2be1acab 100644
--- a/source/frontend/src/features/mapSideBar/acquisition/__snapshots__/AcquisitionView.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/acquisition/__snapshots__/AcquisitionView.test.tsx.snap
@@ -338,6 +338,11 @@ exports[`AcquisitionView component > renders as expected 1`] = `
   cursor: pointer;
 }
 
+.c42 {
+  padding: 0 0.4rem;
+  display: block;
+}
+
 .c5.btn.btn-light.Button {
   padding: 0;
   border: 0.1rem solid #9F9D9C;
@@ -672,7 +677,7 @@ exports[`AcquisitionView component > renders as expected 1`] = `
   white-space: pre-line;
 }
 
-.c42 {
+.c45 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -1879,6 +1884,7 @@ exports[`AcquisitionView component > renders as expected 1`] = `
                             </div>
                             <div
                               class="c41 text-left col"
+                              data-testid="teamMember[0]"
                             >
                               <a
                                 class="c42"
@@ -1920,6 +1926,7 @@ exports[`AcquisitionView component > renders as expected 1`] = `
                             </div>
                             <div
                               class="c41 text-left col"
+                              data-testid="teamMember[0]"
                             >
                               <a
                                 class="c42"
@@ -2295,6 +2302,7 @@ Canada
                             </div>
                             <div
                               class="c41 text-left col"
+                              data-testid="teamMember[0]"
                             >
                               <a
                                 class="c42"
@@ -2323,7 +2331,7 @@ Canada
                             </div>
                           </div>
                           <div
-                            class="pb-2 row"
+                            class="pl-4 mb-3 row"
                           >
                             <div
                               class="pr-0 text-left col-4"
@@ -2336,29 +2344,9 @@ Canada
                             </div>
                             <div
                               class="c41 text-left col"
+                              data-testid="primaryContact[0]"
                             >
-                              <a
-                                class="c42"
-                                href="/contact/P1"
-                                rel="noopener noreferrer"
-                                target="_blank"
-                              >
-                                <span />
-                                <svg
-                                  class="m1-2"
-                                  fill="currentColor"
-                                  height="1rem"
-                                  stroke="currentColor"
-                                  stroke-width="0"
-                                  viewBox="0 0 512 512"
-                                  width="1rem"
-                                  xmlns="http://www.w3.org/2000/svg"
-                                >
-                                  <path
-                                    d="M432,320H400a16,16,0,0,0-16,16V448H64V128H208a16,16,0,0,0,16-16V80a16,16,0,0,0-16-16H48A48,48,0,0,0,0,112V464a48,48,0,0,0,48,48H400a48,48,0,0,0,48-48V336A16,16,0,0,0,432,320ZM488,0h-128c-21.37,0-32.05,25.91-17,41l35.73,35.73L135,320.37a24,24,0,0,0,0,34L157.67,377a24,24,0,0,0,34,0L435.28,133.32,471,169c15,15,41,4.5,41-17V24A24,24,0,0,0,488,0Z"
-                                  />
-                                </svg>
-                              </a>
+                              No contacts available
                             </div>
                           </div>
                           <div
@@ -2377,7 +2365,7 @@ Canada
                               class="c41 text-left col"
                             >
                               <a
-                                class="c42"
+                                class="c45"
                                 href="/contact/P2"
                                 rel="noopener noreferrer"
                                 target="_blank"
diff --git a/source/frontend/src/features/mapSideBar/acquisition/tabs/__snapshots__/AcquisitionFileTabs.test.tsx.snap b/source/frontend/src/features/mapSideBar/acquisition/tabs/__snapshots__/AcquisitionFileTabs.test.tsx.snap
index 49b18de99e..4a5f69190a 100644
--- a/source/frontend/src/features/mapSideBar/acquisition/tabs/__snapshots__/AcquisitionFileTabs.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/acquisition/tabs/__snapshots__/AcquisitionFileTabs.test.tsx.snap
@@ -89,6 +89,11 @@ exports[`AcquisitionFileTabs component > matches snapshot 1`] = `
   text-decoration: none;
 }
 
+.c8 {
+  padding: 0 0.4rem;
+  display: block;
+}
+
 .c7.required::before {
   content: '*';
   position: absolute;
@@ -100,7 +105,7 @@ exports[`AcquisitionFileTabs component > matches snapshot 1`] = `
   font-weight: bold;
 }
 
-.c8 {
+.c10 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -782,6 +787,7 @@ exports[`AcquisitionFileTabs component > matches snapshot 1`] = `
                 </div>
                 <div
                   class="c7 text-left col"
+                  data-testid="teamMember[0]"
                 >
                   <a
                     class="c8"
@@ -823,6 +829,7 @@ exports[`AcquisitionFileTabs component > matches snapshot 1`] = `
                 </div>
                 <div
                   class="c7 text-left col"
+                  data-testid="teamMember[0]"
                 >
                   <a
                     class="c8"
@@ -890,6 +897,7 @@ exports[`AcquisitionFileTabs component > matches snapshot 1`] = `
                 </div>
                 <div
                   class="c7 text-left col"
+                  data-testid="teamMember[0]"
                 >
                   <a
                     class="c8"
@@ -918,7 +926,7 @@ exports[`AcquisitionFileTabs component > matches snapshot 1`] = `
                 </div>
               </div>
               <div
-                class="pb-2 row"
+                class="pl-4 mb-3 row"
               >
                 <div
                   class="pr-0 text-left col-4"
@@ -931,29 +939,9 @@ exports[`AcquisitionFileTabs component > matches snapshot 1`] = `
                 </div>
                 <div
                   class="c7 text-left col"
+                  data-testid="primaryContact[0]"
                 >
-                  <a
-                    class="c8"
-                    href="/contact/P1"
-                    rel="noopener noreferrer"
-                    target="_blank"
-                  >
-                    <span />
-                    <svg
-                      class="m1-2"
-                      fill="currentColor"
-                      height="1rem"
-                      stroke="currentColor"
-                      stroke-width="0"
-                      viewBox="0 0 512 512"
-                      width="1rem"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        d="M432,320H400a16,16,0,0,0-16,16V448H64V128H208a16,16,0,0,0,16-16V80a16,16,0,0,0-16-16H48A48,48,0,0,0,0,112V464a48,48,0,0,0,48,48H400a48,48,0,0,0,48-48V336A16,16,0,0,0,432,320ZM488,0h-128c-21.37,0-32.05,25.91-17,41l35.73,35.73L135,320.37a24,24,0,0,0,0,34L157.67,377a24,24,0,0,0,34,0L435.28,133.32,471,169c15,15,41,4.5,41-17V24A24,24,0,0,0,488,0Z"
-                      />
-                    </svg>
-                  </a>
+                  No contacts available
                 </div>
               </div>
               <div
@@ -972,7 +960,7 @@ exports[`AcquisitionFileTabs component > matches snapshot 1`] = `
                   class="c7 text-left col"
                 >
                   <a
-                    class="c8"
+                    class="c10"
                     href="/contact/P2"
                     rel="noopener noreferrer"
                     target="_blank"
diff --git a/source/frontend/src/features/mapSideBar/acquisition/tabs/fileDetails/detail/AcquisitionSummaryView.tsx b/source/frontend/src/features/mapSideBar/acquisition/tabs/fileDetails/detail/AcquisitionSummaryView.tsx
index 3139b5a988..9fc380538a 100644
--- a/source/frontend/src/features/mapSideBar/acquisition/tabs/fileDetails/detail/AcquisitionSummaryView.tsx
+++ b/source/frontend/src/features/mapSideBar/acquisition/tabs/fileDetails/detail/AcquisitionSummaryView.tsx
@@ -7,6 +7,7 @@ import styled from 'styled-components';
 
 import EditButton from '@/components/common/buttons/EditButton';
 import { readOnlyMultiSelectStyle } from '@/components/common/form';
+import { PrimaryContactSelectorView } from '@/components/common/form/PrimaryContactSelector/PrimaryContactSelectorView';
 import { Section } from '@/components/common/Section/Section';
 import { SectionField } from '@/components/common/Section/SectionField';
 import { StyledEditWrapper, StyledSummarySection } from '@/components/common/Section/SectionStyles';
@@ -212,36 +213,18 @@ const AcquisitionSummaryView: React.FC<IAcquisitionSummaryViewProps> = ({
       <Section header="Acquisition Team">
         {detail.acquisitionTeam.map((teamMember, index) => (
           <React.Fragment key={`acq-team-${index}`}>
-            <SectionField label={teamMember?.teamProfileTypeCodeDescription || ''}>
-              <StyledLink
-                target="_blank"
-                rel="noopener noreferrer"
-                to={
-                  teamMember?.personId
-                    ? `/contact/P${teamMember?.personId}`
-                    : `/contact/O${teamMember?.organizationId}`
-                }
-              >
-                <span>{teamMember?.teamName}</span>
-                <FaExternalLinkAlt className="ml-2" size="1rem" />
-              </StyledLink>
-            </SectionField>
-            {teamMember?.organizationId && (
-              <SectionField label="Primary contact">
-                {teamMember?.primaryContactId ? (
-                  <StyledLink
-                    target="_blank"
-                    rel="noopener noreferrer"
-                    to={`/contact/P${teamMember?.primaryContactId}`}
-                  >
-                    <span>{teamMember?.primaryContactName}</span>
-                    <FaExternalLinkAlt className="m1-2" size="1rem" />
-                  </StyledLink>
-                ) : (
-                  'No contacts available'
-                )}
-              </SectionField>
-            )}
+            <PrimaryContactSelectorView
+              label={teamMember?.teamProfileTypeCodeDescription || ''}
+              teamMemberName={teamMember?.teamName}
+              teamMemberUrl={
+                teamMember?.personId
+                  ? `/contact/P${teamMember?.personId}`
+                  : `/contact/O${teamMember?.organizationId}`
+              }
+              primaryContactName={teamMember?.primaryContactName}
+              primaryContactUrl={`/contact/P${teamMember?.primaryContactId}`}
+              showPrimaryContact={!!teamMember?.organizationId}
+            ></PrimaryContactSelectorView>
           </React.Fragment>
         ))}
       </Section>
@@ -264,41 +247,22 @@ const AcquisitionSummaryView: React.FC<IAcquisitionSummaryViewProps> = ({
         {!!ownerSolicitors?.length &&
           ownerSolicitors.map(ownerSolicitor => (
             <React.Fragment key={`owner-solicitor-${ownerSolicitor.interestHolderId}`}>
-              <SectionField label={detail.isSubFile ? 'Sub-interest solicitor' : 'Owner solicitor'}>
-                <StyledLink
-                  target="_blank"
-                  rel="noopener noreferrer"
-                  to={
-                    ownerSolicitor?.personId
-                      ? `/contact/P${ownerSolicitor?.personId}`
-                      : `/contact/O${ownerSolicitor?.organizationId}`
-                  }
-                >
-                  <span>
-                    {ownerSolicitor?.personId
-                      ? formatApiPersonNames(ownerSolicitor?.person)
-                      : ownerSolicitor?.organization?.name ?? ''}
-                  </span>
-                  <FaExternalLinkAlt className="ml-2" size="1rem" />
-                </StyledLink>
-              </SectionField>
-
-              {ownerSolicitor?.organization && (
-                <SectionField label="Primary contact">
-                  {ownerSolicitor?.primaryContactId ? (
-                    <StyledLink
-                      target="_blank"
-                      rel="noopener noreferrer"
-                      to={`/contact/P${ownerSolicitor?.primaryContactId}`}
-                    >
-                      <span>{formatApiPersonNames(ownerSolicitor.primaryContact)}</span>
-                      <FaExternalLinkAlt className="m1-2" size="1rem" />
-                    </StyledLink>
-                  ) : (
-                    'No contacts available'
-                  )}
-                </SectionField>
-              )}
+              <PrimaryContactSelectorView
+                label={detail.isSubFile ? 'Sub-interest solicitor' : 'Owner solicitor'}
+                teamMemberName={
+                  ownerSolicitor?.personId
+                    ? formatApiPersonNames(ownerSolicitor?.person)
+                    : ownerSolicitor?.organization?.name ?? ''
+                }
+                teamMemberUrl={
+                  ownerSolicitor?.personId
+                    ? `/contact/P${ownerSolicitor?.personId}`
+                    : `/contact/O${ownerSolicitor?.organizationId}`
+                }
+                primaryContactName={formatApiPersonNames(ownerSolicitor.primaryContact)}
+                primaryContactUrl={`/contact/P${ownerSolicitor?.primaryContactId}`}
+                showPrimaryContact={!!ownerSolicitor?.organization}
+              ></PrimaryContactSelectorView>
             </React.Fragment>
           ))}
         {!!ownerRepresentatives?.length &&
diff --git a/source/frontend/src/features/mapSideBar/acquisition/tabs/fileDetails/detail/__snapshots__/AcquisitionSummaryView.test.tsx.snap b/source/frontend/src/features/mapSideBar/acquisition/tabs/fileDetails/detail/__snapshots__/AcquisitionSummaryView.test.tsx.snap
index 77c1157a9a..74985f84bd 100644
--- a/source/frontend/src/features/mapSideBar/acquisition/tabs/fileDetails/detail/__snapshots__/AcquisitionSummaryView.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/acquisition/tabs/fileDetails/detail/__snapshots__/AcquisitionSummaryView.test.tsx.snap
@@ -13,6 +13,22 @@ exports[`AcquisitionSummaryView component > matches snapshot 1`] = `
   text-decoration: none;
 }
 
+.c6 {
+  padding: 0 0.4rem;
+  display: block;
+}
+
+.c5.required::before {
+  content: '*';
+  position: absolute;
+  top: 0.75rem;
+  left: 0rem;
+}
+
+.c4 {
+  font-weight: bold;
+}
+
 .c0 {
   background-color: #f2f2f2;
   padding-top: 1rem;
@@ -38,22 +54,11 @@ exports[`AcquisitionSummaryView component > matches snapshot 1`] = `
   margin-bottom: 2.4rem;
 }
 
-.c5.required::before {
-  content: '*';
-  position: absolute;
-  top: 0.75rem;
-  left: 0rem;
-}
-
-.c4 {
-  font-weight: bold;
-}
-
 .c8 {
   white-space: pre-line;
 }
 
-.c6 {
+.c9 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -665,6 +670,7 @@ exports[`AcquisitionSummaryView component > matches snapshot 1`] = `
           </div>
           <div
             class="c5 text-left col"
+            data-testid="teamMember[0]"
           >
             <a
               class="c6"
@@ -706,6 +712,7 @@ exports[`AcquisitionSummaryView component > matches snapshot 1`] = `
           </div>
           <div
             class="c5 text-left col"
+            data-testid="teamMember[0]"
           >
             <a
               class="c6"
@@ -1081,6 +1088,7 @@ Canada
           </div>
           <div
             class="c5 text-left col"
+            data-testid="teamMember[0]"
           >
             <a
               class="c6"
@@ -1109,7 +1117,7 @@ Canada
           </div>
         </div>
         <div
-          class="pb-2 row"
+          class="pl-4 mb-3 row"
         >
           <div
             class="pr-0 text-left col-4"
@@ -1122,6 +1130,7 @@ Canada
           </div>
           <div
             class="c5 text-left col"
+            data-testid="primaryContact[0]"
           >
             <a
               class="c6"
@@ -1133,7 +1142,7 @@ Canada
                 Foo Bar Baz
               </span>
               <svg
-                class="m1-2"
+                class="ml-2"
                 fill="currentColor"
                 height="1rem"
                 stroke="currentColor"
@@ -1165,7 +1174,7 @@ Canada
             class="c5 text-left col"
           >
             <a
-              class="c6"
+              class="c9"
               href="/contact/P2"
               rel="noopener noreferrer"
               target="_blank"
diff --git a/source/frontend/src/features/mapSideBar/disposition/__snapshots__/DispositionView.test.tsx.snap b/source/frontend/src/features/mapSideBar/disposition/__snapshots__/DispositionView.test.tsx.snap
index 45af1fa6f4..538728a4bc 100644
--- a/source/frontend/src/features/mapSideBar/disposition/__snapshots__/DispositionView.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/disposition/__snapshots__/DispositionView.test.tsx.snap
@@ -1639,7 +1639,7 @@ exports[`DispositionView component > renders as expected 1`] = `
                             class="pb-2 row"
                           >
                             <div
-                              class="pr-0 text-left col-5"
+                              class="pr-0 text-left col-4"
                             >
                               <label
                                 class="c39"
@@ -1649,6 +1649,7 @@ exports[`DispositionView component > renders as expected 1`] = `
                             </div>
                             <div
                               class="c40 text-left col"
+                              data-testid="teamMember[0]"
                             >
                               <a
                                 class="c42"
@@ -1680,7 +1681,7 @@ exports[`DispositionView component > renders as expected 1`] = `
                             class="pb-2 row"
                           >
                             <div
-                              class="pr-0 text-left col-5"
+                              class="pr-0 text-left col-4"
                             >
                               <label
                                 class="c39"
@@ -1690,6 +1691,7 @@ exports[`DispositionView component > renders as expected 1`] = `
                             </div>
                             <div
                               class="c40 text-left col"
+                              data-testid="teamMember[0]"
                             >
                               <a
                                 class="c42"
diff --git a/source/frontend/src/features/mapSideBar/disposition/tabs/__snapshots__/DispositionFileTabs.test.tsx.snap b/source/frontend/src/features/mapSideBar/disposition/tabs/__snapshots__/DispositionFileTabs.test.tsx.snap
index 0d2900acb8..bf04b9adf2 100644
--- a/source/frontend/src/features/mapSideBar/disposition/tabs/__snapshots__/DispositionFileTabs.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/disposition/tabs/__snapshots__/DispositionFileTabs.test.tsx.snap
@@ -602,7 +602,7 @@ exports[`DispositionFileTabs component > matches snapshot 1`] = `
                 class="pb-2 row"
               >
                 <div
-                  class="pr-0 text-left col-5"
+                  class="pr-0 text-left col-4"
                 >
                   <label
                     class="c5"
@@ -612,6 +612,7 @@ exports[`DispositionFileTabs component > matches snapshot 1`] = `
                 </div>
                 <div
                   class="c6 text-left col"
+                  data-testid="teamMember[0]"
                 >
                   <a
                     class="c8"
@@ -643,7 +644,7 @@ exports[`DispositionFileTabs component > matches snapshot 1`] = `
                 class="pb-2 row"
               >
                 <div
-                  class="pr-0 text-left col-5"
+                  class="pr-0 text-left col-4"
                 >
                   <label
                     class="c5"
@@ -653,6 +654,7 @@ exports[`DispositionFileTabs component > matches snapshot 1`] = `
                 </div>
                 <div
                   class="c6 text-left col"
+                  data-testid="teamMember[0]"
                 >
                   <a
                     class="c8"
diff --git a/source/frontend/src/features/mapSideBar/disposition/tabs/fileDetails/detail/DispositionSummaryView.tsx b/source/frontend/src/features/mapSideBar/disposition/tabs/fileDetails/detail/DispositionSummaryView.tsx
index ebb19654aa..28fa98aedc 100644
--- a/source/frontend/src/features/mapSideBar/disposition/tabs/fileDetails/detail/DispositionSummaryView.tsx
+++ b/source/frontend/src/features/mapSideBar/disposition/tabs/fileDetails/detail/DispositionSummaryView.tsx
@@ -1,11 +1,10 @@
 import { Fragment } from 'react';
-import { FaExternalLinkAlt } from 'react-icons/fa';
 
 import EditButton from '@/components/common/buttons/EditButton';
+import { PrimaryContactSelectorView } from '@/components/common/form/PrimaryContactSelector/PrimaryContactSelectorView';
 import { Section } from '@/components/common/Section/Section';
 import { SectionField } from '@/components/common/Section/SectionField';
 import { StyledEditWrapper, StyledSummarySection } from '@/components/common/Section/SectionStyles';
-import { StyledLink } from '@/components/common/styles';
 import TooltipIcon from '@/components/common/TooltipIcon';
 import { Claims, Roles } from '@/constants';
 import { cannotEditMessage } from '@/features/mapSideBar/acquisition/common/constants';
@@ -137,43 +136,22 @@ export const DispositionSummaryView: React.FunctionComponent<IDispositionSummary
       <Section header="Disposition Team">
         {dispositionFile?.dispositionTeam?.map((teamMember, index) => (
           <Fragment key={`disp-team-${index}`}>
-            <SectionField
+            <PrimaryContactSelectorView
               label={teamMember?.teamProfileType?.description || ''}
-              labelWidth={{ xs: '5' }}
-            >
-              <StyledLink
-                target="_blank"
-                rel="noopener noreferrer"
-                to={
-                  teamMember?.personId
-                    ? `/contact/P${teamMember?.personId}`
-                    : `/contact/O${teamMember?.organizationId}`
-                }
-              >
-                <span>
-                  {teamMember?.personId
-                    ? formatApiPersonNames(teamMember?.person)
-                    : teamMember?.organization?.name ?? ''}
-                </span>
-                <FaExternalLinkAlt className="ml-2" size="1rem" />
-              </StyledLink>
-            </SectionField>
-            {teamMember?.organizationId && (
-              <SectionField label="Primary contact" labelWidth={{ xs: '5' }}>
-                {teamMember?.primaryContactId ? (
-                  <StyledLink
-                    target="_blank"
-                    rel="noopener noreferrer"
-                    to={`/contact/P${teamMember?.primaryContactId}`}
-                  >
-                    <span>{formatApiPersonNames(teamMember?.primaryContact)}</span>
-                    <FaExternalLinkAlt className="m1-2" size="1rem" />
-                  </StyledLink>
-                ) : (
-                  'No contacts available'
-                )}
-              </SectionField>
-            )}
+              teamMemberName={
+                teamMember?.personId
+                  ? formatApiPersonNames(teamMember?.person)
+                  : teamMember?.organization?.name ?? ''
+              }
+              teamMemberUrl={
+                teamMember?.personId
+                  ? `/contact/P${teamMember?.personId}`
+                  : `/contact/O${teamMember?.organizationId}`
+              }
+              primaryContactName={formatApiPersonNames(teamMember?.primaryContact)}
+              primaryContactUrl={`/contact/P${teamMember?.primaryContactId}`}
+              showPrimaryContact={!!teamMember?.organizationId}
+            ></PrimaryContactSelectorView>
           </Fragment>
         ))}
       </Section>
diff --git a/source/frontend/src/features/mapSideBar/disposition/tabs/fileDetails/detail/__snapshots__/DispositionSummaryView.test.tsx.snap b/source/frontend/src/features/mapSideBar/disposition/tabs/fileDetails/detail/__snapshots__/DispositionSummaryView.test.tsx.snap
index 98aeaab2b7..09b27c5921 100644
--- a/source/frontend/src/features/mapSideBar/disposition/tabs/fileDetails/detail/__snapshots__/DispositionSummaryView.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/disposition/tabs/fileDetails/detail/__snapshots__/DispositionSummaryView.test.tsx.snap
@@ -6,7 +6,23 @@ exports[`DispositionSummaryView component > matches snapshot 1`] = `
     class="Toastify"
   />
   <div />
-  .c0 {
+  .c4.required::before {
+  content: '*';
+  position: absolute;
+  top: 0.75rem;
+  left: 0rem;
+}
+
+.c3 {
+  font-weight: bold;
+}
+
+.c6 {
+  padding: 0 0.4rem;
+  display: block;
+}
+
+.c0 {
   background-color: #f2f2f2;
   padding-top: 1rem;
 }
@@ -31,22 +47,6 @@ exports[`DispositionSummaryView component > matches snapshot 1`] = `
   margin-bottom: 2.4rem;
 }
 
-.c4.required::before {
-  content: '*';
-  position: absolute;
-  top: 0.75rem;
-  left: 0rem;
-}
-
-.c3 {
-  font-weight: bold;
-}
-
-.c6 {
-  padding: 0 0.4rem;
-  display: block;
-}
-
 <div
     class="c0"
   >
@@ -481,7 +481,7 @@ exports[`DispositionSummaryView component > matches snapshot 1`] = `
           class="pb-2 row"
         >
           <div
-            class="pr-0 text-left col-5"
+            class="pr-0 text-left col-4"
           >
             <label
               class="c3"
@@ -491,6 +491,7 @@ exports[`DispositionSummaryView component > matches snapshot 1`] = `
           </div>
           <div
             class="c4 text-left col"
+            data-testid="teamMember[0]"
           >
             <a
               class="c6"
@@ -522,7 +523,7 @@ exports[`DispositionSummaryView component > matches snapshot 1`] = `
           class="pb-2 row"
         >
           <div
-            class="pr-0 text-left col-5"
+            class="pr-0 text-left col-4"
           >
             <label
               class="c3"
@@ -532,6 +533,7 @@ exports[`DispositionSummaryView component > matches snapshot 1`] = `
           </div>
           <div
             class="c4 text-left col"
+            data-testid="teamMember[0]"
           >
             <a
               class="c6"
diff --git a/source/frontend/src/features/mapSideBar/property/tabs/propertyDetailsManagement/activity/detail/ActivityDetailSubView.tsx b/source/frontend/src/features/mapSideBar/property/tabs/propertyDetailsManagement/activity/detail/ActivityDetailSubView.tsx
index 083fe75c69..5370d243c1 100644
--- a/source/frontend/src/features/mapSideBar/property/tabs/propertyDetailsManagement/activity/detail/ActivityDetailSubView.tsx
+++ b/source/frontend/src/features/mapSideBar/property/tabs/propertyDetailsManagement/activity/detail/ActivityDetailSubView.tsx
@@ -1,12 +1,11 @@
 import Multiselect from 'multiselect-react-dropdown';
 import * as React from 'react';
-import { FaExternalLinkAlt } from 'react-icons/fa';
 
 import ContactLink from '@/components/common/ContactLink';
 import { readOnlyMultiSelectStyle } from '@/components/common/form';
+import { PrimaryContactSelectorView } from '@/components/common/form/PrimaryContactSelector/PrimaryContactSelectorView';
 import { Section } from '@/components/common/Section/Section';
 import { SectionField } from '@/components/common/Section/SectionField';
-import { StyledLink } from '@/components/common/styles';
 import { ApiGen_Base_CodeType } from '@/models/api/generated/ApiGen_Base_CodeType';
 import { ApiGen_Concepts_ManagementActivity } from '@/models/api/generated/ApiGen_Concepts_ManagementActivity';
 import { exists, prettyFormatDate } from '@/utils';
@@ -23,6 +22,24 @@ const PropertyActivityDetailsSubView: React.FunctionComponent<
     props.activity?.activitySubTypeCodes.map(x => x.managementActivitySubtypeCode).filter(exists) ??
     [];
 
+  const getRequestorName = () => {
+    if (props.activity?.requestorPerson) {
+      return formatApiPersonNames(props.activity.requestorPerson);
+    } else if (props.activity?.requestorOrganization) {
+      return props.activity.requestorOrganization?.name;
+    }
+    return null;
+  };
+
+  const getRequestorContactLink = () => {
+    if (props.activity?.requestorPerson) {
+      return `/contact/P${props.activity.requestorPerson?.id}`;
+    } else if (props.activity?.requestorOrganization) {
+      return `/contact/O${props.activity.requestorOrganization?.id}`;
+    }
+    return null;
+  };
+
   return (
     <Section header="Activity Details">
       <SectionField label="Activity type" contentWidth={{ xs: 7 }}>
@@ -58,52 +75,64 @@ const PropertyActivityDetailsSubView: React.FunctionComponent<
           <>{contact.person !== null && <ContactLink person={contact.person} />}</>
         ))}
       </SectionField>
-      <SectionField
-        label="Requestor"
-        contentWidth={{ xs: 7 }}
-        tooltip="Document the source of the request by entering the name of the person, organization or other entity from which the request has been received"
-      >
-        <>
-          {exists(props.activity.requestorPerson) && (
-            <ContactLink person={props.activity.requestorPerson} />
-          )}
-          {exists(props.activity.requestorOrganization) && (
-            <ContactLink organization={props.activity.requestorOrganization} />
-          )}
-        </>
-      </SectionField>
-      {exists(props.activity.requestorPrimaryContactId) && (
-        <SectionField
-          label="Primary contact"
-          valueTestId="requestorPrimaryContact"
-          contentWidth={{ xs: 7 }}
+      {/* <SectionField
+      label="Requestor"
+      contentWidth={{ xs: 7 }}
+      tooltip="Document the source of the request by entering the name of the person, organization or other entity from which the request has been received"
+    > */}
+      {/* <>
+      {exists(props.activity.requestorPerson) && (
+        <ContactLink person={props.activity.requestorPerson} />
+      )}
+      {exists(props.activity.requestorOrganization) && (
+        <ContactLink organization={props.activity.requestorOrganization} />
+      )}
+    </>
+  </SectionField>
+  {exists(props.activity.requestorPrimaryContactId) && (
+    <SectionField
+      label="Primary contact"
+      valueTestId="requestorPrimaryContact"
+      contentWidth={{ xs: 7 }}
+    >
+      {props.activity?.requestorPrimaryContactId ? (
+        <StyledLink
+          target="_blank"
+          rel="noopener noreferrer"
+          to={`/contact/P${props.activity?.requestorPrimaryContactId}`}
         >
-          {props.activity?.requestorPrimaryContactId ? (
-            <StyledLink
-              target="_blank"
-              rel="noopener noreferrer"
-              to={`/contact/P${props.activity?.requestorPrimaryContactId}`}
-            >
-              <span>
-                {props.activity?.requestorPrimaryContactId
-                  ? formatApiPersonNames(props.activity?.requestorPrimaryContact)
-                  : ''}
-              </span>
-              <FaExternalLinkAlt className="ml-2" size="1rem" />
-            </StyledLink>
-          ) : (
-            'No contacts available'
-          )}
-        </SectionField>
+          <span>
+            {props.activity?.requestorPrimaryContactId
+              ? formatApiPersonNames(props.activity?.requestorPrimaryContact)
+              : ''}
+          </span>
+          <FaExternalLinkAlt className="ml-2" size="1rem" />
+        </StyledLink>
+      ) : (
+        'No contacts available'
       )}
-      <SectionField label="External contacts" contentWidth={{ xs: 8 }}>
-        {props.activity.involvedParties?.map(contact => (
-          <>
-            {contact.person !== null && <ContactLink person={contact.person} />}
-            {contact.organization !== null && <ContactLink organization={contact.organization} />}
-          </>
-        ))}
-      </SectionField>
+    </SectionField>
+  )}
+  <SectionField label="External contacts" contentWidth={{ xs: 8 }}>
+    {props.activity.involvedParties?.map(contact => (
+      <>
+        {contact.person !== null && <ContactLink person={contact.person} />}
+        {contact.organization !== null && <ContactLink organization={contact.organization} />}
+      </>
+    ))} */}
+      <PrimaryContactSelectorView
+        label="Requestor"
+        teamMemberName={getRequestorName()}
+        teamMemberUrl={getRequestorContactLink()}
+        primaryContactName={
+          props.activity?.requestorPrimaryContactId
+            ? formatApiPersonNames(props.activity?.requestorPrimaryContact)
+            : ''
+        }
+        primaryContactUrl={`/contact/P${props.activity?.requestorPrimaryContactId}`}
+        showPrimaryContact={!!props.activity?.requestorPrimaryContactId}
+        tooltip="Document the source of the request by entering the name of the person, organization or other entity from which the request has been received"
+      ></PrimaryContactSelectorView>
       <SectionField label="Service provider" contentWidth={{ xs: 7 }}>
         <>
           {props.activity.serviceProviderPerson !== null && (