diff --git a/assets/images/help/codespaces/codespaces-option-secrets-org.png b/assets/images/help/codespaces/codespaces-option-secrets-org.png
deleted file mode 100644
index 056f933431..0000000000
Binary files a/assets/images/help/codespaces/codespaces-option-secrets-org.png and /dev/null differ
diff --git a/assets/images/help/codespaces/codespaces-option-secrets.png b/assets/images/help/codespaces/codespaces-option-secrets.png
deleted file mode 100644
index 4102063e08..0000000000
Binary files a/assets/images/help/codespaces/codespaces-option-secrets.png and /dev/null differ
diff --git a/assets/images/help/organizations/codespaces-policy-sidebar.png b/assets/images/help/organizations/codespaces-policy-sidebar.png
deleted file mode 100644
index b9c8c8c504..0000000000
Binary files a/assets/images/help/organizations/codespaces-policy-sidebar.png and /dev/null differ
diff --git a/assets/images/help/organizations/codespaces-sidebar-tab.png b/assets/images/help/organizations/codespaces-sidebar-tab.png
deleted file mode 100644
index b3f472e176..0000000000
Binary files a/assets/images/help/organizations/codespaces-sidebar-tab.png and /dev/null differ
diff --git a/assets/images/help/organizations/org-oauth-applications-ghe.png b/assets/images/help/organizations/org-oauth-applications-ghe.png
index abd2a5ca6b..f93d4001f5 100644
Binary files a/assets/images/help/organizations/org-oauth-applications-ghe.png and b/assets/images/help/organizations/org-oauth-applications-ghe.png differ
diff --git a/assets/images/help/organizations/org-settings-block-users.png b/assets/images/help/organizations/org-settings-block-users.png
deleted file mode 100644
index 7ecc99c3cb..0000000000
Binary files a/assets/images/help/organizations/org-settings-block-users.png and /dev/null differ
diff --git a/assets/images/help/organizations/org-settings-interaction-limits.png b/assets/images/help/organizations/org-settings-interaction-limits.png
deleted file mode 100644
index 0e97714107..0000000000
Binary files a/assets/images/help/organizations/org-settings-interaction-limits.png and /dev/null differ
diff --git a/assets/images/help/organizations/org-settings-moderation-settings.png b/assets/images/help/organizations/org-settings-moderation-settings.png
deleted file mode 100644
index 78d4b48c35..0000000000
Binary files a/assets/images/help/organizations/org-settings-moderation-settings.png and /dev/null differ
diff --git a/assets/images/help/organizations/org-settings-repository-roles.png b/assets/images/help/organizations/org-settings-repository-roles.png
deleted file mode 100644
index da375d2be2..0000000000
Binary files a/assets/images/help/organizations/org-settings-repository-roles.png and /dev/null differ
diff --git a/assets/images/help/organizations/repo-labels-tab.png b/assets/images/help/organizations/repo-labels-tab.png
deleted file mode 100644
index 7ddc00eea3..0000000000
Binary files a/assets/images/help/organizations/repo-labels-tab.png and /dev/null differ
diff --git a/assets/images/help/organizations/scheduled-reminders-org.png b/assets/images/help/organizations/scheduled-reminders-org.png
deleted file mode 100644
index 865374f598..0000000000
Binary files a/assets/images/help/organizations/scheduled-reminders-org.png and /dev/null differ
diff --git a/content/billing/managing-your-github-billing-settings/about-billing-on-github.md b/content/billing/managing-your-github-billing-settings/about-billing-on-github.md
index 8aa046128f..8f94d4a73e 100644
--- a/content/billing/managing-your-github-billing-settings/about-billing-on-github.md
+++ b/content/billing/managing-your-github-billing-settings/about-billing-on-github.md
@@ -37,7 +37,7 @@ If you're an organization or enterprise owner, you can switch between settings f
 ![Context switcher button](/assets/images/help/settings/context-switcher-button.png)
 1. Start typing the name of the account you want to switch to, then click the name of the account.
 ![Context switcher menu](/assets/images/help/settings/context-switcher-menu.png)
-1. In the left sidebar, click **Billing & plans**. ![Billing & plans in the settings sidebar](/assets/images/help/organizations/billing-settings.png)
+1. In the left sidebar, click **{% octicon "credit-card" aria-label="The credit card icon" %} Billing and plans**.
 
 ## Further reading
 
