diff --git a/resources/svg/icons/light/settings.svg b/resources/svg/icons/light/settings.svg
new file mode 100644
index 0000000000..ad0b032e52
--- /dev/null
+++ b/resources/svg/icons/light/settings.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-0.335 -0.335 16 16"><path d="M12.937 8.623h1.435a.639.639 0 00.639-.639v-.638a.639.639 0 00-.64-.64h-1.434a7.537 7.537 0 00-.64-1.866l1.016-1.014a.639.639 0 000-.903l-.906-.903a.639.639 0 00-.903 0l-1.016 1.015a7.517 7.517 0 00-1.865-.639V.958A.639.639 0 007.984.32h-.638a.639.639 0 00-.64.64v1.436a7.523 7.523 0 00-1.865.638L3.825 2.02a.639.639 0 00-.903 0l-.904.904a.639.639 0 000 .903l1.016 1.015a7.55 7.55 0 00-.639 1.866H.958a.639.639 0 00-.639.638v.639a.639.639 0 00.64.639h1.434a7.55 7.55 0 00.639 1.866l-1.016 1.015a.639.639 0 000 .903l.906.904a.639.639 0 00.903 0l1.015-1.016a7.537 7.537 0 001.867.639v1.437a.639.639 0 00.639.639h.638a.639.639 0 00.64-.64v-1.433a7.537 7.537 0 001.864-.639l1.017 1.015a.639.639 0 00.903 0l.903-.903a.639.639 0 000-.903l-1.015-1.016a7.55 7.55 0 00.641-1.869z" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width=".67"/><path d="M4.79 7.666a2.874 2.874 0 105.75 0 2.874 2.874 0 10-5.75 0" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width=".67"/></svg>
diff --git a/resources/views/partials/global-header.blade.php b/resources/views/partials/global-header.blade.php
index 6476a5f390..c87afb9d67 100644
--- a/resources/views/partials/global-header.blade.php
+++ b/resources/views/partials/global-header.blade.php
@@ -56,16 +56,6 @@
             </a>
         @endif
 
-        <dropdown-list v-cloak>
-            <template v-slot:trigger>
-                <button class="hidden md:block h-6 w-6 rtl:mr-4 ltr:ml-4 p-1 text-gray hover:text-gray-800" v-tooltip="__('Preferences')" aria-label="{{ __('Manage Preferences') }}">
-                    @cp_svg('icons/light/cog')
-                </button>
-            </template>
-            <dropdown-item :text="__('Preferences')" redirect="{{ route('statamic.cp.preferences.index') }}"></dropdown-item>
-            <dropdown-item :text="__('CP Nav')" redirect="{{ route('statamic.cp.preferences.nav.index') }}"></dropdown-item>
-        </dropdown-list>
-
         <dropdown-list v-cloak>
             <template v-slot:trigger>
                 <button class="hidden md:block h-6 w-6 rtl:mr-4 ltr:ml-4 p-1 text-gray hover:text-gray-800" v-tooltip="__('Useful Links')" aria-label="{{ __('View Useful Links') }}">
diff --git a/routes/cp.php b/routes/cp.php
index 716ceb63c1..87f836d49f 100644
--- a/routes/cp.php
+++ b/routes/cp.php
@@ -324,20 +324,21 @@
         Route::post('js', [PreferenceController::class, 'store'])->name('store');
         Route::delete('js/{key}', [PreferenceController::class, 'destroy'])->name('destroy');
 
