diff --git a/app/views/authentication/_register.html.haml b/app/views/authentication/_register.html.haml
index 62116743476714a83f0f4dbf6472ec2e5e989fd4..9d8a74cf02cc9dadebdefc2aaf6eb2e366ff12b2 100644
--- a/app/views/authentication/_register.html.haml
+++ b/app/views/authentication/_register.html.haml
@@ -33,4 +33,4 @@
             = text_field_tag 'device_registration[name]', nil, class: 'form-control', placeholder: _("Pick a name")
           .col-md-3
             = hidden_field_tag 'device_registration[device_response]', nil, class: 'form-control', required: true, id: "js-device-response"
-            = submit_tag _("Register device"), class: "gl-button btn btn-success"
+            = submit_tag _("Register device"), class: "gl-button btn btn-confirm"
diff --git a/app/views/jira_connect/users/show.html.haml b/app/views/jira_connect/users/show.html.haml
index d646ccbb98ae5cade899a46f5083ea11cf980c65..cf88acd6976301d781e78ed2dbd2431688411adf 100644
--- a/app/views/jira_connect/users/show.html.haml
+++ b/app/views/jira_connect/users/show.html.haml
@@ -5,7 +5,7 @@
   %p= s_('Integrations|You can now close this window and return to the GitLab for Jira application.')
 
   - if @jira_app_link
-    %p= external_link s_('Integrations|Return to GitLab for Jira'), @jira_app_link, class: 'gl-button btn btn-success'
+    %p= external_link s_('Integrations|Return to GitLab for Jira'), @jira_app_link, class: 'gl-button btn btn-confirm'
 
   %p= link_to _('Sign out'), destroy_user_session_path, method: :post
 
diff --git a/app/views/projects/issues/_new_branch.html.haml b/app/views/projects/issues/_new_branch.html.haml
index 6b681762f375e7374ea4431479a6d92b28a51cbd..45b2f86c03d79cd5fda5024cf3c728df86f459a6 100644
--- a/app/views/projects/issues/_new_branch.html.haml
+++ b/app/views/projects/issues/_new_branch.html.haml
@@ -58,7 +58,7 @@
               %span.js-ref-message.form-text.text-muted
 
             .form-group
-              %button.btn.gl-button.btn-success.js-create-target{ type: 'button', data: { action: 'create-mr' } }
+              %button.btn.gl-button.btn-confirm.js-create-target{ type: 'button', data: { action: 'create-mr' } }
                 = create_mr_text
 
             - if can_create_confidential_merge_request?
diff --git a/app/views/projects/triggers/_form.html.haml b/app/views/projects/triggers/_form.html.haml
index c769588b656a77b84c9290b34576e97b8a307ca4..9043b8e60fcae2b68fda22c78468aa311b0b0763 100644
--- a/app/views/projects/triggers/_form.html.haml
+++ b/app/views/projects/triggers/_form.html.haml
@@ -8,4 +8,4 @@
   .form-group
     = f.label :key, "Description", class: "label-bold"
     = f.text_field :description, class: 'form-control gl-form-input', required: true, title: 'Trigger description is required.', placeholder: "Trigger description"
-  = f.submit btn_text, class: "gl-button btn btn-success"
+  = f.submit btn_text, class: "gl-button btn btn-confirm"
diff --git a/app/views/shared/runners/_form.html.haml b/app/views/shared/runners/_form.html.haml
index 13738c730ce1c617e4fb865dfc7e501aa82b59b1..8d0069a7664aa1db67b8deb64accae12d5555001 100644
--- a/app/views/shared/runners/_form.html.haml
+++ b/app/views/shared/runners/_form.html.haml
@@ -59,4 +59,4 @@
       .col-sm-10
         = f.text_field :private_projects_minutes_cost_factor, class: 'form-control'
   .form-actions
-    = f.submit _('Save changes'), class: 'gl-button btn btn-success'
+    = f.submit _('Save changes'), class: 'gl-button btn btn-confirm'
diff --git a/ee/app/views/devise/sessions/_new_smartcard.html.haml b/ee/app/views/devise/sessions/_new_smartcard.html.haml
index 889c6d527cbdad4275851c1eca8844ee77909b12..317c2c3c604941de031766d773bfc2c48dad5a1c 100644
--- a/ee/app/views/devise/sessions/_new_smartcard.html.haml
+++ b/ee/app/views/devise/sessions/_new_smartcard.html.haml
@@ -3,4 +3,4 @@
     .login-body
       = form_tag(auth_smartcard_url, html: { 'aria-live' => 'assertive'}) do
         .submit-container
