diff --git a/res/css/views/settings/tabs/_SettingsTab.scss b/res/css/views/settings/tabs/_SettingsTab.scss
index 9b187a2f8c..0fe0888e82 100644
--- a/res/css/views/settings/tabs/_SettingsTab.scss
+++ b/res/css/views/settings/tabs/_SettingsTab.scss
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 .mx_SettingsTab {
+    --SettingsTab_section-margin-bottom-preferences-labs: 30px;
     color: $primary-content;
 }
 
diff --git a/res/css/views/settings/tabs/user/_LabsUserSettingsTab.scss b/res/css/views/settings/tabs/user/_LabsUserSettingsTab.scss
index 6fa751a96f..051ec4c9a0 100644
--- a/res/css/views/settings/tabs/user/_LabsUserSettingsTab.scss
+++ b/res/css/views/settings/tabs/user/_LabsUserSettingsTab.scss
@@ -15,18 +15,13 @@ limitations under the License.
 */
 
 .mx_LabsUserSettingsTab {
-    .mx_SettingsTab_subsectionText, .mx_SettingsTab_section {
-        margin-bottom: 30px;
+    .mx_SettingsTab_subsectionText,
+    .mx_SettingsTab_section {
+        margin-bottom: var(--SettingsTab_section-margin-bottom-preferences-labs);
     }
 
-    .mx_SettingsTab_section .mx_SettingsFlag {
+    .mx_SettingsFlag {
         margin-right: 0; // remove right margin to align with beta cards
-        display: flex;
         align-items: center;
-        justify-content: space-between;
-
-        .mx_ToggleSwitch {
-            float: unset;
-        }
     }
 }
diff --git a/res/css/views/settings/tabs/user/_PreferencesUserSettingsTab.scss b/res/css/views/settings/tabs/user/_PreferencesUserSettingsTab.scss
index ea979ac074..8a904e49ac 100644
--- a/res/css/views/settings/tabs/user/_PreferencesUserSettingsTab.scss
+++ b/res/css/views/settings/tabs/user/_PreferencesUserSettingsTab.scss
@@ -20,7 +20,7 @@ limitations under the License.
     }
 
     .mx_SettingsTab_section {
-        margin-bottom: 30px;
+        margin-bottom: var(--SettingsTab_section-margin-bottom-preferences-labs);
 
         > details {
             > summary {