diff --git a/src/components/profile/Profile.vue b/src/components/profile/Profile.vue
index 65443d286..a3532e75c 100644
--- a/src/components/profile/Profile.vue
+++ b/src/components/profile/Profile.vue
@@ -56,239 +56,168 @@
       <ViewColleagues :username="primaryUsername.value"></ViewColleagues>
     </section>
 
-    <section
-      v-if="identitiesWrapper.anyIdentity() || this.editing === 'identities'"
-      :class="
-        'profile__section' +
-          (this.editing === 'identities' ? ' profile__section--editing' : '')
-      "
-    >
-      <a id="nav-identities" class="profile__anchor"></a>
-      <EditIdentities
-        v-if="this.editing === 'identities'"
-        v-bind="{ identities: identitiesWrapper }"
-      />
-      <ViewIdentities
-        v-else
-        v-bind="{ identities: identitiesWrapper, userOnOwnProfile }"
-      />
-    </section>
-    <EmptyCard
-      v-else
-      nav="identities"
+    <ProfileSection
+      section="identities"
       title="Identities"
-      :message="
-        userOnOwnProfile
-          ? `You haven't added any identities yet.`
-          : `No identities have been added yet.`
-      "
+      :userOnOwnProfile="userOnOwnProfile"
+      :empty="!identitiesWrapper.anyIdentity()"
+      message="No identities have been added yet."
+      messageOwn="You haven't added any identities yet."
+      :editing="editing === 'identities'"
     >
-      <template v-slot:header>
-        <EditButton
-          v-if="userOnOwnProfile"
-          section="identities"
-          sectionId="identities"
-        ></EditButton>
+      <template v-slot:edit>
+        <EditIdentities v-bind="{ identities: identitiesWrapper }" />
       </template>
-    </EmptyCard>
+      <template v-slot:view>
+        <ViewIdentities
+          v-bind="{ identities: identitiesWrapper, userOnOwnProfile }"
+        />
+      </template>
+    </ProfileSection>
 
-    <section
-      :class="
-        'profile__section' +
-          (this.editing === 'contact' ? ' profile__section--editing' : '')
-      "
+    <ProfileSection
+      section="contact"
+      title="Contact"
+      :userOnOwnProfile="userOnOwnProfile"
+      :empty="!sections.contact"
+      message="No contact details have been added yet."
+      messageOwn="You haven't added any contact details yet."
+      :editing="editing === 'contact'"
     >
-      <a id="nav-contact" class="profile__anchor"></a>
-      <EditContact
-        v-if="this.editing === 'contact'"
-        v-bind="{
-          username: primaryUsername.value,
-          initialPrimaryEmail: primaryEmail,
-          initialPhoneNumbers: phoneNumbers,
-          initialValues: {
-            primaryEmail,
-            phoneNumbers,
-            uris,
-          },
-        }"
-      />
-      <ViewContact
-        v-else
-        v-bind="{ primaryEmail, phoneNumbers, userOnOwnProfile }"
-      ></ViewContact>
-    </section>
+      <template v-slot:edit>
+        <EditContact
+          v-bind="{
+            username: primaryUsername.value,
+            initialPrimaryEmail: primaryEmail,
+            initialPhoneNumbers: phoneNumbers,
+            initialValues: {
+              primaryEmail,
+              phoneNumbers,
+              uris,
+            },
+          }"
+        />
+      </template>
+      <template v-slot:view>
+        <ViewContact
+          v-bind="{ primaryEmail, phoneNumbers, userOnOwnProfile }"
+        ></ViewContact>
+      </template>
+    </ProfileSection>
 
-    <section
-      v-if="sections.accounts"
-      :class="
-        'profile__section' +
-          (this.editing === 'accounts' ? ' profile__section--editing' : '')
-      "
-    >
-      <a id="nav-accounts" class="profile__anchor"></a>
-      <EditAccounts
-        v-if="this.editing === 'accounts'"
-        v-bind="{
-          username: primaryUsername.value,
-          initialValues: { uris },
-          initialUris: uris,
-        }"
-      ></EditAccounts>
-      <ViewAccounts v-else v-bind="{ uris, userOnOwnProfile }"></ViewAccounts>
-    </section>
-    <EmptyCard
-      v-else
-      nav="accounts"
+    <ProfileSection
+      section="accounts"
       title="Accounts"
