diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index 8639b9a7f84803c0af4b3d1dfb33a9aa84095e0d..65d914e47cfa86271287fc1004bda54276b7b03e 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -555,7 +555,8 @@ $top-nav-hover-bg: var(--indigo-900-alpha-008, $indigo-900-alpha-008) !important
   visibility: visible;
 }
 
-.with-performance-bar .navbar-gitlab {
+.with-performance-bar .navbar-gitlab,
+.with-performance-bar .fixed-top {
   top: $performance-bar-height;
 }
 
@@ -563,7 +564,7 @@ $top-nav-hover-bg: var(--indigo-900-alpha-008, $indigo-900-alpha-008) !important
   justify-content: center;
   height: $header-height;
   background: $white;
-  border-bottom: 1px solid $white-normal;
+  border-bottom: 1px solid $gray-100;
 
   .tanuki-logo,
   .brand-header-logo {
diff --git a/app/assets/stylesheets/framework/system_messages.scss b/app/assets/stylesheets/framework/system_messages.scss
index 437915d5034c41e34fbd8f0740bf233849db9ff1..1cb34bea0693ca5b82dbf99d59c66ffe3197dc5c 100644
--- a/app/assets/stylesheets/framework/system_messages.scss
+++ b/app/assets/stylesheets/framework/system_messages.scss
@@ -60,7 +60,8 @@
   // System Header
   &.with-performance-bar {
     // main navigation
-    header.navbar-gitlab {
+    header.navbar-gitlab,
+    .fixed-top {
       top: $performance-bar-height + $system-header-height;
     }
 
diff --git a/app/assets/stylesheets/startup/startup-signin.scss b/app/assets/stylesheets/startup/startup-signin.scss
index 81a87742850826f1934b3225fae0559249686881..c25b5b53070403d4c37caf9e4805b749be80a3fb 100644
--- a/app/assets/stylesheets/startup/startup-signin.scss
+++ b/app/assets/stylesheets/startup/startup-signin.scss
@@ -542,7 +542,7 @@ label.label-bold {
   justify-content: center;
   height: 40px;
   background: #fff;
-  border-bottom: 1px solid #f0f0f0;
+  border-bottom: 1px solid #dbdbdb;
 }
 .navbar-empty .tanuki-logo,
 .navbar-empty .brand-header-logo {
diff --git a/app/assets/stylesheets/utilities.scss b/app/assets/stylesheets/utilities.scss
index cabbe5834cba617a792e917b7ecc0cce822fcc59..965e18064162c82e6962c78ddf8c54d6af2df4db 100644
--- a/app/assets/stylesheets/utilities.scss
+++ b/app/assets/stylesheets/utilities.scss
@@ -85,6 +85,10 @@
   padding-bottom: $gl-spacing-scale-8;
 }
 
+.gl-pt-11 {
+  padding-top: $gl-spacing-scale-11;
+}
+
 .gl-transition-property-stroke-opacity {
   transition-property: stroke-opacity;
 }
diff --git a/app/controllers/registrations/experience_levels_controller.rb b/app/controllers/registrations/experience_levels_controller.rb
index d04e8d296ed970293e577ae6a3d26818c88ce8de..3c94bce126c32bfa8a6d2932e0c3d9ae67531fdf 100644
--- a/app/controllers/registrations/experience_levels_controller.rb
+++ b/app/controllers/registrations/experience_levels_controller.rb
@@ -2,7 +2,7 @@
 
 module Registrations
   class ExperienceLevelsController < ApplicationController
-    layout 'signup_onboarding'
+    layout 'minimal'
 
     before_action :ensure_namespace_path_param
 
diff --git a/app/controllers/registrations/welcome_controller.rb b/app/controllers/registrations/welcome_controller.rb
index 34283cc8db798411f2a13130d9716f13c7280308..303ee431a4dff97654e83f9201b8e0853fedfea4 100644
--- a/app/controllers/registrations/welcome_controller.rb
+++ b/app/controllers/registrations/welcome_controller.rb
@@ -2,7 +2,7 @@
 
 module Registrations
   class WelcomeController < ApplicationController
-    layout 'welcome'
+    layout 'minimal'
     skip_before_action :authenticate_user!, :required_signup_info, :check_two_factor_requirement, only: [:show, :update]
     before_action :require_current_user
 
diff --git a/app/views/layouts/minimal.html.haml b/app/views/layouts/minimal.html.haml
new file mode 100644
index 0000000000000000000000000000000000000000..c9b208de4775b1f2504aadfd9ff9e18d95ebf184
--- /dev/null
+++ b/app/views/layouts/minimal.html.haml
@@ -0,0 +1,17 @@
+- page_classes = page_class.push(@html_class).flatten.compact
+
+!!! 5
+%html{ lang: I18n.locale, class: page_classes }
+  = render "layouts/head"
+  %body{ data: body_data }
+    = header_message
+    = render 'peek/bar'
+    = render "layouts/header/empty"
+    .layout-page
+      .content-wrapper.content-wrapper-margin.gl-pt-11
+        .alert-wrapper.gl-force-block-formatting-context
+          = render "layouts/broadcast"
+        .limit-container-width{ class: container_class }
+          %main#content-body.content
+            = yield
+    = footer_message
diff --git a/app/views/layouts/welcome.html.haml b/app/views/layouts/welcome.html.haml
deleted file mode 100644
index 944f524d6928d1c14593c26f1296fe672da65ebe..0000000000000000000000000000000000000000
--- a/app/views/layouts/welcome.html.haml
+++ /dev/null
@@ -1,8 +0,0 @@
-!!! 5
-%html.subscriptions-layout-html{ lang: 'en' }
-  = render 'layouts/head'
-  %body.ui-indigo.gl-display-flex.vh-100
-    = render "layouts/header/logo_with_title"
-    = render "layouts/broadcast"
-    .container.gl-display-flex.gl-flex-grow-1
-      = yield
diff --git a/app/views/registrations/welcome/show.html.haml b/app/views/registrations/welcome/show.html.haml
index e85ce1ba6ac5d0d03b9149c4a1e36312b3d0adbf..9356b6ad49c89ff4f85c0d32c3638e52df2f9717 100644
--- a/app/views/registrations/welcome/show.html.haml
+++ b/app/views/registrations/welcome/show.html.haml
@@ -1,10 +1,11 @@
+- @html_class = "subscriptions-layout-html"
 - page_title _('Your profile')
 - add_page_specific_style 'page_bundles/signup'
 - gitlab_experience_text = _('To personalize your GitLab experience, we\'d like to know a bit more about you')
 
 .row.gl-flex-grow-1
-  .d-flex.gl-flex-direction-column.gl-align-items-center.gl-w-full.gl-p-5
-    .edit-profile.login-page.d-flex.flex-column.gl-align-items-center.pt-lg-3
+  .d-flex.gl-flex-direction-column.gl-align-items-center.gl-w-full.gl-px-5.gl-pb-5
+    .edit-profile.login-page.d-flex.flex-column.gl-align-items-center
       = render_if_exists "registrations/welcome/progress_bar"
       %h2.gl-text-center= html_escape(_('Welcome to GitLab,%{br_tag}%{name}!')) % { name: html_escape(current_user.first_name), br_tag: '<br/>'.html_safe }
       - if Gitlab.com?
diff --git a/ee/app/assets/stylesheets/startup/startup-signin.scss b/ee/app/assets/stylesheets/startup/startup-signin.scss
index 81a87742850826f1934b3225fae0559249686881..c25b5b53070403d4c37caf9e4805b749be80a3fb 100644
--- a/ee/app/assets/stylesheets/startup/startup-signin.scss
+++ b/ee/app/assets/stylesheets/startup/startup-signin.scss
@@ -542,7 +542,7 @@ label.label-bold {
   justify-content: center;
   height: 40px;
   background: #fff;
-  border-bottom: 1px solid #f0f0f0;
+  border-bottom: 1px solid #dbdbdb;
 }
 .navbar-empty .tanuki-logo,
 .navbar-empty .brand-header-logo {
diff --git a/ee/app/controllers/registrations/groups_controller.rb b/ee/app/controllers/registrations/groups_controller.rb
index 23258c8c2ddd1995bffb7ad8d250f2e282d2d6e6..de09708f5b649236e755e1dae1f7c56c5140bea5 100644
--- a/ee/app/controllers/registrations/groups_controller.rb
+++ b/ee/app/controllers/registrations/groups_controller.rb
@@ -4,7 +4,7 @@ module Registrations
   class GroupsController < ApplicationController
     include ::Gitlab::Utils::StrongMemoize
 
-    layout 'checkout'
+    layout 'minimal'
 
     before_action :check_signup_onboarding_enabled
     before_action :authorize_create_group!, only: :new
diff --git a/ee/app/controllers/registrations/projects_controller.rb b/ee/app/controllers/registrations/projects_controller.rb
index cfbd07707b7a480d9962d9d002bc60e725fef453..7672c525faecfca302284cbe4e31cb5356a69aab 100644
--- a/ee/app/controllers/registrations/projects_controller.rb
+++ b/ee/app/controllers/registrations/projects_controller.rb
@@ -3,7 +3,7 @@
 module Registrations
   class ProjectsController < ApplicationController
     include LearnGitlabHelper
-    layout 'checkout'
+    layout 'minimal'
 
     LEARN_GITLAB_TEMPLATE = 'learn_gitlab.tar.gz'
     LEARN_GITLAB_ULTIMATE_TEMPLATE = 'learn_gitlab_ultimate_trial.tar.gz'
diff --git a/ee/app/views/registrations/groups/new.html.haml b/ee/app/views/registrations/groups/new.html.haml
index ce49ebb8d9687d7e0012341bd24fc303438d42d4..c3686d0a31c61b2b2f8585089607178dcacddd39 100644
--- a/ee/app/views/registrations/groups/new.html.haml
+++ b/ee/app/views/registrations/groups/new.html.haml
@@ -1,9 +1,10 @@
+- @html_class = "subscriptions-layout-html"
 - page_title _('Your GitLab group')
 - form_params = { trial_onboarding_flow: params[:trial_onboarding_flow], glm_source: params[:glm_source], glm_content: params[:glm_content] }
 
 .row.gl-flex-grow-1
-  .gl-display-flex.gl-flex-direction-column.gl-align-items-center.gl-w-full.gl-p-5.gl-bg-gray-10
-    .edit-group.gl-display-flex.gl-flex-direction-column.gl-align-items-center.gl-pt-7
+  .gl-display-flex.gl-flex-direction-column.gl-align-items-center.gl-w-full.gl-px-5.gl-pb-5
+    .edit-group.gl-display-flex.gl-flex-direction-column.gl-align-items-center
       - unless in_trial_onboarding_flow?
         #progress-bar
       %h2.center= _('Create your group')
diff --git a/ee/app/views/registrations/projects/new.html.haml b/ee/app/views/registrations/projects/new.html.haml
index 8e53420ff4509234de5363a8701c3c127e3e4979..3e4ff694382a3a6839ea7d06c2c2e6af4f716df7 100644
--- a/ee/app/views/registrations/projects/new.html.haml
+++ b/ee/app/views/registrations/projects/new.html.haml
@@ -1,3 +1,4 @@
+- @html_class = "subscriptions-layout-html"
 - page_title _('Your first project')
 - visibility_level = selected_visibility_level(@project, params.dig(:project, :visibility_level))
 
@@ -6,8 +7,8 @@
     .gl-display-flex.gl-flex-direction-column.gl-align-items-center.gl-w-full.gl-mt-3
       = render 'registrations/trial_is_activated_banner'
 .row.gl-flex-grow-1
-  .gl-display-flex.gl-align-items-center.gl-flex-direction-column.gl-w-full.gl-p-5
-    .new-project.gl-display-flex.gl-flex-direction-column.gl-align-items-center.gl-pt-7
+  .gl-display-flex.gl-align-items-center.gl-flex-direction-column.gl-w-full.gl-px-5.gl-pb-5
+    .new-project.gl-display-flex.gl-flex-direction-column.gl-align-items-center
       - unless in_trial_onboarding_flow?
         #progress-bar
       %h2.gl-text-center= _('Create/import your first project')
diff --git a/spec/controllers/registrations/experience_levels_controller_spec.rb b/spec/controllers/registrations/experience_levels_controller_spec.rb
index 6b8ab3ec715698ecf351fdb9c689e59bef3893d7..ad145264bb81b9a7a2a6f0d725e342c05e8122bc 100644
--- a/spec/controllers/registrations/experience_levels_controller_spec.rb
+++ b/spec/controllers/registrations/experience_levels_controller_spec.rb
@@ -24,7 +24,7 @@
       end
 
       it { is_expected.to have_gitlab_http_status(:ok) }
-      it { is_expected.to render_template('layouts/signup_onboarding') }
+      it { is_expected.to render_template('layouts/minimal') }
       it { is_expected.to render_template(:show) }
     end
   end