diff --git a/content/codespaces/managing-codespaces-for-your-organization/managing-encrypted-secrets-for-your-repository-and-organization-for-codespaces.md b/content/codespaces/managing-codespaces-for-your-organization/managing-encrypted-secrets-for-your-repository-and-organization-for-codespaces.md
index 2bc6e98fd7..f6b7cf982f 100644
--- a/content/codespaces/managing-codespaces-for-your-organization/managing-encrypted-secrets-for-your-repository-and-organization-for-codespaces.md
+++ b/content/codespaces/managing-codespaces-for-your-organization/managing-encrypted-secrets-for-your-repository-and-organization-for-codespaces.md
@@ -41,13 +41,11 @@ To create secrets for an organization repository, you must have administrator ac
 
 {% data reusables.repositories.navigate-to-repo %}
 {% data reusables.repositories.sidebar-settings %}
-{% data reusables.github-actions.sidebar-secret %}
-1. Scroll down the page and under **Secrets**, select **Codespaces**.
-    ![Codespaces option in side bar](/assets/images/help/codespaces/codespaces-option-secrets.png)
-1. At the top of the page, click **New repository secret**.
-1. Type a name for your secret in the **Name** input box.
-1. Enter the value for your secret.
-1. Click **Add secret**.
+1. In the "Security" section of the sidebar, select **{% octicon "key-asterisk" aria-label="The key-asterisk icon" %} Secrets** then click **{% data variables.product.prodname_codespaces %}**.
+2. At the top of the page, click **New repository secret**.
+3. Type a name for your secret in the **Name** input box.
+4. Enter the value for your secret.
+5. Click **Add secret**.
 
 ## Adding secrets for an organization
 
@@ -57,15 +55,13 @@ When creating a secret in an organization, you can use a policy to limit which r
 
 {% data reusables.organizations.navigate-to-org %}
 {% data reusables.organizations.org_settings %}
-{% data reusables.github-actions.sidebar-secret %}
-1. Scroll down the page and under **Secrets**, select **Codespaces**.
-    ![Codespaces option in side bar](/assets/images/help/codespaces/codespaces-option-secrets-org.png)
-1. At the top of the page, click **New organization secret**.
-1. Type a name for your secret in the **Name** input box.
-1. Enter the **Value** for your secret.
-1. From the **Repository access** dropdown list, choose an access policy.
+1. In the "Security" section of the sidebar, select **{% octicon "key-asterisk" aria-label="The key-asterisk icon" %} Secrets** then click **{% data variables.product.prodname_codespaces %}**.
+2. At the top of the page, click **New organization secret**.
+3. Type a name for your secret in the **Name** input box.
+4. Enter the **Value** for your secret.
+5. From the **Repository access** dropdown list, choose an access policy.
     ![Repository Access list with private repositories selected](/assets/images/help/codespaces/secret-repository-access.png)
-1. Click **Add secret**.
+6. Click **Add secret**.
 
 ## Reviewing access to organization-level secrets
 
diff --git a/content/codespaces/managing-codespaces-for-your-organization/restricting-access-to-machine-types.md b/content/codespaces/managing-codespaces-for-your-organization/restricting-access-to-machine-types.md
index 1941e35760..04024d223e 100644
--- a/content/codespaces/managing-codespaces-for-your-organization/restricting-access-to-machine-types.md
+++ b/content/codespaces/managing-codespaces-for-your-organization/restricting-access-to-machine-types.md
@@ -47,34 +47,30 @@ If you add an organization-wide policy, you should set it to the largest choice
 
 {% data reusables.profile.access_org %}
 {% data reusables.profile.org_settings %}
-{% data reusables.organizations.click-codespaces %}
-1. Under "Codespaces", click **Policy**.
-
-   !["Policy" tab in left sidebar](/assets/images/help/organizations/codespaces-policy-sidebar.png)
-
-1. On the "Codespace policies" page, click **Create Policy**.
-1. Enter a name for your new policy.
-1. Click **Add constraint** and choose **Machine types**.
+1. In the "Code, planning, and automation" section of the sidebar, select **{% octicon "codespaces" aria-label="The codespaces icon" %} {% data variables.product.prodname_codespaces %}** then click **Policy**.
+2. On the "Codespace policies" page, click **Create Policy**.
+3. Enter a name for your new policy.
+4. Click **Add constraint** and choose **Machine types**.
 
    ![Add a constraint for machine types](/assets/images/help/codespaces/add-constraint-dropdown.png)
 