-          = submit_tag _('Login with smartcard'), class: 'gl-button btn btn-success'
+          = submit_tag _('Login with smartcard'), class: 'gl-button btn btn-confirm'
diff --git a/ee/app/views/groups/hooks/edit.html.haml b/ee/app/views/groups/hooks/edit.html.haml
index 378cf5ac383df2bbc1860552a41021585c422c40..ebd6d693a0d10aa2e33720e795bd5809cb71202e 100644
--- a/ee/app/views/groups/hooks/edit.html.haml
+++ b/ee/app/views/groups/hooks/edit.html.haml
@@ -9,6 +9,6 @@
     = form_for [@group, @hook], as: :hook, url: group_hook_path(@group, @hook) do |f|
       = render partial: 'shared/web_hooks/form', locals: { form: f, hook: @hook }
 
-      %span>= f.submit _('Save changes'), class: 'gl-button btn btn-success gl-mr-3'
+      %span>= f.submit _('Save changes'), class: 'gl-button btn btn-confirm gl-mr-3'
       = render 'shared/web_hooks/test_button', hook: @hook
       = link_to _('Delete'), group_hook_path(@group, @hook), method: :delete, class: 'gl-button btn btn-danger float-right', data: { confirm: _('Are you sure?') }
diff --git a/ee/app/views/groups/hooks/index.html.haml b/ee/app/views/groups/hooks/index.html.haml
index 98a3d5612aa06081ee6f0aa88a6be0125d96b09b..314ad11b024e1065260a0302d237cfd1abb7b407 100644
--- a/ee/app/views/groups/hooks/index.html.haml
+++ b/ee/app/views/groups/hooks/index.html.haml
@@ -8,7 +8,7 @@
     .col-lg-9.gl-mb-3
       = form_for @hook, as: :hook, url: polymorphic_path([@group, :hooks]) do |f|
         = render partial: 'shared/web_hooks/form', locals: { form: f, hook: @hook }
-        = f.submit _('Add webhook'), class: 'gl-button btn btn-success'
+        = f.submit _('Add webhook'), class: 'gl-button btn btn-confirm'
 
       = render 'shared/web_hooks/index', hooks: @hooks, hook_class: @hook.class
 - elsif show_promotions?
diff --git a/ee/app/views/groups/ldap_group_settings/_form.html.haml b/ee/app/views/groups/ldap_group_settings/_form.html.haml
index a868cfe7679f02b38b10feef952d006d46e7b843..70e6a295739348a60480cf135e4e1cef4751d266 100644
--- a/ee/app/views/groups/ldap_group_settings/_form.html.haml
+++ b/ee/app/views/groups/ldap_group_settings/_form.html.haml
@@ -8,4 +8,4 @@
             = f.label :unlock_membership_to_ldap, class: 'form-check-label' do
               = _('Allow owners to manually add users outside of LDAP')
     .form-actions
-      = f.submit _('Save'), class: 'gl-button btn btn-success qa-save'
+      = f.submit _('Save'), class: 'gl-button btn btn-confirm qa-save'
diff --git a/ee/app/views/groups/saml_providers/_form.html.haml b/ee/app/views/groups/saml_providers/_form.html.haml
index 37d4fa90ae32f0d608c72edcd458ef504b4d5395..ac657338e4f8bc53e69ebbbbb95abddaff9fcb6e 100644
--- a/ee/app/views/groups/saml_providers/_form.html.haml
+++ b/ee/app/views/groups/saml_providers/_form.html.haml
@@ -63,6 +63,6 @@
         = s_('GroupSAML|This will be set as the access level of users added to the group.')
 
     .mt-3
-      = f.submit _("Save changes"), class: 'gl-button btn btn-success', data: { qa_selector: 'save_changes_button' }
+      = f.submit _("Save changes"), class: 'gl-button btn btn-confirm', data: { qa_selector: 'save_changes_button' }
       #js-saml-test-button.has-tooltip.float-right
         = render 'test_button', saml_provider: @saml_provider