-        Route::group(['prefix' => 'nav', 'as' => 'nav.'], function () {
-            Route::get('/', [NavController::class, 'index'])->name('index');
-            Route::get('edit', [UserNavController::class, 'edit'])->name('user.edit');
-            Route::patch('/', [UserNavController::class, 'update'])->name('user.update');
-            Route::delete('/', [UserNavController::class, 'destroy'])->name('user.destroy');
-
-            Route::middleware([RequireStatamicPro::class, 'can:manage preferences'])->group(function () {
-                Route::get('roles/{role}/edit', [RoleNavController::class, 'edit'])->name('role.edit');
-                Route::patch('roles/{role}', [RoleNavController::class, 'update'])->name('role.update');
-                Route::delete('roles/{role}', [RoleNavController::class, 'destroy'])->name('role.destroy');
-                Route::get('default/edit', [DefaultNavController::class, 'edit'])->name('default.edit');
-                Route::patch('default', [DefaultNavController::class, 'update'])->name('default.update');
-                Route::delete('default', [DefaultNavController::class, 'destroy'])->name('default.destroy');
-            });
+    });
+
+    Route::group(['prefix' => 'nav', 'as' => 'preferences.nav.'], function () {
+        Route::get('/', [NavController::class, 'index'])->name('index');
+        Route::get('edit', [UserNavController::class, 'edit'])->name('user.edit');
+        Route::patch('/', [UserNavController::class, 'update'])->name('user.update');
+        Route::delete('/', [UserNavController::class, 'destroy'])->name('user.destroy');
+
+        Route::middleware([RequireStatamicPro::class, 'can:manage preferences'])->group(function () {
+            Route::get('roles/{role}/edit', [RoleNavController::class, 'edit'])->name('role.edit');
+            Route::patch('roles/{role}', [RoleNavController::class, 'update'])->name('role.update');
+            Route::delete('roles/{role}', [RoleNavController::class, 'destroy'])->name('role.destroy');
+            Route::get('default/edit', [DefaultNavController::class, 'edit'])->name('default.edit');
+            Route::patch('default', [DefaultNavController::class, 'update'])->name('default.update');
+            Route::delete('default', [DefaultNavController::class, 'destroy'])->name('default.destroy');
         });
     });
 
diff --git a/src/CP/Navigation/CoreNav.php b/src/CP/Navigation/CoreNav.php
index 8d19a6b8a2..45c6616a22 100644
--- a/src/CP/Navigation/CoreNav.php
+++ b/src/CP/Navigation/CoreNav.php
@@ -36,6 +36,7 @@ public static function make()
             ->makeContentSection()
             ->makeFieldsSection()
             ->makeToolsSection()
+            ->makeSettingsSection()
             ->makeUsersSection();
     }
 
@@ -147,11 +148,6 @@ protected function makeContentSection()
                     })->filter();
             });
 
-        Nav::content(Site::multiEnabled() ? 'Sites' : 'Site')
-            ->route('sites.edit')
-            ->icon('/sites')
-            ->can('configure sites');
-
         return $this;
     }
 
@@ -213,7 +209,7 @@ protected function makeToolsSection()
                 ->can('resolve duplicate ids');
         }
 
-        $this->makeUtilitiesSection();
+        $this->makeUtilitiesItems();
 
         if (config('statamic.graphql.enabled') && Statamic::pro()) {
             Nav::tools('GraphQL')
@@ -226,7 +222,12 @@ protected function makeToolsSection()
         return $this;
     }
 