-1. Click {% octicon "pencil" aria-label="The edit icon" %} to edit the constraint, then clear the selection of any machine types that you don't want to be available.
+5. Click {% octicon "pencil" aria-label="The edit icon" %} to edit the constraint, then clear the selection of any machine types that you don't want to be available.
 
    ![Edit the machine type constraint](/assets/images/help/codespaces/edit-machine-constraint.png)
 
-1. In the "Change policy target" area, click the dropdown button.
-1. Choose either **All repositories** or **Selected repositories** to determine which repositories this policy will apply to.
-1. If you chose **Selected repositories**:
+6. In the "Change policy target" area, click the dropdown button.
+7. Choose either **All repositories** or **Selected repositories** to determine which repositories this policy will apply to.
+8. If you chose **Selected repositories**:
    1. Click {% octicon "gear" aria-label="The settings icon" %}.
 
       ![Edit the settings for the policy](/assets/images/help/codespaces/policy-edit.png)
 
-   1. Select the repositories you want this policy to apply to.
-   1. At the bottom of the repository list, click **Select repositories**.
+   2. Select the repositories you want this policy to apply to.
+   3. At the bottom of the repository list, click **Select repositories**.
 
       ![Select repositories for this policy](/assets/images/help/codespaces/policy-select-repos.png)
 
-1. Click **Save**.
+9. Click **Save**.
 
 ## Editing a policy
 
diff --git a/content/communities/maintaining-your-safety-on-github/unblocking-a-user-from-your-organization.md b/content/communities/maintaining-your-safety-on-github/unblocking-a-user-from-your-organization.md
index 9d91fc58fd..7925ef5c53 100644
--- a/content/communities/maintaining-your-safety-on-github/unblocking-a-user-from-your-organization.md
+++ b/content/communities/maintaining-your-safety-on-github/unblocking-a-user-from-your-organization.md
@@ -34,7 +34,7 @@ If you selected a specific amount of time to block the user, they will be automa
 
 {% data reusables.profile.access_org %}
 {% data reusables.profile.org_settings %}
-{% data reusables.organizations.moderation-settings %}
+{% data reusables.organizations.moderation-settings %}, then click **Blocked users**.
 5. Under "Blocked users", next to the user you'd like to unblock, click **Unblock**.
 ![Unblock user button](/assets/images/help/organizations/org-unblock-user-button.png)
 
diff --git a/content/communities/moderating-comments-and-conversations/limiting-interactions-in-your-organization.md b/content/communities/moderating-comments-and-conversations/limiting-interactions-in-your-organization.md
index bfd7c24b47..1d76545457 100644
--- a/content/communities/moderating-comments-and-conversations/limiting-interactions-in-your-organization.md
+++ b/content/communities/moderating-comments-and-conversations/limiting-interactions-in-your-organization.md
@@ -33,10 +33,7 @@ Organization owners can also block users for a specific amount of time. After th
 
 {% data reusables.profile.access_org %}
 {% data reusables.profile.org_settings %}
-1. In the organization settings sidebar, click **Moderation settings**.
-  !["Moderation settings" in the organization settings sidebar](/assets/images/help/organizations/org-settings-moderation-settings.png)
-1. Under "Moderation settings", click **Interaction limits**.
-  !["Interaction limits" in the organization settings sidebar](/assets/images/help/organizations/org-settings-interaction-limits.png)
+1. In the "Access" section of the sidebar, select **{% octicon "report" aria-label="The report icon" %} Moderation**, then click **Interaction limits**.
 {% data reusables.community.set-interaction-limit %}
   ![Temporary interaction limit options](/assets/images/help/organizations/organization-temporary-interaction-limits-options.png)
 
diff --git a/content/organizations/keeping-your-organization-secure/reviewing-your-organizations-installed-integrations.md b/content/organizations/keeping-your-organization-secure/reviewing-your-organizations-installed-integrations.md
index 284f1e75d6..02fba36cc3 100644
--- a/content/organizations/keeping-your-organization-secure/reviewing-your-organizations-installed-integrations.md
+++ b/content/organizations/keeping-your-organization-secure/reviewing-your-organizations-installed-integrations.md
@@ -18,9 +18,13 @@ shortTitle: Review installed integrations
 
 {% data reusables.profile.access_org %}
 {% data reusables.profile.org_settings %}
