diff --git a/app/views/auth/registrations/_sessions.html.haml b/app/views/auth/registrations/_sessions.html.haml
index 929129a5a1..231b16ea57 100644
--- a/app/views/auth/registrations/_sessions.html.haml
+++ b/app/views/auth/registrations/_sessions.html.haml
@@ -1,4 +1,4 @@
-%h3= t 'sessions.title'
+%h3.heading-medium= t 'sessions.title'
 %p.muted-hint
   = t 'sessions.explanation'
   = link_to t('sessions.view_authentication_history'), settings_login_activities_path
diff --git a/app/views/settings/imports/index.html.haml b/app/views/settings/imports/index.html.haml
index 478a26b9c9..448dee6895 100644
--- a/app/views/settings/imports/index.html.haml
+++ b/app/views/settings/imports/index.html.haml
@@ -2,7 +2,7 @@
   = t('settings.import')
 
 = simple_form_for @import, url: settings_imports_path do |f|
-  .field-group
+  .fields-group
     = f.input :type,
               as: :grouped_select,
               collection: { constructive: %i(following bookmarks lists), destructive: %i(muting blocking domain_blocking custom_filters) },
@@ -33,7 +33,7 @@
 - unless @recent_imports.empty?
   %hr.spacer/
 
-  %h3= t('imports.recent_imports')
+  %h3.heading-medium= t('imports.recent_imports')
 
   .table-wrapper
     %table.table
diff --git a/app/views/settings/migrations/show.html.haml b/app/views/settings/migrations/show.html.haml
index 8c3bae704f..39b6dc9f21 100644
--- a/app/views/settings/migrations/show.html.haml
+++ b/app/views/settings/migrations/show.html.haml
@@ -19,7 +19,7 @@
 
 %hr.spacer/
 
-%h3= t('auth.migrate_account')
+%h3.heading-medium= t('auth.migrate_account')
 
 = simple_form_for @migration, url: settings_migration_path do |f|
   - if on_cooldown?
@@ -58,7 +58,7 @@
 - unless @migrations.empty?
   %hr.spacer/
 
-  %h3= t 'migrations.past_migrations'
+  %h3.heading-medium= t 'migrations.past_migrations'
 
   %hr.spacer/
 
@@ -85,5 +85,5 @@
 
 %hr.spacer/
 
-%h3= t 'migrations.incoming_migrations'
+%h3.heading-medium= t 'migrations.incoming_migrations'
 %p.muted-hint= t('migrations.incoming_migrations_html', path: settings_aliases_path)
diff --git a/app/views/settings/two_factor_authentication_methods/index.html.haml b/app/views/settings/two_factor_authentication_methods/index.html.haml
index 4863a279c0..5257e321d1 100644
--- a/app/views/settings/two_factor_authentication_methods/index.html.haml
+++ b/app/views/settings/two_factor_authentication_methods/index.html.haml
@@ -35,7 +35,7 @@
 
 %hr.spacer/
 
-%h3= t('two_factor_authentication.recovery_codes')
+%h3.heading-medium= t('two_factor_authentication.recovery_codes')
 %p.muted-hint= t('two_factor_authentication.lost_recovery_codes')
 
 %hr.spacer/