diff --git a/src/core/server/ui_settings/settings/accessibility.ts b/src/core/server/ui_settings/settings/accessibility.ts
index 1238ae58d922..56fef57de84b 100644
--- a/src/core/server/ui_settings/settings/accessibility.ts
+++ b/src/core/server/ui_settings/settings/accessibility.ts
@@ -43,7 +43,7 @@ export const getAccessibilitySettings = (): Record<string, UiSettingsParams> =>
         defaultMessage:
           'Turn off all unnecessary animations in the OpenSearch Dashboards UI. Refresh the page to apply the changes.',
       }),
-      category: ['accessibility'],
+      category: ['appearance'],
       requiresPageReload: true,
       schema: schema.boolean(),
     },
diff --git a/src/core/server/ui_settings/settings/navigation.ts b/src/core/server/ui_settings/settings/navigation.ts
index 966e6a58127a..2ea04e180f03 100644
--- a/src/core/server/ui_settings/settings/navigation.ts
+++ b/src/core/server/ui_settings/settings/navigation.ts
@@ -77,6 +77,7 @@ export const getNavigationSettings = (): Record<string, UiSettingsParams> => {
           defaultMessage: 'Legacy',
         }),
       },
+      category: ['appearance'],
       schema: schema.oneOf([schema.literal('modern'), schema.literal('legacy')]),
     },
   };
diff --git a/src/core/server/ui_settings/settings/theme.ts b/src/core/server/ui_settings/settings/theme.ts
index 9ac7cf6aa1a6..94dec047ff35 100644
--- a/src/core/server/ui_settings/settings/theme.ts
+++ b/src/core/server/ui_settings/settings/theme.ts
@@ -43,6 +43,7 @@ export const getThemeSettings = (): Record<string, UiSettingsParams> => {
         defaultMessage: `Enable a dark mode for the OpenSearch Dashboards UI. A page refresh is required for the setting to be applied.`,
       }),
       requiresPageReload: true,
+      category: ['appearance'],
       schema: schema.boolean(),
     },
     'theme:version': {
@@ -53,9 +54,14 @@ export const getThemeSettings = (): Record<string, UiSettingsParams> => {
       type: 'select',
       options: ['v7', 'Next (preview)'],
       description: i18n.translate('core.ui_settings.params.themeVersionText', {
-        defaultMessage: `Switch between the theme used for the current and next version of OpenSearch Dashboards, A page refresh is required for the setting to be applied.`,
+        defaultMessage: `<p>Switch between the themes used for the current and next versions of OpenSearch Dashboards. A page refresh is required for the setting to be applied.</p><p><a href="{href}">{linkText}</a></p>`,
+        values: {
+          href: 'https://forum.opensearch.org/t/feedback-on-dark-mode-experience/15725',
+          linkText: 'Theme feedback',
+        },
       }),
       requiresPageReload: true,
+      category: ['appearance'],
       schema: schema.oneOf([schema.literal('v7'), schema.literal('Next (preview)')]),
     },
   };
diff --git a/src/plugins/advanced_settings/public/management_app/components/form/__snapshots__/form.test.tsx.snap b/src/plugins/advanced_settings/public/management_app/components/form/__snapshots__/form.test.tsx.snap
index 645cc92d443f..c00da923a871 100644
--- a/src/plugins/advanced_settings/public/management_app/components/form/__snapshots__/form.test.tsx.snap
+++ b/src/plugins/advanced_settings/public/management_app/components/form/__snapshots__/form.test.tsx.snap
@@ -4,6 +4,7 @@ exports[`Form should not render no settings message when instructed not to 1`] =
 <Fragment>
   <div>
     <EuiPanel
+      id="general"
       paddingSize="l"
     >
       <EuiForm>
@@ -135,6 +136,7 @@ exports[`Form should not render no settings message when instructed not to 1`] =
       size="l"
     />
     <EuiPanel
+      id="dashboard"
       paddingSize="l"
     >
       <EuiForm>
@@ -193,6 +195,7 @@ exports[`Form should render no settings message when there are no settings 1`] =
 <Fragment>
   <div>
     <EuiPanel
+      id="general"
       paddingSize="l"
     >
       <EuiForm>
@@ -324,6 +327,7 @@ exports[`Form should render no settings message when there are no settings 1`] =
       size="l"
     />
     <EuiPanel
+      id="dashboard"
       paddingSize="l"
     >
       <EuiForm>
@@ -382,6 +386,7 @@ exports[`Form should render normally 1`] = `
 <Fragment>
   <div>
     <EuiPanel
+      id="general"
       paddingSize="l"
     >
       <EuiForm>
@@ -513,6 +518,7 @@ exports[`Form should render normally 1`] = `
       size="l"
     />
     <EuiPanel
+      id="dashboard"
       paddingSize="l"
     >
       <EuiForm>
@@ -571,6 +577,7 @@ exports[`Form should render read-only when saving is disabled 1`] = `
 <Fragment>
   <div>
     <EuiPanel
+      id="general"
       paddingSize="l"
     >
       <EuiForm>
@@ -702,6 +709,7 @@ exports[`Form should render read-only when saving is disabled 1`] = `
       size="l"
     />
     <EuiPanel
+      id="dashboard"
       paddingSize="l"
     >
       <EuiForm>
diff --git a/src/plugins/advanced_settings/public/management_app/components/form/form.tsx b/src/plugins/advanced_settings/public/management_app/components/form/form.tsx
index a74199771d2a..adf27cd48ec4 100644
--- a/src/plugins/advanced_settings/public/management_app/components/form/form.tsx
+++ b/src/plugins/advanced_settings/public/management_app/components/form/form.tsx
@@ -257,7 +257,7 @@ export class Form extends PureComponent<FormProps> {
   renderCategory(category: Category, settings: FieldSetting[], totalSettings: number) {
     return (
       <Fragment key={category}>
-        <EuiPanel paddingSize="l">
+        <EuiPanel paddingSize="l" id={category}>
           <EuiForm>
             <EuiText>
               <EuiFlexGroup alignItems="baseline">
diff --git a/src/plugins/advanced_settings/public/management_app/lib/get_category_name.ts b/src/plugins/advanced_settings/public/management_app/lib/get_category_name.ts
index fbc473ffdbf5..301374747f8b 100644
--- a/src/plugins/advanced_settings/public/management_app/lib/get_category_name.ts
+++ b/src/plugins/advanced_settings/public/management_app/lib/get_category_name.ts
@@ -36,6 +36,9 @@ const names: Record<string, string> = {
   general: i18n.translate('advancedSettings.categoryNames.generalLabel', {
     defaultMessage: 'General',
   }),
+  appearance: i18n.translate('advancedSettings.categoryNames.appearanceLabel', {
+    defaultMessage: 'Appearance',
+  }),
   timeline: i18n.translate('advancedSettings.categoryNames.timelineLabel', {
     defaultMessage: 'Timeline',
   }),