-    protected function makeUtilitiesSection()
+    /**
+     * Make utilities items.
+     *
+     * @return $this
+     */
+    protected function makeUtilitiesItems()
     {
         $utilities = Utility::authorized()->sortBy->navTitle()->map(function ($utility) {
             return Nav::item($utility->navTitle())->url($utility->url());
@@ -242,6 +243,29 @@ protected function makeUtilitiesSection()
         return $this;
     }
 
+    /**
+     * Make settings section items.
+     *
+     * @return $this
+     */
+    protected function makeSettingsSection()
+    {
+        Nav::settings(Site::multiEnabled() ? 'Sites' : 'Site')
+            ->route('sites.edit')
+            ->icon('/sites')
+            ->can('configure sites');
+
+        Nav::settings('Preferences')
+            ->route('preferences.index')
+            ->icon('/settings')
+            ->children([
+                Nav::item('General')->route('preferences.index'),
+                Nav::item('CP Nav')->route('preferences.nav.index'),
+            ]);
+
+        return $this;
+    }
+
     /**
      * Make users section items.
      *
diff --git a/src/Exceptions/SiteNotFoundException.php b/src/Exceptions/SiteNotFoundException.php
index 879d551b13..45387c7621 100644
--- a/src/Exceptions/SiteNotFoundException.php
+++ b/src/Exceptions/SiteNotFoundException.php
@@ -22,7 +22,7 @@ public function __construct($siteHandle)
     public function getSolution(): Solution
     {
         return BaseSolution::create("The [{$this->siteHandle}] site was not found.")
-            ->setSolutionDescription('Check the spelling of the site handle in your [content/sites.yaml].')
+            ->setSolutionDescription('Check the spelling of the site handle in your [resources/sites.yaml].')
             ->setDocumentationLinks([
                 'Read the multi-site guide' => Statamic::docsUrl('/multi-site#configuration'),
             ]);
diff --git a/src/Sites/Sites.php b/src/Sites/Sites.php
index 68a61be59c..8ed35aee50 100644
--- a/src/Sites/Sites.php
+++ b/src/Sites/Sites.php
@@ -118,7 +118,7 @@ public function setSiteValue(string $site, string $key, $value): self
 
     public function path(): string
     {
-        return base_path('content/sites.yaml');
+        return resource_path('sites.yaml');
     }
 
     protected function getSavedSites()
diff --git a/src/UpdateScripts/MigrateSitesConfigToYaml.php b/src/UpdateScripts/MigrateSitesConfigToYaml.php
index a68704cb96..e08ee2caed 100644
--- a/src/UpdateScripts/MigrateSitesConfigToYaml.php
+++ b/src/UpdateScripts/MigrateSitesConfigToYaml.php
@@ -16,7 +16,7 @@ public function shouldUpdate($newVersion, $oldVersion)
     public function update()
     {
         // Skip if already migrated
-        if (File::exists(base_path('content/sites.yaml'))) {
+        if (File::exists(resource_path('sites.yaml'))) {
             return;
         }
 
@@ -39,7 +39,7 @@ public function update()
             ->ensureMultisiteConfigEnabled($sites)
             ->removeOldSitesConfigFile();
 
-        $this->console->info('Successfully migrated [config/statamic/sites.php] to [content/sites.yaml]!');
+        $this->console->info('Successfully migrated [config/statamic/sites.php] to [resources/sites.yaml]!');
     }
 
     private function migrateSites($path)
diff --git a/tests/CP/Navigation/CoreNavTest.php b/tests/CP/Navigation/CoreNavTest.php
index 8f84acc365..eb80582ab0 100644
--- a/tests/CP/Navigation/CoreNavTest.php
+++ b/tests/CP/Navigation/CoreNavTest.php
@@ -21,9 +21,10 @@ public function it_can_build_a_default_nav()
     {
         $expected = collect([
             'Top Level' => ['Dashboard', 'Playground'],
-            'Content' => ['Collections', 'Navigation', 'Taxonomies', 'Assets', 'Globals', 'Site'],
+            'Content' => ['Collections', 'Navigation', 'Taxonomies', 'Assets', 'Globals'],
             'Fields' => ['Blueprints', 'Fieldsets'],
             'Tools' => ['Forms', 'Updates', 'Addons', 'Utilities', 'GraphQL'],
+            'Settings' => ['Site', 'Preferences'],
             'Users' => ['Users', 'Groups', 'Permissions'],
         ]);
 
@@ -35,6 +36,7 @@ public function it_can_build_a_default_nav()
         $this->assertEquals($expected->get('Content'), $nav->get('Content')->map->display()->all());
         $this->assertEquals($expected->get('Fields'), $nav->get('Fields')->map->display()->all());
         $this->assertEquals($expected->get('Tools'), $nav->get('Tools')->map->display()->all());
+        $this->assertEquals($expected->get('Settings'), $nav->get('Settings')->map->display()->all());
         $this->assertEquals($expected->get('Users'), $nav->get('Users')->map->display()->all());
     }
 
@@ -48,8 +50,8 @@ public function it_builds_plural_sites_item_when_multisite_is_enabled()
         $nav = $this->build();
 
         $this->assertEquals(
-            ['Collections', 'Navigation', 'Taxonomies', 'Assets', 'Globals', 'Sites'],
-            $nav->get('Content')->map->display()->all()
+            ['Sites', 'Preferences'],
+            $nav->get('Settings')->map->display()->all()
         );
     }
 
diff --git a/tests/CP/Navigation/NavPreferencesTest.php b/tests/CP/Navigation/NavPreferencesTest.php
index fe4d66cdb7..ca9054a88e 100644
--- a/tests/CP/Navigation/NavPreferencesTest.php
+++ b/tests/CP/Navigation/NavPreferencesTest.php
@@ -28,11 +28,11 @@ public function setUp(): void
     /** @test */
     public function it_can_reorder_sections()
     {
-        $defaultSections = ['Top Level', 'Content', 'Fields', 'Tools', 'Users'];
+        $defaultSections = ['Top Level', 'Content', 'Fields', 'Tools', 'Settings', 'Users'];
 
         $this->assertEquals($defaultSections, $this->buildDefaultNav()->keys()->all());
 
-        $reorderedSections = ['Top Level', 'Users', 'Fields', 'Content', 'Tools'];
+        $reorderedSections = ['Top Level', 'Users', 'Fields', 'Content', 'Tools', 'Settings'];
 
         // Recommended syntax...
         $this->assertEquals($reorderedSections, $this->buildNavWithPreferences([
@@ -43,6 +43,7 @@ public function it_can_reorder_sections()
                 'fields' => '@inherit',
                 'content' => '@inherit',
                 'tools' => '@inherit',
+                'settings' => '@inherit',
             ],
         ])->keys()->all());
 
@@ -126,11 +127,11 @@ public function it_can_reorder_sections()
     /** @test */
     public function it_can_reorder_items_within_sections()
     {
-        $defaultContentItems = ['Collections', 'Navigation', 'Taxonomies', 'Assets', 'Globals', 'Site'];
+        $defaultContentItems = ['Collections', 'Navigation', 'Taxonomies', 'Assets', 'Globals'];
 
         $this->assertEquals($defaultContentItems, $this->buildDefaultNav()->get('Content')->map->display()->all());
 
-        $reorderedContentItems = ['Globals', 'Taxonomies', 'Collections', 'Navigation', 'Assets', 'Site'];
+        $reorderedContentItems = ['Globals', 'Taxonomies', 'Collections', 'Navigation', 'Assets'];
 
         // Recommended syntax...
         $this->assertEquals($reorderedContentItems, $this->buildNavWithPreferences([
@@ -361,11 +362,11 @@ public function it_does_nothing_with_inherit_actions_when_not_reordering()
     /** @test */
     public function it_can_rename_sections()
     {
-        $defaultSections = ['Top Level', 'Content', 'Fields', 'Tools', 'Users'];
+        $defaultSections = ['Top Level', 'Content', 'Fields', 'Tools', 'Settings', 'Users'];
 
         $this->assertEquals($defaultSections, $this->buildDefaultNav()->keys()->all());
 
-        $renamedSections = ['Top Level', 'Data', 'Fields', 'Tools', 'Pals'];
+        $renamedSections = ['Top Level', 'Data', 'Fields', 'Tools', 'Settings', 'Pals'];
 
         // Recommended syntax...
         $this->assertEquals($renamedSections, $this->buildNavWithPreferences([
@@ -399,7 +400,7 @@ public function it_can_rename_sections()
             ],
         ]);
         $this->assertNull($nav->get('Content'));
-        $this->assertEquals(['Collections', 'Navigation', 'Taxonomies', 'Assets', 'Globals', 'Site'], $nav->get('Data')->map->display()->all());
+        $this->assertEquals(['Collections', 'Navigation', 'Taxonomies', 'Assets', 'Globals'], $nav->get('Data')->map->display()->all());
         $this->assertNull($nav->get('Users'));
         $this->assertEquals(['Users', 'Groups', 'Permissions'], $nav->get('Pals')->map->display()->all());
     }
@@ -507,7 +508,7 @@ public function it_can_alias_items_within_a_section()
                 'content::collections::pages' => '@alias',
             ],
         ]);
-        $this->assertEquals(['Collections', 'Navigation', 'Taxonomies', 'Assets', 'Globals', 'Site', 'Pages'], $nav->get('Content')->map->display()->all());
+        $this->assertEquals(['Collections', 'Navigation', 'Taxonomies', 'Assets', 'Globals', 'Pages'], $nav->get('Content')->map->display()->all());
         $this->assertArrayHasKey('Pages', $nav->get('Content')->keyBy->display()->get('Collections')->resolveChildren()->children()->keyBy->display()->all());
         $this->assertArrayHasKey('Articles', $nav->get('Content')->keyBy->display()->get('Collections')->resolveChildren()->children()->keyBy->display()->all());
     }
@@ -672,11 +673,11 @@ public function it_can_move_items_into_another_section()
     /** @test */
     public function it_can_hide_sections()
     {
-        $defaultSections = ['Top Level', 'Content', 'Fields', 'Tools', 'Users'];
+        $defaultSections = ['Top Level', 'Content', 'Fields', 'Tools', 'Settings', 'Users'];
 
         $this->assertEquals($defaultSections, $this->buildDefaultNav()->keys()->all());
 
-        $sectionsAfterHiding = ['Top Level', 'Fields', 'Tools'];
+        $sectionsAfterHiding = ['Top Level', 'Fields', 'Tools', 'Settings'];
 
         // Recommended syntax...
         $this->assertEquals($sectionsAfterHiding, $this->buildNavWithPreferences([
@@ -706,11 +707,11 @@ public function it_can_hide_sections()
     /** @test */
     public function it_can_hide_items_from_a_section()
     {
-        $defaultContentItems = ['Collections', 'Navigation', 'Taxonomies', 'Assets', 'Globals', 'Site'];
+        $defaultContentItems = ['Collections', 'Navigation', 'Taxonomies', 'Assets', 'Globals'];
 
         $this->assertEquals($defaultContentItems, $this->buildDefaultNav()->get('Content')->map->display()->all());
 
-        $itemsAfterHiding = ['Collections', 'Taxonomies', 'Assets', 'Site'];
+        $itemsAfterHiding = ['Collections', 'Taxonomies', 'Assets'];
 
         // Recommended syntax...
         $this->assertEquals($itemsAfterHiding, $this->buildNavWithPreferences([
@@ -1423,11 +1424,11 @@ public function it_can_rename_extended_sections_that_dont_follow_title_case_conv
                 ->url('/cp/seo-pro');
         });
 
-        $defaultSections = ['Top Level', 'Content', 'Fields', 'Tools', 'Users', 'SEO pro'];
+        $defaultSections = ['Top Level', 'Content', 'Fields', 'Tools', 'Settings', 'Users', 'SEO pro'];
 
         $this->assertEquals($defaultSections, $this->buildDefaultNav()->keys()->all());
 
-        $renamedSections = ['Top Level', 'Content', 'Fields', 'Tools', 'Users', 'SEO Pro Renamed'];
+        $renamedSections = ['Top Level', 'Content', 'Fields', 'Tools', 'Settings', 'Users', 'SEO Pro Renamed'];
 
         $this->assertEquals($renamedSections, $this->buildNavWithPreferences([
             'seo_pro' => [
@@ -1450,11 +1451,11 @@ public function it_can_hide_extended_sections_that_dont_follow_title_case_conven
                 ]);
         });
 
-        $defaultSections = ['Top Level', 'Content', 'Fields', 'Tools', 'Users', 'SEO pro'];
+        $defaultSections = ['Top Level', 'Content', 'Fields', 'Tools', 'Settings', 'Users', 'SEO pro'];
 
         $this->assertEquals($defaultSections, $this->buildDefaultNav()->keys()->all());
 
-        $renamedSections = ['Top Level', 'Content', 'Fields', 'Tools', 'Users'];
+        $renamedSections = ['Top Level', 'Content', 'Fields', 'Tools', 'Settings', 'Users'];
 
         $this->assertEquals($renamedSections, $this->buildNavWithPreferences([
             'seo_pro' => [
@@ -1472,7 +1473,7 @@ public function it_can_create_new_items_in_extended_sections_that_dont_follow_ti
                 ->url('/cp/seo-pro');
         });
 
-        $defaultSections = ['Top Level', 'Content', 'Fields', 'Tools', 'Users', 'SEO pro'];
+        $defaultSections = ['Top Level', 'Content', 'Fields', 'Tools', 'Settings', 'Users', 'SEO pro'];
 
         $this->assertEquals($defaultSections, $this->buildDefaultNav()->keys()->all());
 
@@ -1486,7 +1487,7 @@ public function it_can_create_new_items_in_extended_sections_that_dont_follow_ti
             ],
         ]);
 
-        $this->assertEquals(['Top Level', 'Content', 'Fields', 'Tools', 'Users', 'SEO pro'], $nav->keys()->all());
+        $this->assertEquals(['Top Level', 'Content', 'Fields', 'Tools', 'Settings', 'Users', 'SEO pro'], $nav->keys()->all());
         $this->assertEquals(['SEO Settings', 'New Item'], $nav->get('SEO pro')->map->display()->all());
     }
 
@@ -1499,7 +1500,7 @@ public function it_hides_section_when_all_items_are_moved_out_of_section()
                 ->url('/cp/seo-pro');
         });
 
-        $defaultSections = ['Top Level', 'Content', 'Fields', 'Tools', 'Users', 'SEO Pro'];
+        $defaultSections = ['Top Level', 'Content', 'Fields', 'Tools', 'Settings', 'Users', 'SEO Pro'];
 
         $this->assertEquals($defaultSections, $this->buildDefaultNav()->keys()->all());
 
@@ -1516,10 +1517,10 @@ public function it_hides_section_when_all_items_are_moved_out_of_section()
         ], true);
 
         // Since we moved the SEO item to top level, it should hide SEO section by default...
-        $this->assertEquals(['Top Level', 'Content', 'Fields', 'Tools', 'Users'], $nav->keys()->all());
+        $this->assertEquals(['Top Level', 'Content', 'Fields', 'Tools', 'Settings', 'Users'], $nav->keys()->all());
 
         // But still show empty section when `withHidden` flag is true, so that user can re-add items to this core/extended section...
-        $this->assertEquals(['Top Level', 'Content', 'Fields', 'Tools', 'Users', 'SEO Pro'], $navWithHidden->keys()->all());
+        $this->assertEquals(['Top Level', 'Content', 'Fields', 'Tools', 'Settings', 'Users', 'SEO Pro'], $navWithHidden->keys()->all());
         $this->assertTrue($navWithHidden->get('SEO Pro')->isEmpty());
     }
 
@@ -1579,7 +1580,7 @@ public function it_builds_out_an_example_config()
         ]);
 
         // Assert section order, with section rename from 'Content' to 'Site'
