diff --git a/res/css/_components.pcss b/res/css/_components.pcss
index 4414a422d5f..4297b9f1908 100644
--- a/res/css/_components.pcss
+++ b/res/css/_components.pcss
@@ -144,6 +144,7 @@
 @import "./views/dialogs/_JoinRuleDropdown.pcss";
 @import "./views/dialogs/_LeaveSpaceDialog.pcss";
 @import "./views/dialogs/_LocationViewDialog.pcss";
+@import "./views/dialogs/_LogoutDialog.pcss";
 @import "./views/dialogs/_ManageRestrictedJoinRuleDialog.pcss";
 @import "./views/dialogs/_MessageEditHistoryDialog.pcss";
 @import "./views/dialogs/_ModalWidgetDialog.pcss";
diff --git a/res/css/views/dialogs/_CreateRoomDialog.pcss b/res/css/views/dialogs/_CreateRoomDialog.pcss
index dabddf01cf9..def912f253d 100644
--- a/res/css/views/dialogs/_CreateRoomDialog.pcss
+++ b/res/css/views/dialogs/_CreateRoomDialog.pcss
@@ -22,6 +22,7 @@ limitations under the License.
         font-weight: var(--cpd-font-weight-semibold);
         cursor: pointer;
         color: $accent;
+        width: fit-content;
 
         /* list-style doesn't do it for webkit */
         &::-webkit-details-marker {
diff --git a/res/css/views/dialogs/_LogoutDialog.pcss b/res/css/views/dialogs/_LogoutDialog.pcss
new file mode 100644
index 00000000000..3c07674971f
--- /dev/null
+++ b/res/css/views/dialogs/_LogoutDialog.pcss
@@ -0,0 +1,19 @@
+/*
+Copyright 2023 Manan Sadana <manancodes.dev@gmail.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_LogoutDialog_ExportKeyAdvanced {
+    width: fit-content;
+}
diff --git a/res/css/views/room_settings/_AliasSettings.pcss b/res/css/views/room_settings/_AliasSettings.pcss
index cd384162928..8cd081ebe09 100644
--- a/res/css/views/room_settings/_AliasSettings.pcss
+++ b/res/css/views/room_settings/_AliasSettings.pcss
@@ -19,6 +19,7 @@ limitations under the License.
     color: $accent;
     font-weight: var(--cpd-font-weight-semibold);
     list-style: none;
+    width: fit-content;
 
     /* list-style doesn't do it for webkit */
     &::-webkit-details-marker {
diff --git a/res/css/views/settings/_CrossSigningPanel.pcss b/res/css/views/settings/_CrossSigningPanel.pcss
index 1b5f7d1f74c..c00c9dfdcdf 100644
--- a/res/css/views/settings/_CrossSigningPanel.pcss
+++ b/res/css/views/settings/_CrossSigningPanel.pcss
@@ -38,3 +38,7 @@ limitations under the License.
         margin-inline-end: 10px;
     }
 }
+
+.mx_CrossSigningPanel_advanced {
+    width: fit-content;
+}
diff --git a/res/css/views/settings/_SecureBackupPanel.pcss b/res/css/views/settings/_SecureBackupPanel.pcss
index 5ff3cba4040..38250e97767 100644
--- a/res/css/views/settings/_SecureBackupPanel.pcss
+++ b/res/css/views/settings/_SecureBackupPanel.pcss
@@ -46,3 +46,7 @@ limitations under the License.
         }
     }
 }
