diff --git a/doc/administration/settings/security_and_compliance.md b/doc/administration/settings/security_and_compliance.md
index b65ddcaf20d06c15f7df6bcc247210028ff31c5d..9ef7d6482805e406d4f0a065f6945ebf5a2f09de 100644
--- a/doc/administration/settings/security_and_compliance.md
+++ b/doc/administration/settings/security_and_compliance.md
@@ -18,8 +18,8 @@ To choose the packages you want to synchronize with the GitLab Package Metadata
 
 1. On the left sidebar, at the bottom, select **Admin Area**.
 1. Select **Settings > Security and Compliance**.
-1. Expand **License Compliance**.
-1. Select or clear checkboxes for the package registries that you want to sync.
+1. In **Package registry metadata to sync**, select or clear checkboxes for the
+   package registries that you want to sync.
 1. Select **Save changes**.
 
 For this data synchronization to work, you must allow outbound network traffic from your GitLab instance to the domain `storage.googleapis.com`. See also the offline setup instructions described in [Enabling the Package Metadata Database](../../topics/offline/quick_start_guide.md#enabling-the-package-metadata-database).
diff --git a/doc/user/application_security/secret_detection/secret_push_protection/index.md b/doc/user/application_security/secret_detection/secret_push_protection/index.md
index d13d9a48660f0ad252de52d9e9dbe59d972ccdbf..433e02cb18d04ca61381ee4cf8597a8470afd680 100644
--- a/doc/user/application_security/secret_detection/secret_push_protection/index.md
+++ b/doc/user/application_security/secret_detection/secret_push_protection/index.md
@@ -66,8 +66,7 @@ Prerequisites:
 1. Sign in to your GitLab instance as an administrator.
 1. On the left sidebar, at the bottom, select **Admin Area**.
 1. Select **Settings > Security and Compliance**.
-1. Expand **Secret Detection**.
-1. Select the **Allow secret push protection** checkbox.
+1. Under **Secret Detection**, select or clear **Allow secret push protection**.
 
 ### Enable secret push protection in a project
 
diff --git a/ee/app/views/admin/application_settings/_license_compliance.html.haml b/ee/app/views/admin/application_settings/_license_compliance.html.haml
index 22d2c61835f073d3066b32036180a7d1650c7ab5..a13f61241b087f11c8f7b91b2d802e6f88fa1517 100644
--- a/ee/app/views/admin/application_settings/_license_compliance.html.haml
+++ b/ee/app/views/admin/application_settings/_license_compliance.html.haml
@@ -2,7 +2,7 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .form-group
+    .form-group.gl-mb-0
       = f.label :package_metadata_purl_types, s_('AdminSettings|Package registry metadata to sync'), class: 'label-bold gl-mb-0'
       %span.form-text.gl-mt-0.gl-mb-3#package_metadata_purl_types-help
         = _('Package registry types for which metadata is stored, required for License Compliance for CycloneDX files.')
diff --git a/ee/app/views/admin/application_settings/_pre_receive_secret_detection.html.haml b/ee/app/views/admin/application_settings/_pre_receive_secret_detection.html.haml
index 78a187876ee0522434eab7a91b1ad4e9aee31c58..efe797b25502596ba757fbc1b27066978799d1ce 100644
--- a/ee/app/views/admin/application_settings/_pre_receive_secret_detection.html.haml
+++ b/ee/app/views/admin/application_settings/_pre_receive_secret_detection.html.haml
@@ -4,7 +4,7 @@
   = form_errors(@application_setting)
 
   %fieldset
-    .form-group
+    .form-group.gl-mb-0
       = f.label :pre_receive_secret_detection_enabled, s_('AdminSettings|Secret Push Protection'), class: 'label-bold'
       = render 'beta_badge', style: 'gl-ml-1 gl-mt-1'
       %span.form-text.gl-mt-0.gl-mb-3#pre_receive_secret_detection-help
diff --git a/ee/app/views/admin/application_settings/security_and_compliance.html.haml b/ee/app/views/admin/application_settings/security_and_compliance.html.haml
index 41f9dbe392e52fe9ce4b98f3b3cba8e7e9dbd083..3023579e5b9d8c2e7f62fa75a40f3d82731056d7 100644
--- a/ee/app/views/admin/application_settings/security_and_compliance.html.haml
+++ b/ee/app/views/admin/application_settings/security_and_compliance.html.haml
@@ -2,22 +2,19 @@
 - page_title _("Security and Compliance")
 - add_page_specific_style 'page_bundles/settings'
 - @force_desktop_expanded_sidebar = true
+- @hide_search_settings = true
 
-= render ::Layouts::SettingsBlockComponent.new(_('License Compliance'),
-  id: 'js-license-compliance-settings',
-  testid: 'admin-license-compliance-settings',
-  expanded: expanded_by_default?) do |c|
-  - c.with_description do
-    = _('Settings for the License Compliance feature')
-  - c.with_body do
-    = render 'license_compliance'
+.settings-section{ data: { testid: 'admin-license-compliance-settings' } }
+  .settings-sticky-header
+    .settings-sticky-header-inner
+      %h2.gl-heading-2{ class: '!gl-mb-2' }
+        = _('License Compliance')
+  = render 'license_compliance'
 
 - if (::Gitlab::CurrentSettings.gitlab_dedicated_instance? || Feature.enabled?(:pre_receive_secret_detection_beta_release)) && License.feature_available?(:pre_receive_secret_detection)
-  = render ::Layouts::SettingsBlockComponent.new(_('Secret Detection'),
-    id: 'js-secret-detection-settings',
-    testid: 'admin-secret-detection-settings',
-    expanded: expanded_by_default?) do |c|
-    - c.with_description do
-      = _('Manage secret detection behavior for all projects in your GitLab instance')
-    - c.with_body do
-      = render 'pre_receive_secret_detection'
+  .settings-section{ data: { testid: 'admin-secret-detection-settings' } }
+    .settings-sticky-header
+      .settings-sticky-header-inner
+        %h2.gl-heading-2{ class: '!gl-mb-2' }
+          = _('Secret Detection')
+    = render 'pre_receive_secret_detection'
diff --git a/ee/spec/views/admin/application_settings/security_and_compliance.html.haml_spec.rb b/ee/spec/views/admin/application_settings/security_and_compliance.html.haml_spec.rb
index 2be0b99f4b4e9b6a3cb4f8081f732b03b17d3741..b3346a732f870f9ed88103908d5a737514127788 100644
--- a/ee/spec/views/admin/application_settings/security_and_compliance.html.haml_spec.rb
+++ b/ee/spec/views/admin/application_settings/security_and_compliance.html.haml_spec.rb
@@ -21,7 +21,7 @@
     it do
       render
 
-      expect(rendered).to have_css '#js-secret-detection-settings'
+      expect(rendered).to have_css('[data-testid="admin-secret-detection-settings"]')
     end
   end
 
@@ -29,7 +29,7 @@
     it do
       render
 
-      expect(rendered).not_to have_css '#js-secret-detection-settings'
+      expect(rendered).not_to have_css('[data-testid="admin-secret-detection-settings"]')
     end
   end
 
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 75a256663a01894c7a3ac674497f6e824d1427d1..9f53d2b4987aacea122bfa671fb8d0e2dad5654a 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -31563,9 +31563,6 @@ msgstr ""
 msgid "Manage rules"
 msgstr ""
 
-msgid "Manage secret detection behavior for all projects in your GitLab instance"
-msgstr ""
-
 msgid "Manage two-factor authentication"
 msgstr ""
 
@@ -49807,9 +49804,6 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-msgid "Settings for the License Compliance feature"
-msgstr ""
-
 msgid "Settings saved successfully."
 msgstr ""