diff --git a/res/css/views/settings/_ProfileSettings.scss b/res/css/views/settings/_ProfileSettings.scss
index ae77a432e0a..6ab13058d40 100644
--- a/res/css/views/settings/_ProfileSettings.scss
+++ b/res/css/views/settings/_ProfileSettings.scss
@@ -28,12 +28,6 @@ limitations under the License.
 .mx_ProfileSettings_controls {
     flex-grow: 1;
     margin-right: 54px;
-
-    // We put the header under the controls with some minor styling to cheat
-    // alignment of the field with the avatar
-    .mx_SettingsTab_subheading {
-        margin-top: 0;
-    }
 }
 
 .mx_ProfileSettings_controls .mx_Field #profileTopic {
diff --git a/res/css/views/settings/tabs/_SettingsTab.scss b/res/css/views/settings/tabs/_SettingsTab.scss
index cb0d6b249e1..9b187a2f8cb 100644
--- a/res/css/views/settings/tabs/_SettingsTab.scss
+++ b/res/css/views/settings/tabs/_SettingsTab.scss
@@ -27,6 +27,7 @@ limitations under the License.
     font-weight: 600;
     color: $primary-content;
     margin-bottom: 10px;
+    margin-top: 10px;
 }
 
 .mx_SettingsTab_heading:nth-child(n + 2) {
diff --git a/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss b/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss
index e967139cd94..e4247b4851d 100644
--- a/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss
+++ b/res/css/views/settings/tabs/user/_AppearanceUserSettingsTab.scss
@@ -21,6 +21,7 @@ limitations under the License.
 .mx_AppearanceUserSettingsTab {
     > .mx_SettingsTab_SubHeading {
         margin-bottom: 32px;
+        margin-top: 12px;
     }
 }
 
diff --git a/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss b/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss
index 80cb72f2547..2f64cde2714 100644
--- a/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss
+++ b/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss
@@ -27,6 +27,9 @@ limitations under the License.
 }
 
 .mx_SecurityUserSettingsTab {
+    .mx_SettingsTab_heading {
+        margin-bottom: 22px;
+    }
     .mx_SettingsTab_section {
         .mx_AccessibleButton_kind_link {
             padding: 0;
diff --git a/res/css/views/settings/tabs/user/_SidebarUserSettingsTab.scss b/res/css/views/settings/tabs/user/_SidebarUserSettingsTab.scss
index 42a8f1aaafb..5000f3e9a69 100644
--- a/res/css/views/settings/tabs/user/_SidebarUserSettingsTab.scss
+++ b/res/css/views/settings/tabs/user/_SidebarUserSettingsTab.scss
@@ -16,7 +16,7 @@ limitations under the License.
 
 .mx_SidebarUserSettingsTab {
     .mx_SettingsTab_section {
-        margin-top: 10px;
+        margin-top: 12px;
     }
 
     .mx_SidebarUserSettingsTab_subheading {