-4. In the left sidebar, click **Installed {% data variables.product.prodname_github_apps %}**.
+{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %}
+1. In the "Integrations" section of the sidebar, click **{% octicon "apps" aria-label="The apps icon" %} {% data variables.product.prodname_github_apps %}**.
+{% elsif ghae or ghes < 3.4 %}
+1. In the left sidebar, click **Installed {% data variables.product.prodname_github_apps %}**.
   ![Installed {% data variables.product.prodname_github_apps %} tab in the organization settings sidebar](/assets/images/help/organizations/org-settings-installed-github-apps.png)
-5. Next to the {% data variables.product.prodname_github_app %} you'd like to review, click **Configure**.
+{% endif %}
+2. Next to the {% data variables.product.prodname_github_app %} you'd like to review, click **Configure**.
   ![Configure button](/assets/images/help/organizations/configure-installed-integration-button.png)
 6. Review the {% data variables.product.prodname_github_app %}'s permissions and repository access.
   ![Option to give the {% data variables.product.prodname_github_app %} access to all repositories or specific repositories](/assets/images/help/organizations/toggle-integration-repo-access.png)
diff --git a/content/organizations/managing-organization-settings/disabling-project-boards-in-your-organization.md b/content/organizations/managing-organization-settings/disabling-project-boards-in-your-organization.md
index 85130837ce..69be8ae11c 100644
--- a/content/organizations/managing-organization-settings/disabling-project-boards-in-your-organization.md
+++ b/content/organizations/managing-organization-settings/disabling-project-boards-in-your-organization.md
@@ -23,11 +23,14 @@ When you disable project boards, you will no longer see project board informatio
 
 {% data reusables.profile.access_org %}
 {% data reusables.profile.org_settings %}