-      :message="
-        userOnOwnProfile
-          ? `You haven't added any accounts yet.`
-          : `No accounts have been added yet.`
-      "
+      :userOnOwnProfile="userOnOwnProfile"
+      :empty="!sections.accounts"
+      message="No accounts have been added yet."
+      messageOwn="You haven't added any accounts yet."
+      :editing="editing === 'accounts'"
     >
-      <template v-slot:header>
-        <EditButton
-          v-if="userOnOwnProfile"
-          section="accounts"
-          sectionId="accounts"
-        ></EditButton>
+      <template v-slot:edit>
+        <EditAccounts
+          v-bind="{
+            username: primaryUsername.value,
+            initialValues: { uris },
+            initialUris: uris,
+          }"
+        ></EditAccounts>
       </template>
-    </EmptyCard>
+      <template v-slot:view>
+        <ViewAccounts v-bind="{ uris, userOnOwnProfile }"></ViewAccounts>
+      </template>
+    </ProfileSection>
 
-    <section
-      v-if="sections.languages"
-      :class="
-        'profile__section' +
-          (this.editing === 'languages' ? ' profile__section--editing' : '')
-      "
-    >
-      <a id="nav-languages" class="profile__anchor"></a>
-      <EditLanguages
-        v-if="this.editing === 'languages'"
-        v-bind="{
-          username: primaryUsername.value,
-          initialValues: { languages },
-          initialLanguages: languages,
-        }"
-      ></EditLanguages>
-      <ViewLanguages
-        v-else
-        v-bind="{ languages, userOnOwnProfile }"
-      ></ViewLanguages>
-    </section>
-    <EmptyCard
-      v-else
-      nav="languages"
+    <ProfileSection
+      section="languages"
       title="Languages"
-      :message="
-        userOnOwnProfile
-          ? `You haven't added any languages yet.`
-          : `No languages have been added yet.`
-      "
+      :userOnOwnProfile="userOnOwnProfile"
+      :empty="!sections.languages"
+      message="No languages have been added yet."
+      messageOwn="You haven't added any languages yet."
+      :editing="editing === 'languages'"
     >
-      <template v-slot:header>
-        <EditButton
-          v-if="userOnOwnProfile"
-          section="languages"
-          sectionId="languages"
-        ></EditButton>
+      <template v-slot:edit>
+        <EditLanguages
+          v-bind="{
+            username: primaryUsername.value,
+            initialValues: { languages },
+            initialLanguages: languages,
+          }"
+        ></EditLanguages>
+      </template>
+      <template v-slot:view>
+        <ViewLanguages v-bind="{ languages, userOnOwnProfile }"></ViewLanguages>
       </template>
-    </EmptyCard>
+    </ProfileSection>
 
-    <section
-      v-if="sections.tags"
-      :class="
-        'profile__section' +
-          (this.editing === 'tags' ? ' profile__section--editing' : '')
-      "
-    >
-      <a id="nav-tags" class="profile__anchor"></a>
-      <EditTags
-        v-if="this.editing === 'tags'"
-        v-bind="{
-          username: primaryUsername.value,
-          initialValues: { tags },
-          initialTags: tags,
-        }"
-      ></EditTags>
-      <ViewTags v-else v-bind="{ tags, userOnOwnProfile }"></ViewTags>
-    </section>
-    <EmptyCard
-      v-else
-      nav="tags"
+    <ProfileSection
+      section="tags"
       title="Tags"
-      :message="
-        userOnOwnProfile
-          ? `You haven't added any tags yet.`
-          : `No tags have been added yet.`
-      "
+      :userOnOwnProfile="userOnOwnProfile"
+      :empty="!sections.tags"
+      message="No tags have been added yet."
+      messageOwn="You haven't added any tags yet."
+      :editing="editing === 'tags'"
     >