-        $this->assertEquals(['Top Level', 'Tools', 'Users', 'Site', 'Fields'], $nav->keys()->all());
+        $this->assertEquals(['Top Level', 'Tools', 'Users', 'Site', 'Fields', 'Settings'], $nav->keys()->all());
 
         // Assert top level items, with aliased 'Pages' item
         $this->assertEquals([
@@ -1612,7 +1613,6 @@ public function it_builds_out_an_example_config()
             'Blueprints' => 'http://localhost/cp/fields/blueprints',
             'Flickr' => 'https://flickr.com',
             'Fieldsets' => 'http://localhost/cp/fields/fieldsets?modified',
-            'Site' => 'http://localhost/cp/sites',
         ], $nav->get('Site')->mapWithKeys(fn ($i) => [$i->display() => $i->url()])->all());
 
         // The `Fields` section was not explicitly defined in config, but `Blueprints` should be gone due to `@move`
@@ -1638,7 +1638,7 @@ public function it_can_build_with_hidden_items()
             ],
         ], true)->get('Content');
 
-        $this->assertEquals(['Collections', 'Navigation', 'Taxonomies', 'Assets', 'Globetrotters', 'Site'], $contentItems->map->display()->all());
+        $this->assertEquals(['Collections', 'Navigation', 'Taxonomies', 'Assets', 'Globetrotters'], $contentItems->map->display()->all());
 
         $this->assertEquals('@hide', $contentItems->keyBy->display()->get('Navigation')->manipulations()['action']);
         $this->assertEquals('@modify', $contentItems->keyBy->display()->get('Globetrotters')->manipulations()['action']);
