diff --git a/e2e-tests/cypress/tests/integration/channels/settings/display/theme/code_theme_colors_spec.js b/e2e-tests/cypress/tests/integration/channels/settings/display/theme/code_theme_colors_spec.js
index 45f09a9967..c2b0bbfd78 100644
--- a/e2e-tests/cypress/tests/integration/channels/settings/display/theme/code_theme_colors_spec.js
+++ b/e2e-tests/cypress/tests/integration/channels/settings/display/theme/code_theme_colors_spec.js
@@ -35,10 +35,10 @@ describe('Settings > Display > Theme > Custom Theme Colors', () => {
             cy.get('#customThemes').check().should('be.checked');
 
             // # Open Center Channel Styles section
-            cy.get('#centerChannelStyles').click({force: true}).wait(TIMEOUTS.ONE_HUNDRED_MILLIS);
+            cy.get('#centerChannelStylesAccordion').click({force: true}).wait(TIMEOUTS.ONE_HUNDRED_MILLIS);
 
             // # Select custom code theme
-            cy.get('#codeThemeSelect').should('be.visible').scrollIntoView().select(theme.name);
+            cy.get('#codeThemeSelect').scrollIntoView().should('be.visible').select(theme.name);
 
             // * Verify that the setting changes in the background?
             verifyLastPostStyle(theme);
diff --git a/webapp/channels/src/components/user_settings/display/user_settings_theme/custom_theme_chooser/__snapshots__/custom_theme_chooser.test.tsx.snap b/webapp/channels/src/components/user_settings/display/user_settings_theme/custom_theme_chooser/__snapshots__/custom_theme_chooser.test.tsx.snap
index 4eed442c91..482056efe1 100644
--- a/webapp/channels/src/components/user_settings/display/user_settings_theme/custom_theme_chooser/__snapshots__/custom_theme_chooser.test.tsx.snap
+++ b/webapp/channels/src/components/user_settings/display/user_settings_theme/custom_theme_chooser/__snapshots__/custom_theme_chooser.test.tsx.snap
@@ -2,33 +2,45 @@
 
 exports[`components/user_settings/display/CustomThemeChooser should match, init 1`] = `
 <div
+  aria-labelledby="customThemes"
   className="appearance-section pt-2"
+  id="customThemesSection"
 >
   <div
     className="theme-elements row"
   >
-    <div
+    <h4
       className="theme-elements__header"
-      id="sidebarStyles"
-      onClick={[Function]}
     >
-      <MemoizedFormattedMessage
-        defaultMessage="Sidebar Styles"
-        id="user.settings.custom_theme.sidebarTitle"
-      />
-      <div
-        className="header__icon"
+      <button
+        aria-controls="sidebarStylesSection"
+        aria-expanded={false}
+        className="theme-elements__header"
+        id="sidebarStylesAccordion"
+        onClick={[Function]}
       >
-        <i
-          className="fa fa-plus"
+        <MemoizedFormattedMessage
+          defaultMessage="Sidebar Styles"
+          id="user.settings.custom_theme.sidebarTitle"
         />
-        <i
-          className="fa fa-minus"
-        />
-      </div>
-    </div>
+        <div
+          className="header__icon"
+        >
+          <i
+            aria-hidden={true}
+            className="fa fa-plus"
+          />
+          <i
+            aria-hidden={true}
+            className="fa fa-minus"
+          />
+        </div>
+      </button>
+    </h4>
     <div
+      aria-labelledby="sidebarStylesAccordion"
       className="theme-elements__body"
+      id="sidebarStylesSection"
     >
       <div
         className="col-sm-6 form-group element"
@@ -259,29 +271,38 @@ exports[`components/user_settings/display/CustomThemeChooser should match, init
   <div
     className="theme-elements row"
   >
-    <div
+    <h4
       className="theme-elements__header"
-      id="centerChannelStyles"
-      onClick={[Function]}
     >
-      <MemoizedFormattedMessage
-        defaultMessage="Center Channel Styles"
-        id="user.settings.custom_theme.centerChannelTitle"
-      />
-      <div
-        className="header__icon"
+      <button
+        aria-controls="centerChannelStylesSection"
+        aria-expanded={false}
+        className="theme-elements__header"
+        id="centerChannelStylesAccordion"
+        onClick={[Function]}
       >
-        <i
-          className="fa fa-plus"
+        <MemoizedFormattedMessage
+          defaultMessage="Center Channel Styles"
+          id="user.settings.custom_theme.centerChannelTitle"
         />
-        <i
-          className="fa fa-minus"
-        />
-      </div>
-    </div>
+        <div
+          className="header__icon"
+        >
+          <i
+            aria-hidden={true}
+            className="fa fa-plus"
+          />
+          <i
+            aria-hidden={true}
+            className="fa fa-minus"
+          />
+        </div>
+      </button>
+    </h4>
     <div
+      aria-labelledby="centerChannelStylesAccordion"
       className="theme-elements__body"
-      id="centerChannelStyles"
+      id="centerChannelStylesSection"
     >
       <div
         className="col-sm-6 form-group element"
@@ -456,28 +477,38 @@ exports[`components/user_settings/display/CustomThemeChooser should match, init
   <div
     className="theme-elements row"
   >
-    <div
+    <h4
       className="theme-elements__header"
-      id="linkAndButtonsStyles"
-      onClick={[Function]}
     >
-      <MemoizedFormattedMessage
-        defaultMessage="Link and Button Styles"
-        id="user.settings.custom_theme.linkButtonTitle"
-      />
-      <div
-        className="header__icon"
+      <button
+        aria-controls="linkAndButtonsStylesSection"
+        aria-expanded={false}
+        className="theme-elements__header"
+        id="linkAndButtonsStylesAccordion"
+        onClick={[Function]}
       >
-        <i
-          className="fa fa-plus"
+        <MemoizedFormattedMessage
+          defaultMessage="Link and Button Styles"
+          id="user.settings.custom_theme.linkButtonTitle"
         />
-        <i
-          className="fa fa-minus"
-        />
-      </div>
-    </div>
+        <div
+          className="header__icon"
+        >
+          <i
+            aria-hidden={true}
+            className="fa fa-plus"
+          />
+          <i
+            aria-hidden={true}
+            className="fa fa-minus"
+          />
+        </div>
+      </button>
+    </h4>
     <div
+      aria-labelledby="linkAndButtonsStylesAccordion"
       className="theme-elements__body"
+      id="linkAndButtonsStylesSection"
     >
       <div
         className="col-sm-6 form-group element"
diff --git a/webapp/channels/src/components/user_settings/display/user_settings_theme/custom_theme_chooser/custom_theme_chooser.tsx b/webapp/channels/src/components/user_settings/display/user_settings_theme/custom_theme_chooser/custom_theme_chooser.tsx
index 62040fe8ec..09ee355d54 100644
--- a/webapp/channels/src/components/user_settings/display/user_settings_theme/custom_theme_chooser/custom_theme_chooser.tsx
+++ b/webapp/channels/src/components/user_settings/display/user_settings_theme/custom_theme_chooser/custom_theme_chooser.tsx
@@ -128,9 +128,9 @@ type State = {
 
 export class CustomThemeChooser extends React.PureComponent<Props, State> {
     textareaRef: RefObject<HTMLTextAreaElement>;
-    sidebarStylesHeaderRef: RefObject<HTMLDivElement>;
-    centerChannelStylesHeaderRef: RefObject<HTMLDivElement>;
-    linkAndButtonStylesHeaderRef: RefObject<HTMLDivElement>;
+    sidebarStylesHeaderRef: RefObject<HTMLButtonElement>;
+    centerChannelStylesHeaderRef: RefObject<HTMLButtonElement>;
+    linkAndButtonStylesHeaderRef: RefObject<HTMLButtonElement>;
     sidebarStylesRef: RefObject<HTMLDivElement>;
     centerChannelStylesRef: RefObject<HTMLDivElement>;
     linkAndButtonStylesRef: RefObject<HTMLDivElement>;
@@ -160,7 +160,7 @@ export class CustomThemeChooser extends React.PureComponent<Props, State> {
                 [settingId]: color,
             };
 
-            // For backwards compatability
+            // For backwards compatibility
             if (settingId === 'mentionBg') {
                 newTheme.mentionBj = color;
             }
@@ -220,24 +220,33 @@ export class CustomThemeChooser extends React.PureComponent<Props, State> {
         this.textareaRef.current?.setSelectionRange(0, this.state.copyTheme.length);
     };
 
-    toggleSidebarStyles = (e: MouseEvent<HTMLDivElement>) => {
+    toggleSidebarStyles = (e: MouseEvent<HTMLButtonElement>) => {
         e.preventDefault();
 
         this.sidebarStylesHeaderRef.current?.classList.toggle('open');
+
+        const isAccordionOpen = this.sidebarStylesHeaderRef.current?.classList.contains('open');
+        this.sidebarStylesHeaderRef.current?.setAttribute('aria-expanded', `${isAccordionOpen}`);
         this.toggleSection(this.sidebarStylesRef.current);
     };
 
-    toggleCenterChannelStyles = (e: MouseEvent<HTMLDivElement>) => {
+    toggleCenterChannelStyles = (e: MouseEvent<HTMLButtonElement>) => {
         e.preventDefault();
 
         this.centerChannelStylesHeaderRef.current?.classList.toggle('open');
+
+        const isAccordionOpen = this.centerChannelStylesHeaderRef.current?.classList.contains('open');
+        this.centerChannelStylesHeaderRef.current?.setAttribute('aria-expanded', `${isAccordionOpen}`);
         this.toggleSection(this.centerChannelStylesRef.current);
     };
 
-    toggleLinkAndButtonStyles = (e: MouseEvent<HTMLDivElement>) => {
+    toggleLinkAndButtonStyles = (e: MouseEvent<HTMLButtonElement>) => {
         e.preventDefault();
 
         this.linkAndButtonStylesHeaderRef.current?.classList.toggle('open');
+
+        const isAccordionOpen = this.linkAndButtonStylesHeaderRef.current?.classList.contains('open');
+        this.linkAndButtonStylesHeaderRef.current?.setAttribute('aria-expanded', `${isAccordionOpen}`);
         this.toggleSection(this.linkAndButtonStylesRef.current);
     };
 
@@ -448,91 +457,118 @@ export class CustomThemeChooser extends React.PureComponent<Props, State> {
         );
 
         return (
-            <div className='appearance-section pt-2'>
+            <div
+                id='customThemesSection'
+                className='appearance-section pt-2'
+                aria-labelledby='customThemes'
+            >
                 <div className='theme-elements row'>
-                    <div
-                        ref={this.sidebarStylesHeaderRef}
-                        id='sidebarStyles'
-                        className='theme-elements__header'
-                        onClick={this.toggleSidebarStyles}
-                    >
-                        <FormattedMessage
-                            id='user.settings.custom_theme.sidebarTitle'
-                            defaultMessage='Sidebar Styles'
-                        />
-                        <div className='header__icon'>
-                            <i
-                                className='fa fa-plus'
-                                title={intl.formatMessage({id: 'generic_icons.expand', defaultMessage: 'Expand Icon'})}
+                    <h4 className='theme-elements__header'>
+                        <button
+                            ref={this.sidebarStylesHeaderRef}
+                            id='sidebarStylesAccordion'
+                            onClick={this.toggleSidebarStyles}
+                            aria-expanded={false}
+                            aria-controls='sidebarStylesSection'
+                            className='theme-elements__header'
+                        >
+                            <FormattedMessage
+                                id='user.settings.custom_theme.sidebarTitle'
+                                defaultMessage='Sidebar Styles'
                             />
-                            <i
-                                className='fa fa-minus'
-                                title={intl.formatMessage({id: 'generic_icons.collapse', defaultMessage: 'Collapse Icon'})}
-                            />
-                        </div>
-                    </div>
+                            <div className='header__icon'>
+                                <i
+                                    className='fa fa-plus'
+                                    aria-hidden={true}
+                                    title={intl.formatMessage({id: 'generic_icons.expand', defaultMessage: 'Expand Icon'})}
+                                />
+                                <i
+                                    className='fa fa-minus'
+                                    aria-hidden={true}
+                                    title={intl.formatMessage({id: 'generic_icons.collapse', defaultMessage: 'Collapse Icon'})}
+                                />
+                            </div>
+                        </button>
+                    </h4>
                     <div
                         ref={this.sidebarStylesRef}
+                        id='sidebarStylesSection'
+                        aria-labelledby='sidebarStylesAccordion'
                         className='theme-elements__body'
                     >
                         {sidebarElements}
                     </div>
                 </div>
                 <div className='theme-elements row'>
-                    <div
-                        ref={this.centerChannelStylesHeaderRef}
-                        id='centerChannelStyles'
-                        className='theme-elements__header'
-                        onClick={this.toggleCenterChannelStyles}
-                    >
-                        <FormattedMessage
-                            id='user.settings.custom_theme.centerChannelTitle'
-                            defaultMessage='Center Channel Styles'
-                        />
-                        <div className='header__icon'>
-                            <i
-                                className='fa fa-plus'
-                                title={intl.formatMessage({id: 'generic_icons.expand', defaultMessage: 'Expand Icon'})}
+                    <h4 className='theme-elements__header'>
+                        <button
+                            ref={this.centerChannelStylesHeaderRef}
+                            id='centerChannelStylesAccordion'
+                            onClick={this.toggleCenterChannelStyles}
+                            aria-expanded={false}
+                            aria-controls='centerChannelStylesSection'
+                            className='theme-elements__header'
+                        >
+                            <FormattedMessage
+                                id='user.settings.custom_theme.centerChannelTitle'
+                                defaultMessage='Center Channel Styles'
                             />
-                            <i
-                                className='fa fa-minus'
-                                title={intl.formatMessage({id: 'generic_icons.collapse', defaultMessage: 'Collapse Icon'})}
-                            />
-                        </div>
-                    </div>
+                            <div className='header__icon'>
+                                <i
+                                    className='fa fa-plus'
+                                    aria-hidden={true}
+                                    title={intl.formatMessage({id: 'generic_icons.expand', defaultMessage: 'Expand Icon'})}
+                                />
+                                <i
+                                    className='fa fa-minus'
+                                    aria-hidden={true}
+                                    title={intl.formatMessage({id: 'generic_icons.collapse', defaultMessage: 'Collapse Icon'})}
+                                />
+                            </div>
+                        </button>
+                    </h4>
                     <div
                         ref={this.centerChannelStylesRef}
-                        id='centerChannelStyles'
+                        id='centerChannelStylesSection'
                         className='theme-elements__body'
+                        aria-labelledby='centerChannelStylesAccordion'
                     >
                         {centerChannelElements}
                     </div>
                 </div>
                 <div className='theme-elements row'>
-                    <div
-                        ref={this.linkAndButtonStylesHeaderRef}
-                        id='linkAndButtonsStyles'
-                        className='theme-elements__header'
-                        onClick={this.toggleLinkAndButtonStyles}
-                    >
-                        <FormattedMessage
-                            id='user.settings.custom_theme.linkButtonTitle'
-                            defaultMessage='Link and Button Styles'
-                        />
-                        <div className='header__icon'>
-                            <i
-                                className='fa fa-plus'
-                                title={intl.formatMessage({id: 'generic_icons.expand', defaultMessage: 'Expand Icon'})}
+                    <h4 className='theme-elements__header'>
+                        <button
+                            ref={this.linkAndButtonStylesHeaderRef}
+                            id='linkAndButtonsStylesAccordion'
+                            onClick={this.toggleLinkAndButtonStyles}
+                            aria-expanded={false}
+                            aria-controls='linkAndButtonsStylesSection'
+                            className='theme-elements__header'
+                        >
+                            <FormattedMessage
+                                id='user.settings.custom_theme.linkButtonTitle'
+                                defaultMessage='Link and Button Styles'
                             />
-                            <i
-                                className='fa fa-minus'
-                                title={intl.formatMessage({id: 'generic_icons.collapse', defaultMessage: 'Collapse Icon'})}
-                            />
-                        </div>
-                    </div>
+                            <div className='header__icon'>
+                                <i
+                                    className='fa fa-plus'
+                                    aria-hidden={true}
+                                    title={intl.formatMessage({id: 'generic_icons.expand', defaultMessage: 'Expand Icon'})}
+                                />
+                                <i
+                                    className='fa fa-minus'
+                                    aria-hidden={true}
+                                    title={intl.formatMessage({id: 'generic_icons.collapse', defaultMessage: 'Collapse Icon'})}
+                                />
+                            </div>
+                        </button>
+                    </h4>
                     <div
+                        id='linkAndButtonsStylesSection'
                         ref={this.linkAndButtonStylesRef}
                         className='theme-elements__body'
+                        aria-labelledby='linkAndButtonsStylesAccordion'
                     >
                         {linkAndButtonElements}
                     </div>
diff --git a/webapp/channels/src/components/user_settings/display/user_settings_theme/premade_theme_chooser/premade_theme_chooser.tsx b/webapp/channels/src/components/user_settings/display/user_settings_theme/premade_theme_chooser/premade_theme_chooser.tsx
index 4bc77c3e4d..a01d83d44c 100644
--- a/webapp/channels/src/components/user_settings/display/user_settings_theme/premade_theme_chooser/premade_theme_chooser.tsx
+++ b/webapp/channels/src/components/user_settings/display/user_settings_theme/premade_theme_chooser/premade_theme_chooser.tsx
@@ -39,9 +39,9 @@ const PremadeThemeChooser = ({theme, updateTheme, allowedThemes = []}: Props) =>
                     className='col-xs-6 col-sm-3 premade-themes'
                     key={'premade-theme-key' + k}
                 >
-                    <div
+                    <button
                         id={`premadeTheme${premadeTheme.type?.replace(' ', '')}`}
-                        className={activeClass}
+                        className={`premadeThemeButton ${activeClass}`}
                         onClick={() => updateTheme(premadeTheme)}
                     >
                         <label>
@@ -61,14 +61,18 @@ const PremadeThemeChooser = ({theme, updateTheme, allowedThemes = []}: Props) =>
                             />
                             <div className='theme-label'>{toTitleCase(premadeTheme.type || '')}</div>
                         </label>
-                    </div>
+                    </button>
                 </div>,
             );
         }
     }
 
     return (
-        <div className='row appearance-section'>
+        <div
+            id='premadeThemesSection'
+            className='row appearance-section'
+            aria-labelledby='standardThemes'
+        >
             <div className='clearfix'>
                 {premadeThemes}
             </div>
diff --git a/webapp/channels/src/components/user_settings/display/user_settings_theme/user_settings_theme.tsx b/webapp/channels/src/components/user_settings/display/user_settings_theme/user_settings_theme.tsx
index c9a6226e58..d343671590 100644
--- a/webapp/channels/src/components/user_settings/display/user_settings_theme/user_settings_theme.tsx
+++ b/webapp/channels/src/components/user_settings/display/user_settings_theme/user_settings_theme.tsx
@@ -195,6 +195,7 @@ export default class ThemeSetting extends React.PureComponent<Props, State> {
                                 name='theme'
                                 checked={!displayCustom}
                                 onChange={this.updateType.bind(this, 'premade')}
+                                aria-controls='premadeThemesSection'
                             />
                             <FormattedMessage
                                 id='user.settings.display.theme.themeColors'
@@ -206,8 +207,6 @@ export default class ThemeSetting extends React.PureComponent<Props, State> {
                 );
             }
 
-            inputs.push(premade);
-
             if (this.props.allowCustomThemes) {
                 inputs.push(
                     <div
@@ -221,6 +220,7 @@ export default class ThemeSetting extends React.PureComponent<Props, State> {
                                 name='theme'
                                 checked={displayCustom}
                                 onChange={this.updateType.bind(this, 'custom')}
+                                aria-controls='customThemesSection'
                             />
                             <FormattedMessage
                                 id='user.settings.display.theme.customTheme'
@@ -230,7 +230,7 @@ export default class ThemeSetting extends React.PureComponent<Props, State> {
                     </div>,
                 );
 
-                inputs.push(custom);
+                inputs.push(premade, custom);
 
                 inputs.push(
                     <div key='otherThemes'>
@@ -271,7 +271,19 @@ export default class ThemeSetting extends React.PureComponent<Props, State> {
 
             themeUI = (
                 <SettingItemMax
-                    inputs={inputs}
+                    inputs={
+                        <fieldset>
+                            <legend className='hidden-label'>
+                                <FormattedMessage
+                                    id='user.settings.display.theme.title'
+                                    defaultMessage='Theme'
+                                />
+                            </legend>
+                            <div>
+                                {inputs}
+                            </div>
+                        </fieldset>
+                    }
                     submitExtra={allTeamsCheckbox}
                     submit={this.submitTheme}
                     disableEnterSubmit={true}
diff --git a/webapp/channels/src/sass/routes/_settings.scss b/webapp/channels/src/sass/routes/_settings.scss
index 835d07c914..c5f129a249 100644
--- a/webapp/channels/src/sass/routes/_settings.scss
+++ b/webapp/channels/src/sass/routes/_settings.scss
@@ -371,6 +371,11 @@
                             white-space: nowrap;
                         }
 
+                        .premadeThemeButton{
+                            border: none;
+                            background: none;
+                        }
+
                         label {
                             width: 100%;
                         }
@@ -407,13 +412,22 @@
                     }
 
                     .theme-elements__header {
-                        padding: 1px 0 10px;
                         border-bottom: 1px solid;
                         margin: 10px 20px 0 0;
                         cursor: pointer;
                         font-size: functions.em(13.5px);
                         font-weight: 600;
 
+                        button {
+                            display: flex;
+                            width: 100%;
+                            align-items: center;
+                            justify-content: space-between;
+                            padding: 10px 1px;
+                            border: none;
+                            background: none;
+                        }
+
                         .fa-minus {
                             display: none;
                         }