diff --git a/ee/app/views/groups/sso/_register_pane.html.haml b/ee/app/views/groups/sso/_register_pane.html.haml
index 6bea5bc9b2016bca11cc35cb7e36fd348bb04fe5..4d692639d0fd5ee9542043efc1592b88c042002a 100644
--- a/ee/app/views/groups/sso/_register_pane.html.haml
+++ b/ee/app/views/groups/sso/_register_pane.html.haml
@@ -36,7 +36,7 @@
           = render 'user_info'
 
         .submit-container
-          = f.submit _("Sign out & Register"), class: "btn-success gl-button btn qa-new-user-register-button", data: { qa_selector: 'sign_out_and_register_button' }
+          = f.submit _("Sign out & Register"), class: "btn-confirm gl-button btn qa-new-user-register-button", data: { qa_selector: 'sign_out_and_register_button' }
       - else
         .submit-container
-          = f.submit _("Register"), class: "btn-success gl-button btn qa-new-user-register-button"
+          = f.submit _("Register"), class: "btn-confirm gl-button btn qa-new-user-register-button"
diff --git a/ee/app/views/ldap_group_links/_form.html.haml b/ee/app/views/ldap_group_links/_form.html.haml
index 626dfb8b16b00cbbc6d659e6696d7b65be4f780e..c967facbefb115de0f3454a743d56e44c913afd5 100644
--- a/ee/app/views/ldap_group_links/_form.html.haml
+++ b/ee/app/views/ldap_group_links/_form.html.haml
@@ -54,4 +54,4 @@
             You can manage permission levels for individual group members in the Members tab.
 
     .form-actions.gl-mb-5
-      = f.submit 'Add synchronization', class: 'gl-button btn btn-success qa-add-sync-button'
+      = f.submit 'Add synchronization', class: 'gl-button btn btn-confirm qa-add-sync-button'
diff --git a/ee/app/views/registrations/welcome/_button.html.haml b/ee/app/views/registrations/welcome/_button.html.haml
index 628123ca121bccc7bd1801beee967e8df940decd..15210a6fc57dafedad9ab1313fbfeba9479d8415 100644
--- a/ee/app/views/registrations/welcome/_button.html.haml
+++ b/ee/app/views/registrations/welcome/_button.html.haml
@@ -1 +1 @@
-= button_tag welcome_submit_button_text, class: %w[gl-button btn btn-success w-100], data: { qa_selector: 'get_started_button' }
+= button_tag welcome_submit_button_text, class: %w[gl-button btn btn-confirm w-100], data: { qa_selector: 'get_started_button' }
diff --git a/ee/app/views/trials/select.html.haml b/ee/app/views/trials/select.html.haml
index 9ea6e56620cc00d5f6471aaec4304ceca355b143..fce37fde8a96469cc5d615d39cf0e386874ee2b4 100644
--- a/ee/app/views/trials/select.html.haml
+++ b/ee/app/views/trials/select.html.haml
@@ -29,6 +29,6 @@
         .gl-form-checkbox.form-check.form-check-inline
           = radio_button_tag :trial_entity, :individual, params[:trial_entity]=='individual', required: true, class: 'form-check-input'
           = label_tag :trial_entity_individual, _('No'), class: 'form-check-label'
-  = submit_tag _('Start your free trial'), class: 'gl-button btn btn-success btn-block'
+  = submit_tag _('Start your free trial'), class: 'gl-button btn btn-confirm btn-block'
 
 = render 'skip_trial'
diff --git a/ee/app/views/unsubscribes/show.html.haml b/ee/app/views/unsubscribes/show.html.haml
index 58e283f0c00113ace449815b78dd00884dbeefa8..8b3dc69f3a7f94af60143faa7a35b979089fe2a2 100644
--- a/ee/app/views/unsubscribes/show.html.haml
+++ b/ee/app/views/unsubscribes/show.html.haml
@@ -8,4 +8,4 @@
     %strong= @email
     from any further admin emails.
   .form-actions
-    = submit_tag 'Unsubscribe', class: 'gl-button btn btn-success'
+    = submit_tag 'Unsubscribe', class: 'gl-button btn btn-confirm'