diff --git a/tests/CP/Navigation/NavTransformerTest.php b/tests/CP/Navigation/NavTransformerTest.php
index 2c21180f8e..3cbc589556 100644
--- a/tests/CP/Navigation/NavTransformerTest.php
+++ b/tests/CP/Navigation/NavTransformerTest.php
@@ -821,7 +821,6 @@ public function it_can_reorder_items()
                     ['id' => 'content::assets'],
                     ['id' => 'content::collections'],
                     ['id' => 'content::globals'],
-                    ['id' => 'content::site'],
                 ],
             ],
         ]);
@@ -1042,6 +1041,7 @@ public function it_can_reorder_sections()
             ['display_original' => 'Fields'],
             ['display_original' => 'Tools'],
             ['display_original' => 'Content'],
+            ['display_original' => 'Settings'],
             ['display_original' => 'Users'],
         ]);
 
@@ -1051,7 +1051,7 @@ public function it_can_reorder_sections()
                 'top_level' => '@inherit',
                 'fields' => '@inherit',
                 'tools' => '@inherit',
-                // 'Content' and 'Users' sections are omitted because they are redundant in this case
+                // 'Content', 'Settings', and 'Users' sections are omitted because they are redundant in this case
             ],
         ];
 
@@ -1294,7 +1294,6 @@ public function it_can_transform_complex_json_payload_copied_from_actual_vue_sub
                         ],
                         'content::navigation' => '@inherit',
                         'content::taxonomies' => '@inherit',