+
+.mx_SecureBackupPanel_advanced {
+    width: fit-content;
+}
diff --git a/res/css/views/settings/tabs/user/_HelpUserSettingsTab.pcss b/res/css/views/settings/tabs/user/_HelpUserSettingsTab.pcss
index c03de9f36ce..b5e5f39b079 100644
--- a/res/css/views/settings/tabs/user/_HelpUserSettingsTab.pcss
+++ b/res/css/views/settings/tabs/user/_HelpUserSettingsTab.pcss
@@ -15,17 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_HelpUserSettingsTab {
-    code {
-        word-break: break-all;
-        user-select: all;
-    }
-
-    details {
-        margin: $spacing-16 auto;
-
-        summary {
-            margin-bottom: $spacing-16;
-        }
-    }
+.mx_HelpUserSettingsTab_accessTokenDetails {
+    width: fit-content;
 }
diff --git a/src/components/views/dialogs/LogoutDialog.tsx b/src/components/views/dialogs/LogoutDialog.tsx
index b316682a79b..f6d8af0c892 100644
--- a/src/components/views/dialogs/LogoutDialog.tsx
+++ b/src/components/views/dialogs/LogoutDialog.tsx
@@ -195,7 +195,7 @@ export default class LogoutDialog extends React.Component<IProps, IState> {
                     <button onClick={this.onLogoutConfirm}>{_t("auth|logout_dialog|skip_key_backup")}</button>
                 </DialogButtons>
                 <details>
-                    <summary>{_t("common|advanced")}</summary>
+                    <summary className="mx_LogoutDialog_ExportKeyAdvanced">{_t("common|advanced")}</summary>
                     <p>
                         <button onClick={this.onExportE2eKeysClicked}>{_t("auth|logout_dialog|megolm_export")}</button>
                     </p>
diff --git a/src/components/views/settings/CrossSigningPanel.tsx b/src/components/views/settings/CrossSigningPanel.tsx
index 93b133301cd..65886902544 100644
--- a/src/components/views/settings/CrossSigningPanel.tsx
+++ b/src/components/views/settings/CrossSigningPanel.tsx
@@ -258,7 +258,7 @@ export default class CrossSigningPanel extends React.PureComponent<{}, IState> {
             <>
                 {summarisedStatus}
                 <details>
-                    <summary>{_t("common|advanced")}</summary>
+                    <summary className="mx_CrossSigningPanel_advanced">{_t("common|advanced")}</summary>
                     <table className="mx_CrossSigningPanel_statusList">
                         <tr>
                             <th scope="row">{_t("settings|security|cross_signing_public_keys")}</th>
diff --git a/src/components/views/settings/SecureBackupPanel.tsx b/src/components/views/settings/SecureBackupPanel.tsx
index 1a631641065..4a379508c76 100644
--- a/src/components/views/settings/SecureBackupPanel.tsx
+++ b/src/components/views/settings/SecureBackupPanel.tsx
@@ -384,7 +384,7 @@ export default class SecureBackupPanel extends React.PureComponent<{}, IState> {
                 <SettingsSubsectionText>{_t("settings|security|backup_keys_description")}</SettingsSubsectionText>
                 {statusDescription}
                 <details>
-                    <summary>{_t("common|advanced")}</summary>
+                    <summary className="mx_SecureBackupPanel_advanced">{_t("common|advanced")}</summary>
                     <table className="mx_SecureBackupPanel_statusList">
                         <tr>
                             <th scope="row">{_t("settings|security|backup_key_stored_status")}</th>
diff --git a/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx b/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx
index 475f6ee00d0..1b4ed9694ef 100644
--- a/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx
@@ -349,7 +349,9 @@ export default class HelpUserSettingsTab extends React.Component<IProps, IState>
                         )}
                         <SettingsSubsectionText>
                             <details>
-                                <summary>{_t("common|access_token")}</summary>
+                                <summary className="mx_HelpUserSettingsTab_accessTokenDetails">
+                                    {_t("common|access_token")}
+                                </summary>
                                 <b>{_t("setting|help_about|access_token_detail")}</b>
                                 <CopyableText getTextToCopy={() => this.context.getAccessToken()}>
                                     {this.context.getAccessToken()}
diff --git a/test/components/views/dialogs/__snapshots__/LogoutDialog-test.tsx.snap b/test/components/views/dialogs/__snapshots__/LogoutDialog-test.tsx.snap
index 0e4a2763a37..bac31d1d81e 100644
--- a/test/components/views/dialogs/__snapshots__/LogoutDialog-test.tsx.snap
+++ b/test/components/views/dialogs/__snapshots__/LogoutDialog-test.tsx.snap
@@ -66,7 +66,9 @@ exports[`LogoutDialog Prompts user to connect backup if there is a backup on the
         </span>
       </div>
       <details>
-        <summary>
+        <summary
+          class="mx_LogoutDialog_ExportKeyAdvanced"
+        >
           Advanced
         </summary>
         <p>
@@ -151,7 +153,9 @@ exports[`LogoutDialog Prompts user to set up backup if there is no backup on the
         </span>
       </div>
       <details>
-        <summary>
+        <summary
+          class="mx_LogoutDialog_ExportKeyAdvanced"
+        >
           Advanced
         </summary>
         <p>
diff --git a/test/components/views/settings/__snapshots__/SecureBackupPanel-test.tsx.snap b/test/components/views/settings/__snapshots__/SecureBackupPanel-test.tsx.snap
index 47a6c83f79c..fa3a5fbb91d 100644
--- a/test/components/views/settings/__snapshots__/SecureBackupPanel-test.tsx.snap
+++ b/test/components/views/settings/__snapshots__/SecureBackupPanel-test.tsx.snap
@@ -13,7 +13,9 @@ exports[`<SecureBackupPanel /> handles error fetching backup 1`] = `
     Unable to load key backup status
   </div>
   <details>
-    <summary>
+    <summary
+      class="mx_SecureBackupPanel_advanced"
+    >
       Advanced
     </summary>
     <table
@@ -89,7 +91,9 @@ exports[`<SecureBackupPanel /> suggests connecting session to key backup when ba
     Connect this session to key backup before signing out to avoid losing any keys that may only be on this session.
   </div>
   <details>
-    <summary>
+    <summary
+      class="mx_SecureBackupPanel_advanced"
+    >
       Advanced
     </summary>
     <table
diff --git a/test/components/views/settings/tabs/user/__snapshots__/SecurityUserSettingsTab-test.tsx.snap b/test/components/views/settings/tabs/user/__snapshots__/SecurityUserSettingsTab-test.tsx.snap
index e675bfdd4dc..562d8c3952d 100644
--- a/test/components/views/settings/tabs/user/__snapshots__/SecurityUserSettingsTab-test.tsx.snap
+++ b/test/components/views/settings/tabs/user/__snapshots__/SecurityUserSettingsTab-test.tsx.snap
@@ -51,7 +51,9 @@ exports[`<SecurityUserSettingsTab /> renders security section 1`] = `
                 />
               </div>
               <details>
-                <summary>
+                <summary
+                  class="mx_SecureBackupPanel_advanced"
+                >
                   Advanced
                 </summary>
                 <table
@@ -165,7 +167,9 @@ exports[`<SecurityUserSettingsTab /> renders security section 1`] = `
                 />
               </div>
               <details>
-                <summary>
+                <summary
+                  class="mx_CrossSigningPanel_advanced"
+                >
                   Advanced
                 </summary>
                 <table