-      <template v-slot:header>
-        <EditButton
-          v-if="userOnOwnProfile"
-          section="tags"
-          sectionId="tags"
-        ></EditButton>
+      <template v-slot:edit>
+        <EditTags
+          v-bind="{
+            username: primaryUsername.value,
+            initialValues: { tags },
+            initialTags: tags,
+          }"
+        ></EditTags>
       </template>
-    </EmptyCard>
+      <template v-slot:view>
+        <ViewTags v-bind="{ tags, userOnOwnProfile }"></ViewTags>
+      </template>
+    </ProfileSection>
 
-    <section
-      v-if="sections.keys"
-      :class="
-        'profile__section' +
-          (this.editing === 'keys' ? ' profile__section--editing' : '')
-      "
-    >
-      <a id="nav-keys" class="profile__anchor"></a>
-      <EditKeys
-        v-if="this.editing === 'keys'"
-        v-bind="{
-          username: primaryUsername.value,
-          sshPublicKeys,
-          pgpPublicKeys,
-        }"
-      />
-      <ViewKeys
-        v-else
-        v-bind="{ pgpPublicKeys, sshPublicKeys, userOnOwnProfile }"
-      ></ViewKeys>
-    </section>
-    <EmptyCard
-      v-else
-      nav="keys"
+    <ProfileSection
+      section="keys"
       title="Keys"
-      :message="
-        userOnOwnProfile
-          ? `You haven't added any keys yet.`
-          : `No keys have been added yet.`
-      "
+      :userOnOwnProfile="userOnOwnProfile"
+      :empty="!sections.keys"
+      message="No keys have been added yet."
+      messageOwn="You haven't added any keys yet."
+      :editing="editing === 'keys'"
     >
-      <template v-slot:header>
-        <EditButton
-          v-if="userOnOwnProfile"
-          section="keys"
-          sectionId="keys"
-        ></EditButton>
+      <template v-slot:edit>
+        <EditKeys
+          v-bind="{
+            username: primaryUsername.value,
+            sshPublicKeys,
+            pgpPublicKeys,
+          }"
+        />
+      </template>
+      <template v-slot:view>
+        <ViewKeys
+          v-bind="{ pgpPublicKeys, sshPublicKeys, userOnOwnProfile }"
+        ></ViewKeys>
       </template>
-    </EmptyCard>
+    </ProfileSection>
 
-    <section
-      v-if="
-        Object.keys(accessInformation.mozilliansorg.values || {}).length > 0
-      "
-      class="profile__section"
-    >
-      <a id="nav-access-groups" class="profile__anchor"></a>
-      <ViewAccessGroups
-        v-bind="{ accessInformation, userOnOwnProfile }"
-      ></ViewAccessGroups>
-    </section>
-    <EmptyCard
-      v-else
-      nav="access-groups"
+    <ProfileSection
+      section="access-groups"
       title="Access Groups"
+      :userOnOwnProfile="userOnOwnProfile"
+      :empty="
+        Object.keys(accessInformation.mozilliansorg.values || {}).length === 0
+      "
+      :editable="false"
       message="Support for Access Group management is coming soon."
-    ></EmptyCard>
+      messageOwn="Support for Access Group management is coming soon."
+      :editing="editing === 'access-groups'"
+    >
+      <template v-slot:edit> </template>
+      <template v-slot:view>
+        <ViewAccessGroups
+          v-bind="{ accessInformation, userOnOwnProfile }"
+        ></ViewAccessGroups>
+      </template>
+    </ProfileSection>
   </main>
 </template>
 
@@ -302,9 +231,9 @@ import EditLanguages from './edit/EditLanguages.vue';
 import EditIdentities from './edit/EditIdentities.vue';
 import EditPersonalInfo from '@/components/profile/edit/EditPersonalInfo.vue';
 import EditTags from './edit/EditTags.vue';