-                        'content::assets' => '@inherit',
                     ],
                 ],
                 'custom_section' => [
diff --git a/tests/Sites/SitesConfigTest.php b/tests/Sites/SitesConfigTest.php
index d2d318bcd3..6061cf8466 100644
--- a/tests/Sites/SitesConfigTest.php
+++ b/tests/Sites/SitesConfigTest.php
@@ -21,7 +21,7 @@ public function setUp(): void
     {
         parent::setUp();
 
-        File::put($this->yamlPath = base_path('content/sites.yaml'), YAML::dump([
+        File::put($this->yamlPath = resource_path('sites.yaml'), YAML::dump([
             'english' => [
                 'name' => 'English',
                 'url' => '/',
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 33f79f9acc..fea6683d98 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -42,7 +42,7 @@ protected function setUp(): void
         $this->addGqlMacros();
 
         // We changed the default sites setup but the tests assume defaults like the following.
-        File::put(base_path('content/sites.yaml'), YAML::dump([
+        File::put(resource_path('sites.yaml'), YAML::dump([
             'en' => [
                 'name' => 'English',
                 'url' => 'http://localhost/',
diff --git a/tests/UpdateScripts/MigrateSitesConfigToYamlTest.php b/tests/UpdateScripts/MigrateSitesConfigToYamlTest.php
index fb4dea4817..500139d17a 100644
--- a/tests/UpdateScripts/MigrateSitesConfigToYamlTest.php
+++ b/tests/UpdateScripts/MigrateSitesConfigToYamlTest.php
@@ -22,7 +22,7 @@ public function setUp(): void
         File::copy(__DIR__.'/__fixtures__/v4/config/system.php', config_path('statamic/system.php'));
 
         // Delete default sites.yaml, since base test copies one in
-        File::delete(base_path('content/sites.yaml'));
+        File::delete(resource_path('sites.yaml'));
     }
 
     public function tearDown(): void
@@ -330,7 +330,7 @@ private function migrateSitesConfig()
         $this->assertFileDoesNotExist(config_path('statamic/sites.php'));
         $this->assertNull(config('statamic.sites.sites'));
 
-        $this->assertFileExists(base_path('content/sites.yaml'));
+        $this->assertFileExists(resource_path('sites.yaml'));
     }
 
     private function assertMultisiteEnabledConfigIs($boolean)
@@ -381,6 +381,6 @@ private function assertMultisiteEnabledConfigIs($boolean)
 
     private function assertSitesYamlHas($sites)
     {
-        $this->assertSame($sites, YAML::file(base_path('content/sites.yaml'))->parse());
+        $this->assertSame($sites, YAML::file(resource_path('sites.yaml'))->parse());
     }
 }