-4. Decide whether to disable organization-wide project boards, disable repository project boards in the organization, or both. Then, under "Projects":
+{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %}
+1. In the "Code planning, and automation" section of the sidebar, click **{% octicon "table" aria-label="The table icon" %} Projects**.
+{% endif %}
+1. Decide whether to disable organization-wide project boards, disable repository project boards in the organization, or both. Then, under "Projects":
     - To disable organization-wide project boards, unselect **Enable projects for the organization**.
     - To disable repository project boards in the organization, unselect **Enable projects for all repositories**.
   ![Checkboxes to disable projects for an organization or for all of an organization's repositories](/assets/images/help/projects/disable-org-projects-checkbox.png)
-5. Click **Save**.
+1. Click **Save**.
 
 {% data reusables.organizations.disable_project_board_results %}
 
diff --git a/content/organizations/managing-organization-settings/integrating-jira-with-your-organization-project-board.md b/content/organizations/managing-organization-settings/integrating-jira-with-your-organization-project-board.md
index b9036db068..4d62131020 100644
--- a/content/organizations/managing-organization-settings/integrating-jira-with-your-organization-project-board.md
+++ b/content/organizations/managing-organization-settings/integrating-jira-with-your-organization-project-board.md
@@ -9,16 +9,24 @@ versions:
   ghae: '*'
 shortTitle: Integrate Jira
 ---
-{% data reusables.user_settings.access_settings %}
-2. In the left sidebar under **Organization settings**, click the name of your organization.
-![Sidebar organization name](/assets/images/help/settings/organization-settings-from-sidebar.png)
-3. In the left sidebar under **Developer settings**, click **OAuth applications**.
+{% ifversion ghes > 3.3 or ghae-issue-5658 %}
+{% data reusables.profile.access_org %}
+{% data reusables.profile.org_settings %}
+1. In the left sidebar, select **{% octicon "code" aria-label="The code icon" %} Developer settings**, then click **OAuth Apps**.
   ![OAuth applications tab in the left sidebar](/assets/images/help/organizations/org-oauth-applications-ghe.png)
-4. Click **Register a new application**.
-5. Under **Application name**, type "Jira".
-6. Under **Homepage URL**, type the full URL to your Jira instance.
-7. Under **Authorization callback URL**, type the full URL to your Jira instance.
-8. Click **Register application**.
+1. Click **New OAuth App**.
+{% elsif ghes < 3.4 or ghae %}
+{% data reusables.user_settings.access_settings %}
+1. In the left sidebar under **Organization settings**, click the name of your organization.
+![Sidebar organization name](/assets/images/help/settings/organization-settings-from-sidebar.png)
+1. In the left sidebar under **Developer settings**, click **OAuth applications**.
+  ![OAuth applications tab in the left sidebar](/assets/images/help/organizations/org-oauth-applications-ghe.png)
+1. Click **Register a new application**.
+{% endif %}
+1. Under **Application name**, type "Jira".
+2. Under **Homepage URL**, type the full URL to your Jira instance.
+3. Under **Authorization callback URL**, type the full URL to your Jira instance.
+4. Click **Register application**.
 ![Register application button](/assets/images/help/oauth/register-application-button.png)
 9. Under **Organization owned applications**, note the "Client ID" and "Client Secret" values.
 ![Client ID and Client Secret](/assets/images/help/oauth/client-id-and-secret.png)
diff --git a/content/organizations/managing-organization-settings/managing-scheduled-reminders-for-your-organization.md b/content/organizations/managing-organization-settings/managing-scheduled-reminders-for-your-organization.md
index 970265badc..72efaaed05 100644
--- a/content/organizations/managing-organization-settings/managing-scheduled-reminders-for-your-organization.md
+++ b/content/organizations/managing-organization-settings/managing-scheduled-reminders-for-your-organization.md
@@ -24,14 +24,13 @@ Organization owners can schedule a reminder for one or more teams in their organ
 {% data reusables.profile.access_org %}
 {% data reusables.profile.org_settings %}
 {% data reusables.reminders.scheduled-reminders %}
-![Scheduled reminders button](/assets/images/help/organizations/scheduled-reminders-org.png)
 {% data reusables.reminders.add-reminder %}
 {% data reusables.reminders.authorize-slack %}
 {% data reusables.reminders.slack-channel %}
 {% data reusables.reminders.days-dropdown %}
 {% data reusables.reminders.times-dropdowns %}
 {% data reusables.reminders.tracked-repos %}
-11. Under "Filter by team assigned to review code", click the **Add a team** dropdown and choose one or more teams. You can add up to 100 teams. If the team you select doesn't have access to the "Tracked repositories" selected above, you won't be able to create the scheduled reminder.
+1.  Under "Filter by team assigned to review code", click the **Add a team** dropdown and choose one or more teams. You can add up to 100 teams. If the team you select doesn't have access to the "Tracked repositories" selected above, you won't be able to create the scheduled reminder.
 ![Add a team dropdown](/assets/images/help/organizations/scheduled-reminders-add-teams.png)
 {% data reusables.reminders.ignore-drafts %}
 {% data reusables.reminders.no-review-requests %}
@@ -48,7 +47,6 @@ Organization owners can schedule a reminder for one or more teams in their organ
 {% data reusables.profile.access_org %}
 {% data reusables.profile.org_settings %}
 {% data reusables.reminders.scheduled-reminders %}
-![Scheduled reminders button](/assets/images/help/organizations/scheduled-reminders-org.png)
 {% data reusables.reminders.edit-existing %}
 {% data reusables.reminders.edit-page %}
 {% data reusables.reminders.update-buttons %}
@@ -57,7 +55,6 @@ Organization owners can schedule a reminder for one or more teams in their organ
 {% data reusables.profile.access_org %}
 {% data reusables.profile.org_settings %}
 {% data reusables.reminders.scheduled-reminders %}
-![Scheduled reminders button](/assets/images/help/organizations/scheduled-reminders-org.png)
 {% data reusables.reminders.delete %}
 
 ## Further reading
diff --git a/data/reusables/github-actions/sidebar-secret.md b/data/reusables/github-actions/sidebar-secret.md
index 9181cb0eaa..f5c22b01b3 100644
--- a/data/reusables/github-actions/sidebar-secret.md
+++ b/data/reusables/github-actions/sidebar-secret.md
@@ -1 +1,5 @@
+{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %}
+1. In the left sidebar, click **{% octicon "key-asterisk" aria-label="The key-asterisk icon" %} Secrets**.
+{% elsif ghes < 3.4 or ghae %}
 1. In the left sidebar, click **Secrets**.
+{% endif %}
diff --git a/data/reusables/organizations/billing-settings.md b/data/reusables/organizations/billing-settings.md
index 057cd3b4e0..45d230b82a 100644
--- a/data/reusables/organizations/billing-settings.md
+++ b/data/reusables/organizations/billing-settings.md
@@ -1,6 +1,4 @@
 {% data reusables.user_settings.access_settings %}
-2. In the settings sidebar, click **Organizations**.
-![Organizations settings in the sidebar](/assets/images/help/settings/settings-sidebar-organizations.png)
+2. In the settings sidebar, click **{% octicon "organization" aria-label="The organization icon" %} Organizations**.
 {% data reusables.profile.org_settings %}
-4. If you're an organization owner, in the left sidebar, click **Billing & plans**.
-![Billing & plans in the organization settings sidebar](/assets/images/help/organizations/billing-settings.png)
+1. If you're an organization owner, in the left sidebar, click **{% octicon "credit-card" aria-label="The credit card icon" %} Billing and plans**.
diff --git a/data/reusables/organizations/billing_plans.md b/data/reusables/organizations/billing_plans.md
index ead9523501..0d48d771db 100644
--- a/data/reusables/organizations/billing_plans.md
+++ b/data/reusables/organizations/billing_plans.md
@@ -1,2 +1,6 @@
+{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %}
+1. In the "Access" section of the sidebar, click **{% octicon "credit-card" aria-label="The credit card icon" %} Billing and plans**.
+{% elsif ghes < 3.4 or ghae %}
 1. In your organization's Settings sidebar, click **Billing & plans**.
 ![Billing settings](/assets/images/help/billing/settings_organization_billing_plans_tab.png)
+{% endif %}
diff --git a/data/reusables/organizations/block_users.md b/data/reusables/organizations/block_users.md
index a3097b8025..10efc741f5 100644
--- a/data/reusables/organizations/block_users.md
+++ b/data/reusables/organizations/block_users.md
@@ -1,2 +1 @@
-1. In your organization's Settings sidebar, click **Blocked users**.
-![Blocked users in organization's settings](/assets/images/help/organizations/org-settings-block-users.png)
+1. In the "Access" section of the sidebar, select **{% octicon "report" aria-label="The report icon" %} Moderation**, then click **Blocked users**.
diff --git a/data/reusables/organizations/click-codespaces.md b/data/reusables/organizations/click-codespaces.md
index 6e5dcf3e41..2f409b474f 100644
--- a/data/reusables/organizations/click-codespaces.md
+++ b/data/reusables/organizations/click-codespaces.md
@@ -1,2 +1 @@
-1. In the left sidebar, click **Codespaces**.
-!["Codespaces" tab in left sidebar](/assets/images/help/organizations/codespaces-sidebar-tab.png)
+1. In the left sidebar, click **{% octicon "codespaces" aria-label="The codespaces icon" %} Codespaces**.
diff --git a/data/reusables/organizations/github-apps-settings-sidebar.md b/data/reusables/organizations/github-apps-settings-sidebar.md
index ec0bb9993c..e130e6b624 100644
--- a/data/reusables/organizations/github-apps-settings-sidebar.md
+++ b/data/reusables/organizations/github-apps-settings-sidebar.md
@@ -1,2 +1,6 @@
+{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %}
+1. In the left sidebar, select **{% octicon "code" aria-label="The code icon" %} Developer settings** then click **{% data variables.product.prodname_github_apps %}**.
+{% elsif ghes < 3.4 or ghae %}
 1. In the left sidebar, click **{% data variables.product.prodname_github_apps %}**.
 ![{% data variables.product.prodname_github_apps %} settings](/assets/images/help/organizations/github-apps-settings-sidebar.png)
+{% endif %}
diff --git a/data/reusables/organizations/member-privileges.md b/data/reusables/organizations/member-privileges.md
index ca0ededfa1..96da580be3 100644
--- a/data/reusables/organizations/member-privileges.md
+++ b/data/reusables/organizations/member-privileges.md
@@ -1,2 +1,6 @@
+{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %}
+1. In the "Access" section of the sidebar, click **{% octicon "people" aria-label="The people icon" %} Member privileges**.
+{% elsif ghae or ghes < 3.4 %}
 4. In the left sidebar, click **Member privileges**.
 ![Member privileges option in org settings](/assets/images/help/organizations/org-settings-member-privileges.png)
+{% endif %}
diff --git a/data/reusables/organizations/moderation-settings.md b/data/reusables/organizations/moderation-settings.md
index 854bb1828c..b79fd4132d 100644
--- a/data/reusables/organizations/moderation-settings.md
+++ b/data/reusables/organizations/moderation-settings.md
@@ -1,2 +1 @@
-1. In the left sidebar, click **Moderation settings**.
-![Moderation settings in organization's settings](/assets/images/help/organizations/org-settings-moderation-settings.png)
+1. In the "Access" section of the sidebar, select **{% octicon "report" aria-label="The report icon" %} Moderation**
diff --git a/data/reusables/organizations/org-settings-repository-roles.md b/data/reusables/organizations/org-settings-repository-roles.md
index 180efaa265..937618670b 100644
--- a/data/reusables/organizations/org-settings-repository-roles.md
+++ b/data/reusables/organizations/org-settings-repository-roles.md
@@ -1,2 +1 @@
-4. In the left sidebar, click **Repository roles**.
-  ![Repository roles tab in organization settings](/assets/images/help/organizations/org-settings-repository-roles.png)
+1. In the "Access" section of the sidebar, click **{% octicon "id-badge" aria-label="The ID badge icon" %} Repository roles**.
diff --git a/data/reusables/organizations/repository-defaults.md b/data/reusables/organizations/repository-defaults.md
index 0f7fb9558a..05d921fb76 100644
--- a/data/reusables/organizations/repository-defaults.md
+++ b/data/reusables/organizations/repository-defaults.md
@@ -1,2 +1,6 @@
+{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %}
+1. In the "Code, planning, and automation" section of the sidebar, select **{% octicon "repo" aria-label="The repo icon" %} Repository**, then click **Repository defaults**.
+{% elsif ghes < 3.4 or ghae %}
 1. In the left sidebar, click **Repository defaults**.
   ![Repository defaults tab](/assets/images/help/organizations/repo-defaults-tab.png)
+{% endif %}
diff --git a/data/reusables/organizations/repository-labels.md b/data/reusables/organizations/repository-labels.md
index bee6f82a84..60327b06b3 100644
--- a/data/reusables/organizations/repository-labels.md
+++ b/data/reusables/organizations/repository-labels.md
@@ -1,2 +1 @@
 1. In the left sidebar, click **Repository labels**.
-  ![Repository labels tab](/assets/images/help/organizations/repo-labels-tab.png)
diff --git a/data/reusables/organizations/security-and-analysis.md b/data/reusables/organizations/security-and-analysis.md
index 69378afa5c..9ab6f7bfe5 100644
--- a/data/reusables/organizations/security-and-analysis.md
+++ b/data/reusables/organizations/security-and-analysis.md
@@ -1,2 +1,6 @@
+{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %}
+1. In the "Security" section of the sidebar, click **{% octicon "codescan" aria-label="The codescan icon" %} Code security and analysis**.
+{% elsif ghes < 3.4 or ghae %}
 1. In the left sidebar, click **Security & analysis**.
   !["Security & analysis" tab in organization settings](/assets/images/help/organizations/org-settings-security-and-analysis.png)
+{% endif %}
diff --git a/data/reusables/organizations/verified-domains.md b/data/reusables/organizations/verified-domains.md
index 5f7c721ab7..83b44b4715 100644
--- a/data/reusables/organizations/verified-domains.md
+++ b/data/reusables/organizations/verified-domains.md
@@ -1,2 +1,6 @@
+{% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5658 %}
+1. In the "Security" section of the sidebar, click **{% octicon "verified" aria-label="The verified icon" %} Verified and approved domains**.
+{% elsif ghes < 3.4 or ghae %}
 1. In the left sidebar, click **Verified & approved domains**.
 !["Verified & approved domains" tab](/assets/images/help/organizations/verified-domains-button.png)
+{% endif %}
diff --git a/data/reusables/reminders/scheduled-reminders.md b/data/reusables/reminders/scheduled-reminders.md
index b30754d943..b45b072c3c 100644
--- a/data/reusables/reminders/scheduled-reminders.md
+++ b/data/reusables/reminders/scheduled-reminders.md
@@ -1 +1 @@
-1. In the left sidebar, click **Scheduled reminders**.
+1. In the "Integrations" section of the sidebar, click **{% octicon "clock" aria-label="The clock icon" %} Scheduled reminders**.