diff --git a/app/views/devise/sessions/email_verification.haml b/app/views/devise/sessions/email_verification.haml
index 6cafcb941b4970f782d34b853a8a1e4ca5ff1f63..e0b5a2669613a875ad16ad099523e1dfd422a404 100644
--- a/app/views/devise/sessions/email_verification.haml
+++ b/app/views/devise/sessions/email_verification.haml
@@ -2,7 +2,7 @@
   = render 'devise/shared/tab_single', tab_title: s_('IdentityVerification|Help us protect your account')
   .login-box.gl-p-5
     .login-body
-      = form_for(resource, as: resource_name, url: session_path(resource_name), method: :post, html: { class: 'gl-show-field-errors' }) do |f|
+      = gitlab_ui_form_for(resource, as: resource_name, url: session_path(resource_name), method: :post, html: { class: 'gl-show-field-errors' }) do |f|
         %p
           = s_("IdentityVerification|For added security, you'll need to verify your identity. We've sent a verification code to %{email}").html_safe % { email: "<strong>#{sanitize(obfuscated_email(resource.email))}</strong>".html_safe }
         %div
@@ -11,7 +11,7 @@
           %p.gl-field-error.gl-mt-2
             = resource.errors.full_messages.to_sentence
           .gl-mt-5
-            = f.submit s_('IdentityVerification|Verify code'), class: 'gl-button btn btn-confirm'
+            = f.submit s_('IdentityVerification|Verify code'), class: 'gl-w-full', pajamas_button: true
             - unless send_rate_limited?(resource)
               = link_to s_('IdentityVerification|Resend code'), users_resend_verification_code_path, method: :post, class: 'form-control gl-button btn-link gl-mt-3 gl-mb-0'
   %p.gl-p-5.gl-text-secondary
diff --git a/app/views/groups/settings/_advanced.html.haml b/app/views/groups/settings/_advanced.html.haml
index 21b1986bd3486a23920f254e49214fa683520364..d92a6b08b60479e890730acb008d339f2fe4b93f 100644
--- a/app/views/groups/settings/_advanced.html.haml
+++ b/app/views/groups/settings/_advanced.html.haml
@@ -3,7 +3,7 @@
 
 .sub-section
   %h4.warning-title= s_('GroupSettings|Change group URL')
-  = form_for @group, html: { multipart: true, class: 'gl-show-field-errors' }, authenticity_token: true do |f|
+  = gitlab_ui_form_for @group, html: { multipart: true, class: 'gl-show-field-errors' }, authenticity_token: true do |f|
     = form_errors(@group)
     .form-group
       %p
@@ -23,7 +23,7 @@
           title: group_url_error_message,
           maxlength: ::Namespace::URL_MAX_LENGTH,
           "data-bind-in" => "#{'create_chat_team' if Gitlab.config.mattermost.enabled}"
-    = f.submit s_('GroupSettings|Change group URL'), class: 'btn gl-button btn-danger'
+    = f.submit s_('GroupSettings|Change group URL'), class: 'btn-danger', pajamas_button: true
 
 = render 'groups/settings/transfer', group: @group
 = render 'groups/settings/remove', group: @group, remove_form_id: remove_form_id
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index 02a69f2598548162577f7a130d103a076660168c..fd90a941c7b7b1443ecf838abd3d056f6efff577 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -91,7 +91,7 @@
     .sub-section.rename-repository
       %h4.warning-title= _('Change path')
       = render 'projects/errors'
-      = form_for @project do |f|
+      = gitlab_ui_form_for @project do |f|
         .form-group
           - link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path('user/project/settings/index', anchor: 'rename-a-repository') }
           %p= _("A project’s repository name defines its URL (the one you use to access the project via a browser) and its place on the file disk where GitLab is installed. %{link_start}Learn more.%{link_end}").html_safe % { link_start: link_start, link_end: '</a>'.html_safe }
@@ -107,7 +107,7 @@
                 .input-group-text
                   #{Gitlab::Utils.append_path(root_url, @project.namespace.full_path)}/
               = f.text_field :path, class: 'form-control h-auto', data: { qa_selector: 'project_path_field' }
-        = f.submit _('Change path'), class: "gl-button btn btn-danger", data: { qa_selector: 'change_path_button' }
+        = f.submit _('Change path'), class: "btn-danger", data: { qa_selector: 'change_path_button' }, pajamas_button: true
 
     = render 'transfer', project: @project
 
diff --git a/ee/app/views/admin/application_settings/_product_analytics.html.haml b/ee/app/views/admin/application_settings/_product_analytics.html.haml
index 5ecab43bbebd7227fc980ba9e7fc4e3a8de4af2a..33c4197804d97c46b79b65fa3e306f697057db36 100644
--- a/ee/app/views/admin/application_settings/_product_analytics.html.haml
+++ b/ee/app/views/admin/application_settings/_product_analytics.html.haml
@@ -59,4 +59,4 @@
           .form-text.text-muted
             = s_('AdminSettings|Used to retrieve dashboard data from the Cube instance.')
 
-      = f.submit _('Save changes'), class: 'gl-button btn btn-confirm'
+      = f.submit _('Save changes'), pajamas_button: true
diff --git a/ee/app/views/product_analytics/_project_settings.html.haml b/ee/app/views/product_analytics/_project_settings.html.haml
index f97159c712120aa7408ffa3b254bccf181d134d2..d2069f046288f1a0d4df8d2583892a43c6d0625e 100644
--- a/ee/app/views/product_analytics/_project_settings.html.haml
+++ b/ee/app/views/product_analytics/_project_settings.html.haml
@@ -65,4 +65,4 @@
             = settings.text_field :cube_api_key, class: 'form-control gl-form-input'
             .form-text.text-muted
               = s_('ProjectSettings|Used to retrieve dashboard data from the Cube instance.')
-      = f.submit _('Save changes'), class: 'gl-button btn btn-confirm'
+      = f.submit _('Save changes'), pajamas_button: true