-import EmptyCard from '@/components/profile/view/EmptyCard.vue';
 import Identities from '@/assets/js/identities';
 import ProfileNav from './ProfileNav.vue';
+import ProfileSection from './ProfileSection.vue';
 import ViewAccessGroups from './view/ViewAccessGroups.vue';
 import ViewAccounts from './view/ViewAccounts.vue';
 import ViewContact from './view/ViewContact.vue';
@@ -351,8 +280,8 @@ export default {
     EditLanguages,
     EditPersonalInfo,
     EditTags,
-    EmptyCard,
     ProfileNav,
+    ProfileSection,
     ViewAccessGroups,
     ViewAccounts,
     ViewContact,
@@ -372,7 +301,9 @@ export default {
     sections() {
       return {
         relations: this.staffInformation.staff,
-        contact: true,
+        contact:
+          this.primaryEmail.value ||
+          Object.entries(this.phoneNumbers.values || {}).length > 0,
         accounts:
           this.editing === 'accounts' ||
           (this.uris.values &&
diff --git a/src/components/profile/ProfileSection.vue b/src/components/profile/ProfileSection.vue
new file mode 100644
index 000000000..766224e5e
--- /dev/null
+++ b/src/components/profile/ProfileSection.vue
@@ -0,0 +1,61 @@
+<template>
+  <section :class="cssClasses">
+    <a :id="`nav-${section}`" class="profile__anchor"></a>
+    <slot name="edit" v-if="editing"></slot>
+    <template v-else>
+      <header class="profile__section-header">
+        <h2>{{ title }}</h2>
+        <EditButton
+          v-if="editable && userOnOwnProfile"
+          :section="section"
+          :sectionId="section"
+        ></EditButton>
+      </header>
+      <p v-if="empty">{{ userOnOwnProfile ? messageOwn : message }}</p>
+      <slot name="view" v-else></slot>
+    </template>
+  </section>
+</template>
+
+<script>
+import EditButton from '@/components/profile/edit/EditButton.vue';
+import EmptyCard from '@/components/profile/view/EmptyCard.vue';
+
+export default {
+  name: 'ProfileSection',
+  props: {
+    section: String,
+    title: String,
+    editable: {
+      type: Boolean,
+      default: true,
+    },
+    userOnOwnProfile: Boolean,
+    empty: {
+      type: Boolean,
+      default: true,
+    },
+    message: String,
+    messageOwn: String,
+    editing: Boolean,
+  },
+  components: { EditButton, EmptyCard },
+  computed: {
+    cssClasses() {
+      return {
+        profile__section: true,
+        'profile__section--editing': this.editing,
+        'profile__section--disabled': !this.editing && this.empty,
+      };
+    },
+  },
+};
+</script>
+
+<style>
+.profile__section--disabled {
+  background-color: var(--gray-20);
+  color: var(--gray-50);
+  border: 2px solid var(--gray-30);
+}
+</style>
diff --git a/src/components/profile/edit/EditKeys.vue b/src/components/profile/edit/EditKeys.vue
index 1c4bc0777..6b29f5336 100644
--- a/src/components/profile/edit/EditKeys.vue
+++ b/src/components/profile/edit/EditKeys.vue
@@ -4,7 +4,7 @@
       <h2>Keys</h2>
     </header>
     <template
-      v-if="pgpPublicKeys && Object.keys(pgpPublicKeys.values).length > 0"
+      v-if="pgpPublicKeys && Object.keys(pgpPublicKeys.values || {}).length > 0"
     >
       <div class="edit-keys__header">
         <h3>PGP keys</h3>
@@ -28,7 +28,7 @@
       />
     </template>
     <template
-      v-if="sshPublicKeys && Object.keys(sshPublicKeys.values).length > 0"
+      v-if="sshPublicKeys && Object.keys(sshPublicKeys.values || {}).length > 0"
     >
       <div class="edit-keys__header">
         <h3>SSH keys</h3>
diff --git a/src/components/profile/view/ViewAccessGroups.vue b/src/components/profile/view/ViewAccessGroups.vue
index 4b3b82fc2..330efed1e 100644
--- a/src/components/profile/view/ViewAccessGroups.vue
+++ b/src/components/profile/view/ViewAccessGroups.vue
@@ -1,21 +1,13 @@
 <template>
-  <div>
-    <header class="profile__section-header">
-      <h2>Access Groups</h2>
-    </header>
-    <a id="nav-access-groups" class="profile__anchor"></a>
-    <IconBlockList class="icon-block-list--multi-col">
-      <IconBlock
-        v-for="[group] in Object.entries(
-          accessInformation.mozilliansorg.values,
-        )"
-        :key="`group-${group}`"
-        icon="dino"
-      >
-        {{ group }}
-      </IconBlock>
-    </IconBlockList>
-  </div>
+  <IconBlockList class="icon-block-list--multi-col">
+    <IconBlock
+      v-for="[group] in Object.entries(accessInformation.mozilliansorg.values)"
+      :key="`group-${group}`"
+      icon="dino"
+    >
+      {{ group }}
+    </IconBlock>
+  </IconBlockList>
 </template>
 
 <script>
diff --git a/src/components/profile/view/ViewAccounts.vue b/src/components/profile/view/ViewAccounts.vue
index 337ae2bb9..9aad224eb 100644
--- a/src/components/profile/view/ViewAccounts.vue
+++ b/src/components/profile/view/ViewAccounts.vue
@@ -1,61 +1,50 @@
 <template>
-  <div>
-    <header class="profile__section-header">
-      <h2>Accounts</h2>
-      <EditButton
-        v-if="userOnOwnProfile"
-        section="accounts"
-        sectionId="accounts"
-      ></EditButton>
-    </header>
-    <div class="profile__external-accounts">
-      <div v-if="accounts.mozilla.length">
-        <h3>Mozilla</h3>
-        <IconBlockList>
-          <IconBlock
-            v-for="(acc, index) in accounts.mozilla"
-            :key="`acc-moz-${index}`"
-            :heading="acc.text"
-            :icon="acc.icon"
+  <div class="profile__external-accounts">
+    <div v-if="accounts.mozilla.length">
+      <h3>Mozilla</h3>
+      <IconBlockList>
+        <IconBlock
+          v-for="(acc, index) in accounts.mozilla"
+          :key="`acc-moz-${index}`"
+          :heading="acc.text"
+          :icon="acc.icon"
+        >
+          <a
+            v-if="acc.uri"
+            :href="acc.uri"
+            target="_blank"
+            rel="noreferrer noopener"
+            >{{ acc.value }}</a
           >
-            <a
-              v-if="acc.uri"
-              :href="acc.uri"
-              target="_blank"
-              rel="noreferrer noopener"
-              >{{ acc.value }}</a
-            >
-            <template v-else>{{ acc.value }}</template>
-          </IconBlock>
-        </IconBlockList>
-      </div>
-      <div v-if="accounts.other.length">
-        <h3>Elsewhere</h3>
-        <IconBlockList>
-          <IconBlock
-            v-for="(acc, index) in accounts.other"
-            :key="`acc-other-${index}`"
-            :heading="acc.text"
-            :icon="acc.icon"
+          <template v-else>{{ acc.value }}</template>
+        </IconBlock>
+      </IconBlockList>
+    </div>
+    <div v-if="accounts.other.length">
+      <h3>Elsewhere</h3>
+      <IconBlockList>
+        <IconBlock
+          v-for="(acc, index) in accounts.other"
+          :key="`acc-other-${index}`"
+          :heading="acc.text"
+          :icon="acc.icon"
+        >
+          <a
+            v-if="acc.uri"
+            :href="acc.uri"
+            target="_blank"
+            rel="noreferrer noopener"
+            >{{ acc.value }}</a
           >
-            <a
-              v-if="acc.uri"
-              :href="acc.uri"
-              target="_blank"
-              rel="noreferrer noopener"
-              >{{ acc.value }}</a
-            >
-            <template v-else>{{ acc.value }}</template>
-          </IconBlock>
-        </IconBlockList>
-      </div>
+          <template v-else>{{ acc.value }}</template>
+        </IconBlock>
+      </IconBlockList>
     </div>
   </div>
 </template>
 
 <script>
 import AccountsMixin from '@/components/_mixins/AccountsMixin.vue';
-import EditButton from '@/components/profile/edit/EditButton.vue';
 import IconBlock from '@/components/ui/IconBlock.vue';
 import IconBlockList from '@/components/ui/IconBlockList.vue';
 
@@ -67,7 +56,6 @@ export default {
   },
   mixins: [AccountsMixin],
   components: {
-    EditButton,
     IconBlock,
     IconBlockList,
   },
diff --git a/src/components/profile/view/ViewContact.vue b/src/components/profile/view/ViewContact.vue
index 312d63681..ecabe76bf 100644
--- a/src/components/profile/view/ViewContact.vue
+++ b/src/components/profile/view/ViewContact.vue
@@ -1,13 +1,5 @@
 <template>
   <div>
-    <header class="profile__section-header">
-      <h2>Contact</h2>
-      <EditButton
-        v-if="userOnOwnProfile"
-        section="contact"
-        sectionId="contact"
-      ></EditButton>
-    </header>
     <h3 class="visually-hidden">Contact options</h3>
     <IconBlockList class="icon-block-list--multi-col">
       <IconBlock heading="Email" subHeading="primary" icon="email">
@@ -28,7 +20,6 @@
 
 <script>
 import PhoneNumbersMixin from '@/components/_mixins/PhoneNumbersMixin.vue';
-import EditButton from '@/components/profile/edit/EditButton.vue';
 import IconBlock from '@/components/ui/IconBlock.vue';
 import IconBlockList from '@/components/ui/IconBlockList.vue';
 
@@ -41,7 +32,6 @@ export default {
   },
   mixins: [PhoneNumbersMixin],
   components: {
-    EditButton,
     IconBlock,
     IconBlockList,
   },
diff --git a/src/components/profile/view/ViewIdentities.vue b/src/components/profile/view/ViewIdentities.vue
index f0ab1fd5c..44933398a 100644
--- a/src/components/profile/view/ViewIdentities.vue
+++ b/src/components/profile/view/ViewIdentities.vue
@@ -1,45 +1,34 @@
 <template>
-  <div>
-    <header class="profile__section-header">
-      <h2>Identities</h2>
-      <EditButton
-        v-if="userOnOwnProfile"
-        section="identities"
-        sectionId="identities"
-      ></EditButton>
-    </header>
-    <div class="profile__identities">
-      <IconBlockList class="icon-block-list--multi-col">
-        <IconBlock
-          v-if="identities.hasGithub()"
-          heading="GitHub"
-          :subHeading="githubUsername && 'Verified'"
-          icon="github"
+  <div class="profile__identities">
+    <IconBlockList class="icon-block-list--multi-col">
+      <IconBlock
+        v-if="identities.hasGithub()"
+        heading="GitHub"
+        :subHeading="githubUsername && 'Verified'"
+        icon="github"
+      >
+        <a :href="githubLink" target="_blank" rel="noreferrer noopener">{{
+          githubUsername
+        }}</a>
+      </IconBlock>
+      <IconBlock
+        v-if="identities.hasBugzilla()"
+        heading="Bugzilla"
+        subHeading="Verified"
+        icon="dino"
+      >
+        <a
+          :href="identities.bugzillaProfile()"
+          target="_blank"
+          rel="noreferrer noopener"
+          >{{ identities.bugzillaEmail() }}</a
         >
-          <a :href="githubLink" target="_blank" rel="noreferrer noopener">{{
-            githubUsername
-          }}</a>
-        </IconBlock>
-        <IconBlock
-          v-if="identities.hasBugzilla()"
-          heading="Bugzilla"
-          subHeading="Verified"
-          icon="dino"
-        >
-          <a
-            :href="identities.bugzillaProfile()"
-            target="_blank"
-            rel="noreferrer noopener"
-            >{{ identities.bugzillaEmail() }}</a
-          >
-        </IconBlock>
-      </IconBlockList>
-    </div>
+      </IconBlock>
+    </IconBlockList>
   </div>
 </template>
 
 <script>
-import EditButton from '@/components/profile/edit/EditButton.vue';
 import IconBlock from '@/components/ui/IconBlock.vue';
 import IconBlockList from '@/components/ui/IconBlockList.vue';
 
@@ -50,7 +39,6 @@ export default {
     userOnOwnProfile: Boolean,
   },
   components: {
-    EditButton,
     IconBlock,
     IconBlockList,
   },
diff --git a/src/components/profile/view/ViewKeys.vue b/src/components/profile/view/ViewKeys.vue
index d80b1e119..af170c1ee 100644
--- a/src/components/profile/view/ViewKeys.vue
+++ b/src/components/profile/view/ViewKeys.vue
@@ -1,13 +1,5 @@
 <template>
   <div>
-    <header class="profile__section-header">
-      <h2>Keys</h2>
-      <EditButton
-        v-if="userOnOwnProfile"
-        section="keys"
-        sectionId="keys"
-      ></EditButton>
-    </header>
     <template
       v-if="pgpPublicKeys && Object.keys(pgpPublicKeys.values).length > 0"
     >
@@ -94,7 +86,6 @@
 </template>
 
 <script>
-import EditButton from '@/components/profile/edit/EditButton.vue';
 import Icon from '@/components/ui/Icon.vue';
 import Key from '@/components/ui/Key.vue';
 import ShowMore from '@/components/_functional/ShowMore.vue';
@@ -107,7 +98,6 @@ export default {
     userOnOwnProfile: Boolean,
   },
   components: {
-    EditButton,
     Icon,
     Key,
     ShowMore,
diff --git a/src/components/profile/view/ViewLanguages.vue b/src/components/profile/view/ViewLanguages.vue
index af836ab2b..e17f8edca 100644
--- a/src/components/profile/view/ViewLanguages.vue
+++ b/src/components/profile/view/ViewLanguages.vue
@@ -1,13 +1,5 @@
 <template>
   <div>
-    <header class="profile__section-header">
-      <h2>Languages</h2>
-      <EditButton
-        v-if="userOnOwnProfile"
-        section="languages"
-        sectionId="languages"
-      ></EditButton>
-    </header>
     <Tag
       v-if="Object.entries(languages.values).length > 0"
       v-for="(language, index) in languages.values"
@@ -20,7 +12,6 @@
 </template>
 
 <script>
-import EditButton from '@/components/profile/edit/EditButton.vue';
 import Tag from '@/components/ui/Tag.vue';
 
 export default {
@@ -30,7 +21,6 @@ export default {
     userOnOwnProfile: Boolean,
   },
   components: {
-    EditButton,
     Tag,
   },
 };
diff --git a/src/components/profile/view/ViewTags.vue b/src/components/profile/view/ViewTags.vue
index b1c8b7186..4f0f4dd24 100644
--- a/src/components/profile/view/ViewTags.vue
+++ b/src/components/profile/view/ViewTags.vue
@@ -1,19 +1,10 @@
 <template>
   <div>
-    <header class="profile__section-header">
-      <h2>Tags</h2>
-      <EditButton
-        v-if="userOnOwnProfile"
-        section="tags"
-        sectionId="tags"
-      ></EditButton>
-    </header>
     <Tag v-for="(tag, index) in tags.values" :tag="tag" :key="`tag-${index}`" />
   </div>
 </template>
 
 <script>
-import EditButton from '@/components/profile/edit/EditButton.vue';
 import Tag from '@/components/ui/Tag.vue';
 
 export default {
@@ -23,7 +14,6 @@ export default {
     userOnOwnProfile: Boolean,
   },
   components: {
-    EditButton,
     Tag,
   },
 };