From 3a255e0ed08ce0663c98f69404fac98459882abd Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Thu, 8 Oct 2026 17:00:59 +0000
Subject: [PATCH] Update Jest snapshots for compass-ui Button markup

Regenerate channels component snapshots after migrating shared Button
to @mattermost/compass-ui so CI shards pass again.

Co-authored-by: Matthew Birtch <mattbirtch@gmail.com>
---
 .../add_groups_to_channel_modal.test.tsx.snap |   4 +-
 .../add_groups_to_team_modal.test.tsx.snap    |   4 +-
 ...dd_user_to_group_multiselect.test.tsx.snap |  12 +-
 .../add_users_to_group_modal.test.tsx.snap    |   4 +-
 .../add_users_to_team_modal.test.tsx.snap     |   4 +-
 .../cluster_settings.test.tsx.snap            |  16 +-
 .../database_settings.test.tsx.snap           |  12 +-
 .../elasticsearch_settings.test.tsx.snap      | 108 +++++++---
 .../message_export_settings.test.tsx.snap     |  60 +++---
 .../__snapshots__/push_settings.test.tsx.snap |   8 +-
 .../policy_details.test.tsx.snap              |  24 ++-
 .../__snapshots__/channel_list.test.tsx.snap  |  32 ++-
 .../__snapshots__/admin_setting.test.tsx.snap |   4 +-
 .../custom_plugin_settings.test.tsx.snap      |  28 +--
 ...om_terms_of_service_settings.test.tsx.snap |   4 +-
 .../__snapshots__/channel_list.test.tsx.snap  |  16 +-
 .../custom_policy_form.test.tsx.snap          |  24 ++-
 .../global_policy_form.test.tsx.snap          |   4 +-
 .../__snapshots__/group_details.test.tsx.snap |  16 +-
 .../group_teams_and_channels.test.tsx.snap    |  56 +++--
 ...group_teams_and_channels_row.test.tsx.snap |  48 +++--
 .../__snapshots__/group_users.test.tsx.snap   | 196 +++++++++++-------
 .../license_settings.test.tsx.snap            |  18 +-
 .../manage_tokens_modal.test.tsx.snap         |  16 +-
 ...ssion_system_scheme_settings.test.tsx.snap |  52 +++--
 .../plugin_management.test.tsx.snap           |  60 ++----
 .../__snapshots__/system_role.test.tsx.snap   |   8 +-
 .../add_users_to_role_modal.test.tsx.snap     |  20 +-
 .../system_role_users.test.tsx.snap           |  18 +-
 .../system_user_detail.test.tsx.snap          |  28 +--
 .../__snapshots__/abstract_list.test.tsx.snap |  84 +++++---
 .../__snapshots__/team_list.test.tsx.snap     |  28 ++-
 .../__snapshots__/abstract_list.test.tsx.snap |  28 ++-
 .../channel_details.test.tsx.snap             |  98 +++++----
 .../channel_groups.test.tsx.snap              |  37 ++--
 .../channel_members.test.tsx.snap             |  34 ++-
 .../__snapshots__/channel_list.test.tsx.snap  |  40 +++-
 .../__snapshots__/group_list.test.tsx.snap    |  56 +++--
 .../users_to_remove.test.tsx.snap             |  24 ++-
 .../__snapshots__/team_details.test.tsx.snap  |   8 +-
 .../__snapshots__/team_groups.test.tsx.snap   |  37 ++--
 .../__snapshots__/team_members.test.tsx.snap  |  34 ++-
 .../__snapshots__/user_grid.test.tsx.snap     |  24 ++-
 .../learn_more_trial_modal.test.tsx.snap      |  13 +-
 .../__snapshots__/login_mfa.test.tsx.snap     |   4 +-
 .../more_direct_channels.test.tsx.snap        |   8 +-
 .../__snapshots__/multiselect.test.tsx.snap   |  12 +-
 ...nboarding_tasklist_completed.test.tsx.snap |  13 +-
 .../signup/__snapshots__/signup.test.tsx.snap |   8 +-
 .../update_user_group_modal.test.tsx.snap     |   4 +-
 .../user_settings_security.test.tsx.snap      |  16 +-
 51 files changed, 903 insertions(+), 611 deletions(-)

diff --git a/webapp/channels/src/components/add_groups_to_channel_modal/__snapshots__/add_groups_to_channel_modal.test.tsx.snap b/webapp/channels/src/components/add_groups_to_channel_modal/__snapshots__/add_groups_to_channel_modal.test.tsx.snap
index 9362333b2b4..e064067a557 100644
--- a/webapp/channels/src/components/add_groups_to_channel_modal/__snapshots__/add_groups_to_channel_modal.test.tsx.snap
+++ b/webapp/channels/src/components/add_groups_to_channel_modal/__snapshots__/add_groups_to_channel_modal.test.tsx.snap
@@ -131,9 +131,7 @@ exports[`components/AddGroupsToChannelModal should match snapshot 1`] = `
                   <span
                     class="_button__label_doayp_24"
                   >
-                    <span>
-                      Add
-                    </span>
+                    Add
                   </span>
                 </button>
               </div>
diff --git a/webapp/channels/src/components/add_groups_to_team_modal/__snapshots__/add_groups_to_team_modal.test.tsx.snap b/webapp/channels/src/components/add_groups_to_team_modal/__snapshots__/add_groups_to_team_modal.test.tsx.snap
index d4495edc3fa..327b28880d6 100644
--- a/webapp/channels/src/components/add_groups_to_team_modal/__snapshots__/add_groups_to_team_modal.test.tsx.snap
+++ b/webapp/channels/src/components/add_groups_to_team_modal/__snapshots__/add_groups_to_team_modal.test.tsx.snap
@@ -131,9 +131,7 @@ exports[`components/AddGroupsToTeamModal should match snapshot 1`] = `
                   <span
                     class="_button__label_doayp_24"
                   >
-                    <span>
-                      Add
-                    </span>
+                    Add
                   </span>
                 </button>
               </div>
diff --git a/webapp/channels/src/components/add_user_to_group_multiselect/__snapshots__/add_user_to_group_multiselect.test.tsx.snap b/webapp/channels/src/components/add_user_to_group_multiselect/__snapshots__/add_user_to_group_multiselect.test.tsx.snap
index 18cf867f336..faa0b46d811 100644
--- a/webapp/channels/src/components/add_user_to_group_multiselect/__snapshots__/add_user_to_group_multiselect.test.tsx.snap
+++ b/webapp/channels/src/components/add_user_to_group_multiselect/__snapshots__/add_user_to_group_multiselect.test.tsx.snap
@@ -90,9 +90,7 @@ exports[`component/add_user_to_group_multiselect should match snapshot with diff
       <span
         class="_button__label_doayp_24"
       >
-        <span>
-          Update Group
-        </span>
+        Update Group
       </span>
     </button>
   </div>
@@ -189,9 +187,7 @@ exports[`component/add_user_to_group_multiselect should match snapshot with prof
       <span
         class="_button__label_doayp_24"
       >
-        <span>
-          Create Group
-        </span>
+        Create Group
       </span>
     </button>
   </div>
@@ -288,9 +284,7 @@ exports[`component/add_user_to_group_multiselect should match snapshot without a
       <span
         class="_button__label_doayp_24"
       >
-        <span>
-          Create Group
-        </span>
+        Create Group
       </span>
     </button>
   </div>
diff --git a/webapp/channels/src/components/add_users_to_group_modal/__snapshots__/add_users_to_group_modal.test.tsx.snap b/webapp/channels/src/components/add_users_to_group_modal/__snapshots__/add_users_to_group_modal.test.tsx.snap
index 206f2b69b0d..a1b8859cae3 100644
--- a/webapp/channels/src/components/add_users_to_group_modal/__snapshots__/add_users_to_group_modal.test.tsx.snap
+++ b/webapp/channels/src/components/add_users_to_group_modal/__snapshots__/add_users_to_group_modal.test.tsx.snap
@@ -172,9 +172,7 @@ exports[`component/add_users_to_group_modal should match snapshot 1`] = `
                       <span
                         class="_button__label_doayp_24"
                       >
-                        <span>
-                          Add People
-                        </span>
+                        Add People
                       </span>
                     </button>
                   </div>
diff --git a/webapp/channels/src/components/add_users_to_team_modal/__snapshots__/add_users_to_team_modal.test.tsx.snap b/webapp/channels/src/components/add_users_to_team_modal/__snapshots__/add_users_to_team_modal.test.tsx.snap
index 1b3c39181d6..6aa33c0075f 100644
--- a/webapp/channels/src/components/add_users_to_team_modal/__snapshots__/add_users_to_team_modal.test.tsx.snap
+++ b/webapp/channels/src/components/add_users_to_team_modal/__snapshots__/add_users_to_team_modal.test.tsx.snap
@@ -131,9 +131,7 @@ exports[`components/admin_console/add_users_to_team_modal/AddUsersToTeamModal sh
                   <span
                     class="_button__label_doayp_24"
                   >
-                    <span>
-                      Add
-                    </span>
+                    Add
                   </span>
                 </button>
               </div>
diff --git a/webapp/channels/src/components/admin_console/__snapshots__/cluster_settings.test.tsx.snap b/webapp/channels/src/components/admin_console/__snapshots__/cluster_settings.test.tsx.snap
index b58b0b2c22a..0785d72b927 100644
--- a/webapp/channels/src/components/admin_console/__snapshots__/cluster_settings.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/__snapshots__/cluster_settings.test.tsx.snap
@@ -349,9 +349,7 @@ exports[`components/ClusterSettings should match snapshot, compression disabled
           <span
             class="_button__label_doayp_24"
           >
-            <span>
-              Save
-            </span>
+            Save
           </span>
         </button>
         <div
@@ -712,9 +710,7 @@ exports[`components/ClusterSettings should match snapshot, compression enabled 1
           <span
             class="_button__label_doayp_24"
           >
-            <span>
-              Save
-            </span>
+            Save
           </span>
         </button>
         <div
@@ -1075,9 +1071,7 @@ exports[`components/ClusterSettings should match snapshot, encryption disabled 1
           <span
             class="_button__label_doayp_24"
           >
-            <span>
-              Save
-            </span>
+            Save
           </span>
         </button>
         <div
@@ -1438,9 +1432,7 @@ exports[`components/ClusterSettings should match snapshot, encryption enabled 1`
           <span
             class="_button__label_doayp_24"
           >
-            <span>
-              Save
-            </span>
+            Save
           </span>
         </button>
         <div
diff --git a/webapp/channels/src/components/admin_console/__snapshots__/database_settings.test.tsx.snap b/webapp/channels/src/components/admin_console/__snapshots__/database_settings.test.tsx.snap
index d0bc6a294e9..0d9a9ac4219 100644
--- a/webapp/channels/src/components/admin_console/__snapshots__/database_settings.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/__snapshots__/database_settings.test.tsx.snap
@@ -346,10 +346,14 @@ exports[`components/DatabaseSettings should match snapshot 1`] = `
             >
               <div>
                 <button
-                  class="btn btn-tertiary"
+                  class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47"
                   type="button"
                 >
-                  Recycle Database Connections
+                  <span
+                    class="_button__label_doayp_24"
+                  >
+                    Recycle Database Connections
+                  </span>
                 </button>
               </div>
               <div
@@ -513,9 +517,7 @@ exports[`components/DatabaseSettings should match snapshot 1`] = `
           <span
             class="_button__label_doayp_24"
           >
-            <span>
-              Save
-            </span>
+            Save
           </span>
         </button>
         <div
diff --git a/webapp/channels/src/components/admin_console/__snapshots__/elasticsearch_settings.test.tsx.snap b/webapp/channels/src/components/admin_console/__snapshots__/elasticsearch_settings.test.tsx.snap
index 975755ba062..55692eba935 100644
--- a/webapp/channels/src/components/admin_console/__snapshots__/elasticsearch_settings.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/__snapshots__/elasticsearch_settings.test.tsx.snap
@@ -412,11 +412,15 @@ exports[`components/ElasticSearchSettings should match snapshot, disabled 1`] =
             >
               <div>
                 <button
-                  class="btn btn-tertiary"
+                  class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47"
                   disabled=""
                   type="button"
                 >
-                  Test Connection
+                  <span
+                    class="_button__label_doayp_24"
+                  >
+                    Test Connection
+                  </span>
                 </button>
               </div>
               <div
@@ -448,11 +452,15 @@ exports[`components/ElasticSearchSettings should match snapshot, disabled 1`] =
                   >
                     <div>
                       <button
-                        class="btn btn-tertiary"
+                        class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47"
                         disabled=""
                         type="button"
                       >
-                        Index Now
+                        <span
+                          class="_button__label_doayp_24"
+                        >
+                          Index Now
+                        </span>
                       </button>
                     </div>
                     <div
@@ -510,11 +518,15 @@ exports[`components/ElasticSearchSettings should match snapshot, disabled 1`] =
             >
               <div>
                 <button
-                  class="btn btn-tertiary"
+                  class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47"
                   disabled=""
                   type="button"
                 >
-                  Rebuild Channels Index
+                  <span
+                    class="_button__label_doayp_24"
+                  >
+                    Rebuild Channels Index
+                  </span>
                 </button>
               </div>
               <div
@@ -543,11 +555,15 @@ exports[`components/ElasticSearchSettings should match snapshot, disabled 1`] =
             >
               <div>
                 <button
-                  class="btn btn-tertiary"
+                  class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47"
                   disabled=""
                   type="button"
                 >
-                  Purge Indexes
+                  <span
+                    class="_button__label_doayp_24"
+                  >
+                    Purge Indexes
+                  </span>
                 </button>
               </div>
               <div
@@ -748,9 +764,7 @@ exports[`components/ElasticSearchSettings should match snapshot, disabled 1`] =
           <span
             class="_button__label_doayp_24"
           >
-            <span>
-              Save
-            </span>
+            Save
           </span>
         </button>
         <div
@@ -1163,10 +1177,14 @@ exports[`components/ElasticSearchSettings should match snapshot, enabled 1`] = `
             >
               <div>
                 <button
-                  class="btn btn-tertiary"
+                  class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47"
                   type="button"
                 >
-                  Test Connection
+                  <span
+                    class="_button__label_doayp_24"
+                  >
+                    Test Connection
+                  </span>
                 </button>
               </div>
               <div
@@ -1198,10 +1216,14 @@ exports[`components/ElasticSearchSettings should match snapshot, enabled 1`] = `
                   >
                     <div>
                       <button
-                        class="btn btn-tertiary"
+                        class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47"
                         type="button"
                       >
-                        Index Now
+                        <span
+                          class="_button__label_doayp_24"
+                        >
+                          Index Now
+                        </span>
                       </button>
                     </div>
                     <div
@@ -1259,10 +1281,14 @@ exports[`components/ElasticSearchSettings should match snapshot, enabled 1`] = `
             >
               <div>
                 <button
-                  class="btn btn-tertiary"
+                  class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47"
                   type="button"
                 >
-                  Rebuild Channels Index
+                  <span
+                    class="_button__label_doayp_24"
+                  >
+                    Rebuild Channels Index
+                  </span>
                 </button>
               </div>
               <div
@@ -1291,10 +1317,14 @@ exports[`components/ElasticSearchSettings should match snapshot, enabled 1`] = `
             >
               <div>
                 <button
-                  class="btn btn-tertiary"
+                  class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47"
                   type="button"
                 >
-                  Purge Indexes
+                  <span
+                    class="_button__label_doayp_24"
+                  >
+                    Purge Indexes
+                  </span>
                 </button>
               </div>
               <div
@@ -1488,9 +1518,7 @@ exports[`components/ElasticSearchSettings should match snapshot, enabled 1`] = `
           <span
             class="_button__label_doayp_24"
           >
-            <span>
-              Save
-            </span>
+            Save
           </span>
         </button>
         <div
@@ -1912,10 +1940,14 @@ exports[`components/ElasticSearchSettings should match snapshot, sniff enabled 1
             >
               <div>
                 <button
-                  class="btn btn-tertiary"
+                  class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47"
                   type="button"
                 >
-                  Test Connection
+                  <span
+                    class="_button__label_doayp_24"
+                  >
+                    Test Connection
+                  </span>
                 </button>
               </div>
               <div
@@ -1947,10 +1979,14 @@ exports[`components/ElasticSearchSettings should match snapshot, sniff enabled 1
                   >
                     <div>
                       <button
-                        class="btn btn-tertiary"
+                        class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47"
                         type="button"
                       >
-                        Index Now
+                        <span
+                          class="_button__label_doayp_24"
+                        >
+                          Index Now
+                        </span>
                       </button>
                     </div>
                     <div
@@ -2008,10 +2044,14 @@ exports[`components/ElasticSearchSettings should match snapshot, sniff enabled 1
             >
               <div>
                 <button
-                  class="btn btn-tertiary"
+                  class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47"
                   type="button"
                 >
-                  Rebuild Channels Index
+                  <span
+                    class="_button__label_doayp_24"
+                  >
+                    Rebuild Channels Index
+                  </span>
                 </button>
               </div>
               <div
@@ -2040,10 +2080,14 @@ exports[`components/ElasticSearchSettings should match snapshot, sniff enabled 1
             >
               <div>
                 <button
-                  class="btn btn-tertiary"
+                  class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47"
                   type="button"
                 >
-                  Purge Indexes
+                  <span
+                    class="_button__label_doayp_24"
+                  >
+                    Purge Indexes
+                  </span>
                 </button>
               </div>
               <div
@@ -2237,9 +2281,7 @@ exports[`components/ElasticSearchSettings should match snapshot, sniff enabled 1
           <span
             class="_button__label_doayp_24"
           >
-            <span>
-              Save
-            </span>
+            Save
           </span>
         </button>
         <div
diff --git a/webapp/channels/src/components/admin_console/__snapshots__/message_export_settings.test.tsx.snap b/webapp/channels/src/components/admin_console/__snapshots__/message_export_settings.test.tsx.snap
index 5b18629657d..69f310dc92c 100644
--- a/webapp/channels/src/components/admin_console/__snapshots__/message_export_settings.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/__snapshots__/message_export_settings.test.tsx.snap
@@ -170,11 +170,15 @@ exports[`components/MessageExportSettings should match snapshot, disabled, actia
             >
               <div>
                 <button
-                  class="btn btn-tertiary"
+                  class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47"
                   disabled=""
                   type="button"
                 >
-                  Run Compliance Export Job Now
+                  <span
+                    class="_button__label_doayp_24"
+                  >
+                    Run Compliance Export Job Now
+                  </span>
                 </button>
               </div>
               <div
@@ -230,9 +234,7 @@ exports[`components/MessageExportSettings should match snapshot, disabled, actia
           <span
             class="_button__label_doayp_24"
           >
-            <span>
-              Save
-            </span>
+            Save
           </span>
         </button>
         <div
@@ -620,11 +622,15 @@ exports[`components/MessageExportSettings should match snapshot, disabled, globa
             >
               <div>
                 <button
-                  class="btn btn-tertiary"
+                  class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47"
                   disabled=""
                   type="button"
                 >
-                  Run Compliance Export Job Now
+                  <span
+                    class="_button__label_doayp_24"
+                  >
+                    Run Compliance Export Job Now
+                  </span>
                 </button>
               </div>
               <div
@@ -680,9 +686,7 @@ exports[`components/MessageExportSettings should match snapshot, disabled, globa
           <span
             class="_button__label_doayp_24"
           >
-            <span>
-              Save
-            </span>
+            Save
           </span>
         </button>
         <div
@@ -862,10 +866,14 @@ exports[`components/MessageExportSettings should match snapshot, enabled, actian
             >
               <div>
                 <button
-                  class="btn btn-tertiary"
+                  class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47"
                   type="button"
                 >
-                  Run Compliance Export Job Now
+                  <span
+                    class="_button__label_doayp_24"
+                  >
+                    Run Compliance Export Job Now
+                  </span>
                 </button>
               </div>
               <div
@@ -921,9 +929,7 @@ exports[`components/MessageExportSettings should match snapshot, enabled, actian
           <span
             class="_button__label_doayp_24"
           >
-            <span>
-              Save
-            </span>
+            Save
           </span>
         </button>
         <div
@@ -1302,10 +1308,14 @@ exports[`components/MessageExportSettings should match snapshot, enabled, global
             >
               <div>
                 <button
-                  class="btn btn-tertiary"
+                  class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47"
                   type="button"
                 >
-                  Run Compliance Export Job Now
+                  <span
+                    class="_button__label_doayp_24"
+                  >
+                    Run Compliance Export Job Now
+                  </span>
                 </button>
               </div>
               <div
@@ -1361,9 +1371,7 @@ exports[`components/MessageExportSettings should match snapshot, enabled, global
           <span
             class="_button__label_doayp_24"
           >
-            <span>
-              Save
-            </span>
+            Save
           </span>
         </button>
         <div
@@ -1866,10 +1874,14 @@ exports[`components/MessageExportSettings should match snapshot, enabled, global
             >
               <div>
                 <button
-                  class="btn btn-tertiary"
+                  class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47"
                   type="button"
                 >
-                  Run Compliance Export Job Now
+                  <span
+                    class="_button__label_doayp_24"
+                  >
+                    Run Compliance Export Job Now
+                  </span>
                 </button>
               </div>
               <div
@@ -1925,9 +1937,7 @@ exports[`components/MessageExportSettings should match snapshot, enabled, global
           <span
             class="_button__label_doayp_24"
           >
-            <span>
-              Save
-            </span>
+            Save
           </span>
         </button>
         <div
diff --git a/webapp/channels/src/components/admin_console/__snapshots__/push_settings.test.tsx.snap b/webapp/channels/src/components/admin_console/__snapshots__/push_settings.test.tsx.snap
index 49b5b6f2c35..9e9dafbb0f7 100644
--- a/webapp/channels/src/components/admin_console/__snapshots__/push_settings.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/__snapshots__/push_settings.test.tsx.snap
@@ -252,9 +252,7 @@ exports[`components/PushSettings should match snapshot, licensed 1`] = `
           <span
             class="_button__label_doayp_24"
           >
-            <span>
-              Save
-            </span>
+            Save
           </span>
         </button>
         <div
@@ -413,9 +411,7 @@ exports[`components/PushSettings should match snapshot, unlicensed 1`] = `
           <span
             class="_button__label_doayp_24"
           >
-            <span>
-              Save
-            </span>
+            Save
           </span>
         </button>
         <div
diff --git a/webapp/channels/src/components/admin_console/access_control/policy_details/__snapshots__/policy_details.test.tsx.snap b/webapp/channels/src/components/admin_console/access_control/policy_details/__snapshots__/policy_details.test.tsx.snap
index f4141d162a1..280d4758ed7 100644
--- a/webapp/channels/src/components/admin_console/access_control/policy_details/__snapshots__/policy_details.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/access_control/policy_details/__snapshots__/policy_details.test.tsx.snap
@@ -276,11 +276,15 @@ exports[`components/admin_console/access_control/policy_details/PolicyDetails sh
                         </div>
                       </div>
                       <button
-                        class="btn btn-primary btn-sm Filter_apply"
+                        class="_button_doayp_2 _button--emphasis-primary_doayp_61 _button--size-small_doayp_40 Filter_apply"
                         disabled=""
                         type="button"
                       >
-                        Apply
+                        <span
+                          class="_button__label_doayp_24"
+                        >
+                          Apply
+                        </span>
                       </button>
                     </div>
                   </div>
@@ -396,9 +400,7 @@ exports[`components/admin_console/access_control/policy_details/PolicyDetails sh
         <span
           class="_button__label_doayp_24"
         >
-          <span>
-            Save
-          </span>
+          Save
         </span>
       </button>
       <button
@@ -692,11 +694,15 @@ exports[`components/admin_console/access_control/policy_details/PolicyDetails sh
                         </div>
                       </div>
                       <button
-                        class="btn btn-primary btn-sm Filter_apply"
+                        class="_button_doayp_2 _button--emphasis-primary_doayp_61 _button--size-small_doayp_40 Filter_apply"
                         disabled=""
                         type="button"
                       >
-                        Apply
+                        <span
+                          class="_button__label_doayp_24"
+                        >
+                          Apply
+                        </span>
                       </button>
                     </div>
                   </div>
@@ -774,9 +780,7 @@ exports[`components/admin_console/access_control/policy_details/PolicyDetails sh
         <span
           class="_button__label_doayp_24"
         >
-          <span>
-            Save
-          </span>
+          Save
         </span>
       </button>
       <button
diff --git a/webapp/channels/src/components/admin_console/access_control/policy_details/channel_list/__snapshots__/channel_list.test.tsx.snap b/webapp/channels/src/components/admin_console/access_control/policy_details/channel_list/__snapshots__/channel_list.test.tsx.snap
index 50a85aaa3a8..656b4d8c5c3 100644
--- a/webapp/channels/src/components/admin_console/access_control/policy_details/channel_list/__snapshots__/channel_list.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/access_control/policy_details/channel_list/__snapshots__/channel_list.test.tsx.snap
@@ -155,11 +155,15 @@ exports[`components/admin_console/access_control/channel_list should match snaps
               </div>
             </div>
             <button
-              class="btn btn-primary btn-sm Filter_apply"
+              class="_button_doayp_2 _button--emphasis-primary_doayp_61 _button--size-small_doayp_40 Filter_apply"
               disabled=""
               type="button"
             >
-              Apply
+              <span
+                class="_button__label_doayp_24"
+              >
+                Apply
+              </span>
             </button>
           </div>
         </div>
@@ -424,11 +428,15 @@ exports[`components/admin_console/access_control/channel_list should match snaps
               </div>
             </div>
             <button
-              class="btn btn-primary btn-sm Filter_apply"
+              class="_button_doayp_2 _button--emphasis-primary_doayp_61 _button--size-small_doayp_40 Filter_apply"
               disabled=""
               type="button"
             >
-              Apply
+              <span
+                class="_button__label_doayp_24"
+              >
+                Apply
+              </span>
             </button>
           </div>
         </div>
@@ -693,11 +701,15 @@ exports[`components/admin_console/access_control/channel_list should match snaps
               </div>
             </div>
             <button
-              class="btn btn-primary btn-sm Filter_apply"
+              class="_button_doayp_2 _button--emphasis-primary_doayp_61 _button--size-small_doayp_40 Filter_apply"
               disabled=""
               type="button"
             >
-              Apply
+              <span
+                class="_button__label_doayp_24"
+              >
+                Apply
+              </span>
             </button>
           </div>
         </div>
@@ -962,11 +974,15 @@ exports[`components/admin_console/access_control/channel_list should match snaps
               </div>
             </div>
             <button
-              class="btn btn-primary btn-sm Filter_apply"
+              class="_button_doayp_2 _button--emphasis-primary_doayp_61 _button--size-small_doayp_40 Filter_apply"
               disabled=""
               type="button"
             >
-              Apply
+              <span
+                class="_button__label_doayp_24"
+              >
+                Apply
+              </span>
             </button>
           </div>
         </div>
diff --git a/webapp/channels/src/components/admin_console/admin_settings/__snapshots__/admin_setting.test.tsx.snap b/webapp/channels/src/components/admin_console/admin_settings/__snapshots__/admin_setting.test.tsx.snap
index 8f4d58f7af3..efe6fa36269 100644
--- a/webapp/channels/src/components/admin_console/admin_settings/__snapshots__/admin_setting.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/admin_settings/__snapshots__/admin_setting.test.tsx.snap
@@ -29,9 +29,7 @@ exports[`AdminSettings should match snapshot 1`] = `
           <span
             class="_button__label_doayp_24"
           >
-            <span>
-              Save
-            </span>
+            Save
           </span>
         </button>
         <div
diff --git a/webapp/channels/src/components/admin_console/custom_plugin_settings/__snapshots__/custom_plugin_settings.test.tsx.snap b/webapp/channels/src/components/admin_console/custom_plugin_settings/__snapshots__/custom_plugin_settings.test.tsx.snap
index 99657447d52..ce870a553b4 100644
--- a/webapp/channels/src/components/admin_console/custom_plugin_settings/__snapshots__/custom_plugin_settings.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/custom_plugin_settings/__snapshots__/custom_plugin_settings.test.tsx.snap
@@ -275,10 +275,14 @@ exports[`components/admin_console/CustomPluginSettings should match snapshot wit
                     class="help-text"
                   >
                     <button
-                      class="btn btn-tertiary"
+                      class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47"
                       type="button"
                     >
-                      Regenerate
+                      <span
+                        class="_button__label_doayp_24"
+                      >
+                        Regenerate
+                      </span>
                     </button>
                   </div>
                   <div
@@ -372,9 +376,7 @@ exports[`components/admin_console/CustomPluginSettings should match snapshot wit
         <span
           class="_button__label_doayp_24"
         >
-          <span>
-            Save
-          </span>
+          Save
         </span>
       </button>
       <div
@@ -427,9 +429,7 @@ exports[`components/admin_console/CustomPluginSettings should match snapshot wit
         <span
           class="_button__label_doayp_24"
         >
-          <span>
-            Save
-          </span>
+          Save
         </span>
       </button>
       <div
@@ -716,10 +716,14 @@ exports[`components/admin_console/CustomPluginSettings should match snapshot wit
                     class="help-text"
                   >
                     <button
-                      class="btn btn-tertiary"
+                      class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47"
                       type="button"
                     >
-                      Regenerate
+                      <span
+                        class="_button__label_doayp_24"
+                      >
+                        Regenerate
+                      </span>
                     </button>
                   </div>
                   <div
@@ -813,9 +817,7 @@ exports[`components/admin_console/CustomPluginSettings should match snapshot wit
         <span
           class="_button__label_doayp_24"
         >
-          <span>
-            Save
-          </span>
+          Save
         </span>
       </button>
       <div
diff --git a/webapp/channels/src/components/admin_console/custom_terms_of_service_settings/__snapshots__/custom_terms_of_service_settings.test.tsx.snap b/webapp/channels/src/components/admin_console/custom_terms_of_service_settings/__snapshots__/custom_terms_of_service_settings.test.tsx.snap
index caca0a0771f..51d6b50e1e4 100644
--- a/webapp/channels/src/components/admin_console/custom_terms_of_service_settings/__snapshots__/custom_terms_of_service_settings.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/custom_terms_of_service_settings/__snapshots__/custom_terms_of_service_settings.test.tsx.snap
@@ -149,9 +149,7 @@ exports[`components/admin_console/CustomTermsOfServiceSettings should match snap
           <span
             class="_button__label_doayp_24"
           >
-            <span>
-              Save
-            </span>
+            Save
           </span>
         </button>
         <div
diff --git a/webapp/channels/src/components/admin_console/data_retention_settings/channel_list/__snapshots__/channel_list.test.tsx.snap b/webapp/channels/src/components/admin_console/data_retention_settings/channel_list/__snapshots__/channel_list.test.tsx.snap
index 668dd8379de..8ba45654332 100644
--- a/webapp/channels/src/components/admin_console/data_retention_settings/channel_list/__snapshots__/channel_list.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/data_retention_settings/channel_list/__snapshots__/channel_list.test.tsx.snap
@@ -212,11 +212,15 @@ exports[`components/admin_console/data_retention_settings/channel_list should ma
               </div>
             </div>
             <button
-              class="btn btn-primary btn-sm Filter_apply"
+              class="_button_doayp_2 _button--emphasis-primary_doayp_61 _button--size-small_doayp_40 Filter_apply"
               disabled=""
               type="button"
             >
-              Apply
+              <span
+                class="_button__label_doayp_24"
+              >
+                Apply
+              </span>
             </button>
           </div>
         </div>
@@ -562,11 +566,15 @@ exports[`components/admin_console/data_retention_settings/channel_list should ma
               </div>
             </div>
             <button
-              class="btn btn-primary btn-sm Filter_apply"
+              class="_button_doayp_2 _button--emphasis-primary_doayp_61 _button--size-small_doayp_40 Filter_apply"
               disabled=""
               type="button"
             >
-              Apply
+              <span
+                class="_button__label_doayp_24"
+              >
+                Apply
+              </span>
             </button>
           </div>
         </div>
diff --git a/webapp/channels/src/components/admin_console/data_retention_settings/custom_policy_form/__snapshots__/custom_policy_form.test.tsx.snap b/webapp/channels/src/components/admin_console/data_retention_settings/custom_policy_form/__snapshots__/custom_policy_form.test.tsx.snap
index 7414b2a0d1b..44782ce7c9c 100644
--- a/webapp/channels/src/components/admin_console/data_retention_settings/custom_policy_form/__snapshots__/custom_policy_form.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/data_retention_settings/custom_policy_form/__snapshots__/custom_policy_form.test.tsx.snap
@@ -514,11 +514,15 @@ exports[`components/admin_console/data_retention_settings/custom_policy_form sho
                         </div>
                       </div>
                       <button
-                        class="btn btn-primary btn-sm Filter_apply"
+                        class="_button_doayp_2 _button--emphasis-primary_doayp_61 _button--size-small_doayp_40 Filter_apply"
                         disabled=""
                         type="button"
                       >
-                        Apply
+                        <span
+                          class="_button__label_doayp_24"
+                        >
+                          Apply
+                        </span>
                       </button>
                     </div>
                   </div>
@@ -570,9 +574,7 @@ exports[`components/admin_console/data_retention_settings/custom_policy_form sho
         <span
           class="_button__label_doayp_24"
         >
-          <span>
-            Save
-          </span>
+          Save
         </span>
       </button>
       <button
@@ -1109,11 +1111,15 @@ exports[`components/admin_console/data_retention_settings/custom_policy_form sho
                         </div>
                       </div>
                       <button
-                        class="btn btn-primary btn-sm Filter_apply"
+                        class="_button_doayp_2 _button--emphasis-primary_doayp_61 _button--size-small_doayp_40 Filter_apply"
                         disabled=""
                         type="button"
                       >
-                        Apply
+                        <span
+                          class="_button__label_doayp_24"
+                        >
+                          Apply
+                        </span>
                       </button>
                     </div>
                   </div>
@@ -1175,9 +1181,7 @@ exports[`components/admin_console/data_retention_settings/custom_policy_form sho
         <span
           class="_button__label_doayp_24"
         >
-          <span>
-            Save
-          </span>
+          Save
         </span>
       </button>
       <button
diff --git a/webapp/channels/src/components/admin_console/data_retention_settings/global_policy_form/__snapshots__/global_policy_form.test.tsx.snap b/webapp/channels/src/components/admin_console/data_retention_settings/global_policy_form/__snapshots__/global_policy_form.test.tsx.snap
index bc6e683b380..5a10827c974 100644
--- a/webapp/channels/src/components/admin_console/data_retention_settings/global_policy_form/__snapshots__/global_policy_form.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/data_retention_settings/global_policy_form/__snapshots__/global_policy_form.test.tsx.snap
@@ -248,9 +248,7 @@ exports[`components/PluginManagement should match snapshot 1`] = `
         <span
           class="_button__label_doayp_24"
         >
-          <span>
-            Save
-          </span>
+          Save
         </span>
       </button>
       <button
diff --git a/webapp/channels/src/components/admin_console/group_settings/group_details/__snapshots__/group_details.test.tsx.snap b/webapp/channels/src/components/admin_console/group_settings/group_details/__snapshots__/group_details.test.tsx.snap
index 54aa8fd2c0b..405a3fdc707 100644
--- a/webapp/channels/src/components/admin_console/group_settings/group_details/__snapshots__/group_details.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/group_settings/group_details/__snapshots__/group_details.test.tsx.snap
@@ -406,9 +406,7 @@ exports[`components/admin_console/group_settings/group_details/GroupDetails shou
         <span
           class="_button__label_doayp_24"
         >
-          <span>
-            Save
-          </span>
+          Save
         </span>
       </button>
       <button
@@ -837,9 +835,7 @@ exports[`components/admin_console/group_settings/group_details/GroupDetails shou
         <span
           class="_button__label_doayp_24"
         >
-          <span>
-            Save
-          </span>
+          Save
         </span>
       </button>
       <button
@@ -1266,9 +1262,7 @@ exports[`components/admin_console/group_settings/group_details/GroupDetails shou
         <span
           class="_button__label_doayp_24"
         >
-          <span>
-            Save
-          </span>
+          Save
         </span>
       </button>
       <button
@@ -1693,9 +1687,7 @@ exports[`components/admin_console/group_settings/group_details/GroupDetails shou
         <span
           class="_button__label_doayp_24"
         >
-          <span>
-            Save
-          </span>
+          Save
         </span>
       </button>
       <button
diff --git a/webapp/channels/src/components/admin_console/group_settings/group_details/__snapshots__/group_teams_and_channels.test.tsx.snap b/webapp/channels/src/components/admin_console/group_settings/group_details/__snapshots__/group_teams_and_channels.test.tsx.snap
index 5aa61fcfd24..e4d207c42cf 100644
--- a/webapp/channels/src/components/admin_console/group_settings/group_details/__snapshots__/group_teams_and_channels.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/group_settings/group_details/__snapshots__/group_teams_and_channels.test.tsx.snap
@@ -63,11 +63,15 @@ exports[`components/admin_console/group_settings/group_details/GroupTeamsAndChan
             class="text-right"
           >
             <button
-              class="btn btn-tertiary"
+              class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47"
               data-testid="Team 1_groupsyncable_remove"
               type="button"
             >
-              Remove
+              <span
+                class="_button__label_doayp_24"
+              >
+                Remove
+              </span>
             </button>
           </td>
         </tr>
@@ -113,11 +117,15 @@ exports[`components/admin_console/group_settings/group_details/GroupTeamsAndChan
             class="text-right"
           >
             <button
-              class="btn btn-tertiary"
+              class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47"
               data-testid="Channel 4_groupsyncable_remove"
               type="button"
             >
-              Remove
+              <span
+                class="_button__label_doayp_24"
+              >
+                Remove
+              </span>
             </button>
           </td>
         </tr>
@@ -144,11 +152,15 @@ exports[`components/admin_console/group_settings/group_details/GroupTeamsAndChan
             class="text-right"
           >
             <button
-              class="btn btn-tertiary"
+              class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47"
               data-testid="Team 2_groupsyncable_remove"
               type="button"
             >
-              Remove
+              <span
+                class="_button__label_doayp_24"
+              >
+                Remove
+              </span>
             </button>
           </td>
         </tr>
@@ -175,11 +187,15 @@ exports[`components/admin_console/group_settings/group_details/GroupTeamsAndChan
             class="text-right"
           >
             <button
-              class="btn btn-tertiary"
+              class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47"
               data-testid="Team 3_groupsyncable_remove"
               type="button"
             >
-              Remove
+              <span
+                class="_button__label_doayp_24"
+              >
+                Remove
+              </span>
             </button>
           </td>
         </tr>
@@ -210,11 +226,15 @@ exports[`components/admin_console/group_settings/group_details/GroupTeamsAndChan
             class="text-right"
           >
             <button
-              class="btn btn-tertiary"
+              class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47"
               data-testid="Team 9_groupsyncable_remove"
               type="button"
             >
-              Remove
+              <span
+                class="_button__label_doayp_24"
+              >
+                Remove
+              </span>
             </button>
           </td>
         </tr>
@@ -285,11 +305,15 @@ exports[`components/admin_console/group_settings/group_details/GroupTeamsAndChan
             class="text-right"
           >
             <button
-              class="btn btn-tertiary"
+              class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47"
               data-testid="Channel 5_groupsyncable_remove"
               type="button"
             >
-              Remove
+              <span
+                class="_button__label_doayp_24"
+              >
+                Remove
+              </span>
             </button>
           </td>
         </tr>
@@ -360,11 +384,15 @@ exports[`components/admin_console/group_settings/group_details/GroupTeamsAndChan
             class="text-right"
           >
             <button
-              class="btn btn-tertiary"
+              class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47"
               data-testid="Channel 6_groupsyncable_remove"
               type="button"
             >
-              Remove
+              <span
+                class="_button__label_doayp_24"
+              >
+                Remove
+              </span>
             </button>
           </td>
         </tr>
diff --git a/webapp/channels/src/components/admin_console/group_settings/group_details/__snapshots__/group_teams_and_channels_row.test.tsx.snap b/webapp/channels/src/components/admin_console/group_settings/group_details/__snapshots__/group_teams_and_channels_row.test.tsx.snap
index 2a7d0d36b25..ea0b2a360ab 100644
--- a/webapp/channels/src/components/admin_console/group_settings/group_details/__snapshots__/group_teams_and_channels_row.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/group_settings/group_details/__snapshots__/group_teams_and_channels_row.test.tsx.snap
@@ -71,11 +71,15 @@ exports[`components/admin_console/group_settings/group_details/GroupTeamsAndChan
           class="text-right"
         >
           <button
-            class="btn btn-tertiary"
+            class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47"
             data-testid="Test private-channel_groupsyncable_remove"
             type="button"
           >
-            Remove
+            <span
+              class="_button__label_doayp_24"
+            >
+              Remove
+            </span>
           </button>
         </td>
       </tr>
@@ -111,11 +115,15 @@ exports[`components/admin_console/group_settings/group_details/GroupTeamsAndChan
           class="text-right"
         >
           <button
-            class="btn btn-tertiary"
+            class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47"
             data-testid="Test private-team_groupsyncable_remove"
             type="button"
           >
-            Remove
+            <span
+              class="_button__label_doayp_24"
+            >
+              Remove
+            </span>
           </button>
         </td>
       </tr>
@@ -170,11 +178,15 @@ exports[`components/admin_console/group_settings/group_details/GroupTeamsAndChan
           class="text-right"
         >
           <button
-            class="btn btn-tertiary"
+            class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47"
             data-testid="Test public-channel_groupsyncable_remove"
             type="button"
           >
-            Remove
+            <span
+              class="_button__label_doayp_24"
+            >
+              Remove
+            </span>
           </button>
         </td>
       </tr>
@@ -210,11 +222,15 @@ exports[`components/admin_console/group_settings/group_details/GroupTeamsAndChan
           class="text-right"
         >
           <button
-            class="btn btn-tertiary"
+            class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47"
             data-testid="Test public-team_groupsyncable_remove"
             type="button"
           >
-            Remove
+            <span
+              class="_button__label_doayp_24"
+            >
+              Remove
+            </span>
           </button>
         </td>
       </tr>
@@ -254,11 +270,15 @@ exports[`components/admin_console/group_settings/group_details/GroupTeamsAndChan
           class="text-right"
         >
           <button
-            class="btn btn-tertiary"
+            class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47"
             data-testid="Test team with children_groupsyncable_remove"
             type="button"
           >
-            Remove
+            <span
+              class="_button__label_doayp_24"
+            >
+              Remove
+            </span>
           </button>
         </td>
       </tr>
@@ -298,11 +318,15 @@ exports[`components/admin_console/group_settings/group_details/GroupTeamsAndChan
           class="text-right"
         >
           <button
-            class="btn btn-tertiary"
+            class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47"
             data-testid="Test team with children_groupsyncable_remove"
             type="button"
           >
-            Remove
+            <span
+              class="_button__label_doayp_24"
+            >
+              Remove
+            </span>
           </button>
         </td>
       </tr>
diff --git a/webapp/channels/src/components/admin_console/group_settings/group_details/__snapshots__/group_users.test.tsx.snap b/webapp/channels/src/components/admin_console/group_settings/group_details/__snapshots__/group_users.test.tsx.snap
index ef9981811a8..c5bc7745835 100644
--- a/webapp/channels/src/components/admin_console/group_settings/group_details/__snapshots__/group_users.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/group_settings/group_details/__snapshots__/group_users.test.tsx.snap
@@ -855,24 +855,32 @@ exports[`components/admin_console/group_settings/group_details/GroupUsers should
         1 - 20 of 20
       </div>
       <button
-        class="btn btn-tertiary prev disabled"
+        class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47 prev disabled"
         disabled=""
         type="button"
       >
-        <i
-          class="icon icon-chevron-left"
-          title="Previous Icon"
-        />
+        <span
+          class="_button__label_doayp_24"
+        >
+          <i
+            class="icon icon-chevron-left"
+            title="Previous Icon"
+          />
+        </span>
       </button>
       <button
-        class="btn btn-tertiary next disabled"
+        class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47 next disabled"
         disabled=""
         type="button"
       >
-        <i
-          class="icon icon-chevron-right"
-          title="Next Icon"
-        />
+        <span
+          class="_button__label_doayp_24"
+        >
+          <i
+            class="icon icon-chevron-right"
+            title="Next Icon"
+          />
+        </span>
       </button>
     </div>
   </div>
@@ -1734,23 +1742,31 @@ exports[`components/admin_console/group_settings/group_details/GroupUsers should
         1 - 20 of 55
       </div>
       <button
-        class="btn btn-tertiary prev disabled"
+        class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47 prev disabled"
         disabled=""
         type="button"
       >
-        <i
-          class="icon icon-chevron-left"
-          title="Previous Icon"
-        />
+        <span
+          class="_button__label_doayp_24"
+        >
+          <i
+            class="icon icon-chevron-left"
+            title="Previous Icon"
+          />
+        </span>
       </button>
       <button
-        class="btn btn-tertiary next"
+        class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47 next"
         type="button"
       >
-        <i
-          class="icon icon-chevron-right"
-          title="Next Icon"
-        />
+        <span
+          class="_button__label_doayp_24"
+        >
+          <i
+            class="icon icon-chevron-right"
+            title="Next Icon"
+          />
+        </span>
       </button>
     </div>
   </div>
@@ -2612,22 +2628,30 @@ exports[`components/admin_console/group_settings/group_details/GroupUsers should
         21 - 40 of 55
       </div>
       <button
-        class="btn btn-tertiary prev"
+        class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47 prev"
         type="button"
       >
-        <i
-          class="icon icon-chevron-left"
-          title="Previous Icon"
-        />
+        <span
+          class="_button__label_doayp_24"
+        >
+          <i
+            class="icon icon-chevron-left"
+            title="Previous Icon"
+          />
+        </span>
       </button>
       <button
-        class="btn btn-tertiary next"
+        class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47 next"
         type="button"
       >
-        <i
-          class="icon icon-chevron-right"
-          title="Next Icon"
-        />
+        <span
+          class="_button__label_doayp_24"
+        >
+          <i
+            class="icon icon-chevron-right"
+            title="Next Icon"
+          />
+        </span>
       </button>
     </div>
   </div>
@@ -3284,23 +3308,31 @@ exports[`components/admin_console/group_settings/group_details/GroupUsers should
         41 - 55 of 55
       </div>
       <button
-        class="btn btn-tertiary prev"
+        class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47 prev"
         type="button"
       >
-        <i
-          class="icon icon-chevron-left"
-          title="Previous Icon"
-        />
+        <span
+          class="_button__label_doayp_24"
+        >
+          <i
+            class="icon icon-chevron-left"
+            title="Previous Icon"
+          />
+        </span>
       </button>
       <button
-        class="btn btn-tertiary next disabled"
+        class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47 next disabled"
         disabled=""
         type="button"
       >
-        <i
-          class="icon icon-chevron-right"
-          title="Next Icon"
-        />
+        <span
+          class="_button__label_doayp_24"
+        >
+          <i
+            class="icon icon-chevron-right"
+            title="Next Icon"
+          />
+        </span>
       </button>
     </div>
   </div>
@@ -4162,24 +4194,32 @@ exports[`components/admin_console/group_settings/group_details/GroupUsers should
         1 - 20 of 20
       </div>
       <button
-        class="btn btn-tertiary prev disabled"
+        class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47 prev disabled"
         disabled=""
         type="button"
       >
-        <i
-          class="icon icon-chevron-left"
-          title="Previous Icon"
-        />
+        <span
+          class="_button__label_doayp_24"
+        >
+          <i
+            class="icon icon-chevron-left"
+            title="Previous Icon"
+          />
+        </span>
       </button>
       <button
-        class="btn btn-tertiary next disabled"
+        class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47 next disabled"
         disabled=""
         type="button"
       >
-        <i
-          class="icon icon-chevron-right"
-          title="Next Icon"
-        />
+        <span
+          class="_button__label_doayp_24"
+        >
+          <i
+            class="icon icon-chevron-right"
+            title="Next Icon"
+          />
+        </span>
       </button>
     </div>
   </div>
@@ -5079,24 +5119,32 @@ exports[`components/admin_console/group_settings/group_details/GroupUsers should
         1 - 20 of 20
       </div>
       <button
-        class="btn btn-tertiary prev disabled"
+        class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47 prev disabled"
         disabled=""
         type="button"
       >
-        <i
-          class="icon icon-chevron-left"
-          title="Previous Icon"
-        />
+        <span
+          class="_button__label_doayp_24"
+        >
+          <i
+            class="icon icon-chevron-left"
+            title="Previous Icon"
+          />
+        </span>
       </button>
       <button
-        class="btn btn-tertiary next disabled"
+        class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47 next disabled"
         disabled=""
         type="button"
       >
-        <i
-          class="icon icon-chevron-right"
-          title="Next Icon"
-        />
+        <span
+          class="_button__label_doayp_24"
+        >
+          <i
+            class="icon icon-chevron-right"
+            title="Next Icon"
+          />
+        </span>
       </button>
     </div>
   </div>
@@ -5991,24 +6039,32 @@ exports[`components/admin_console/group_settings/group_details/GroupUsers should
         1 - 20 of 20
       </div>
       <button
-        class="btn btn-tertiary prev disabled"
+        class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47 prev disabled"
         disabled=""
         type="button"
       >
-        <i
-          class="icon icon-chevron-left"
-          title="Previous Icon"
-        />
+        <span
+          class="_button__label_doayp_24"
+        >
+          <i
+            class="icon icon-chevron-left"
+            title="Previous Icon"
+          />
+        </span>
       </button>
       <button
-        class="btn btn-tertiary next disabled"
+        class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47 next disabled"
         disabled=""
         type="button"
       >
-        <i
-          class="icon icon-chevron-right"
-          title="Next Icon"
-        />
+        <span
+          class="_button__label_doayp_24"
+        >
+          <i
+            class="icon icon-chevron-right"
+            title="Next Icon"
+          />
+        </span>
       </button>
     </div>
   </div>
diff --git a/webapp/channels/src/components/admin_console/license_settings/__snapshots__/license_settings.test.tsx.snap b/webapp/channels/src/components/admin_console/license_settings/__snapshots__/license_settings.test.tsx.snap
index 62906af02e3..19e706eab17 100644
--- a/webapp/channels/src/components/admin_console/license_settings/__snapshots__/license_settings.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/license_settings/__snapshots__/license_settings.test.tsx.snap
@@ -1237,7 +1237,7 @@ exports[`components/admin_console/license_settings/LicenseSettings should match
                       >
                         February 04, 2018
                          
-                        4:24 AM
+                        3:24 AM
                       </span>
                     </div>
                     <div
@@ -1920,7 +1920,7 @@ exports[`components/admin_console/license_settings/LicenseSettings should match
                       >
                         February 04, 2018
                          
-                        4:24 AM
+                        3:24 AM
                       </span>
                     </div>
                     <div
@@ -2589,7 +2589,7 @@ exports[`components/admin_console/license_settings/LicenseSettings should match
                       >
                         February 04, 2018
                          
-                        4:24 AM
+                        3:24 AM
                       </span>
                     </div>
                     <div
@@ -3274,7 +3274,7 @@ exports[`components/admin_console/license_settings/LicenseSettings should match
                       >
                         February 04, 2018
                          
-                        4:24 AM
+                        3:24 AM
                       </span>
                     </div>
                     <div
@@ -3943,7 +3943,7 @@ exports[`components/admin_console/license_settings/LicenseSettings should match
                       >
                         February 04, 2018
                          
-                        4:24 AM
+                        3:24 AM
                       </span>
                     </div>
                     <div
@@ -4613,7 +4613,7 @@ exports[`components/admin_console/license_settings/LicenseSettings should match
                       >
                         February 04, 2018
                          
-                        4:24 AM
+                        3:24 AM
                       </span>
                     </div>
                     <div
@@ -5278,7 +5278,7 @@ exports[`components/admin_console/license_settings/LicenseSettings should match
                       >
                         April 06, 2021
                          
-                        3:10 PM
+                        1:10 PM
                       </span>
                     </div>
                     <div
@@ -8424,7 +8424,7 @@ exports[`components/admin_console/license_settings/LicenseSettings should match
                       >
                         February 04, 2018
                          
-                        4:24 AM
+                        3:24 AM
                       </span>
                     </div>
                     <div
@@ -9093,7 +9093,7 @@ exports[`components/admin_console/license_settings/LicenseSettings should match
                       >
                         February 04, 2018
                          
-                        4:24 AM
+                        3:24 AM
                       </span>
                     </div>
                     <div
diff --git a/webapp/channels/src/components/admin_console/manage_tokens_modal/__snapshots__/manage_tokens_modal.test.tsx.snap b/webapp/channels/src/components/admin_console/manage_tokens_modal/__snapshots__/manage_tokens_modal.test.tsx.snap
index b30cce0952a..11a171869af 100644
--- a/webapp/channels/src/components/admin_console/manage_tokens_modal/__snapshots__/manage_tokens_modal.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/manage_tokens_modal/__snapshots__/manage_tokens_modal.test.tsx.snap
@@ -274,10 +274,14 @@ exports[`components/admin_console/manage_tokens_modal/manage_tokens_modal.tsx sh
                   class="manage-teams__team-actions"
                 >
                   <button
-                    class="btn btn-danger"
+                    class="_button_doayp_2 _button--emphasis-primary_doayp_61 _button--size-medium_doayp_47 _button--destructive_doayp_130"
                     type="button"
                   >
-                    Delete
+                    <span
+                      class="_button__label_doayp_24"
+                    >
+                      Delete
+                    </span>
                   </button>
                 </div>
               </div>
@@ -316,10 +320,14 @@ exports[`components/admin_console/manage_tokens_modal/manage_tokens_modal.tsx sh
                   class="manage-teams__team-actions"
                 >
                   <button
-                    class="btn btn-danger"
+                    class="_button_doayp_2 _button--emphasis-primary_doayp_61 _button--size-medium_doayp_47 _button--destructive_doayp_130"
                     type="button"
                   >
-                    Delete
+                    <span
+                      class="_button__label_doayp_24"
+                    >
+                      Delete
+                    </span>
                   </button>
                 </div>
               </div>
diff --git a/webapp/channels/src/components/admin_console/permission_schemes_settings/permission_system_scheme_settings/__snapshots__/permission_system_scheme_settings.test.tsx.snap b/webapp/channels/src/components/admin_console/permission_schemes_settings/permission_system_scheme_settings/__snapshots__/permission_system_scheme_settings.test.tsx.snap
index f8846586c0a..2cad6a0899b 100644
--- a/webapp/channels/src/components/admin_console/permission_schemes_settings/permission_system_scheme_settings/__snapshots__/permission_system_scheme_settings.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/permission_schemes_settings/permission_system_scheme_settings/__snapshots__/permission_system_scheme_settings.test.tsx.snap
@@ -4214,9 +4214,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_system_
         <span
           class="_button__label_doayp_24"
         >
-          <span>
-            Save
-          </span>
+          Save
         </span>
       </button>
       <button
@@ -4231,10 +4229,15 @@ exports[`components/admin_console/permission_schemes_settings/permission_system_
         </span>
       </button>
       <button
-        class="btn btn-quaternary"
+        class="_button_doayp_2 _button--emphasis-quaternary_doayp_105 _button--size-medium_doayp_47"
         data-testid="resetPermissionsToDefault"
+        type="button"
       >
-        Reset to Defaults
+        <span
+          class="_button__label_doayp_24"
+        >
+          Reset to Defaults
+        </span>
       </button>
       <div
         class="error-message"
@@ -8289,9 +8292,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_system_
         <span
           class="_button__label_doayp_24"
         >
-          <span>
-            Save
-          </span>
+          Save
         </span>
       </button>
       <button
@@ -8306,10 +8307,15 @@ exports[`components/admin_console/permission_schemes_settings/permission_system_
         </span>
       </button>
       <button
-        class="btn btn-quaternary"
+        class="_button_doayp_2 _button--emphasis-quaternary_doayp_105 _button--size-medium_doayp_47"
         data-testid="resetPermissionsToDefault"
+        type="button"
       >
-        Reset to Defaults
+        <span
+          class="_button__label_doayp_24"
+        >
+          Reset to Defaults
+        </span>
       </button>
       <div
         class="error-message"
@@ -12365,9 +12371,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_system_
         <span
           class="_button__label_doayp_24"
         >
-          <span>
-            Save
-          </span>
+          Save
         </span>
       </button>
       <button
@@ -12382,10 +12386,15 @@ exports[`components/admin_console/permission_schemes_settings/permission_system_
         </span>
       </button>
       <button
-        class="btn btn-quaternary"
+        class="_button_doayp_2 _button--emphasis-quaternary_doayp_105 _button--size-medium_doayp_47"
         data-testid="resetPermissionsToDefault"
+        type="button"
       >
-        Reset to Defaults
+        <span
+          class="_button__label_doayp_24"
+        >
+          Reset to Defaults
+        </span>
       </button>
       <div
         class="error-message"
@@ -16440,9 +16449,7 @@ exports[`components/admin_console/permission_schemes_settings/permission_system_
         <span
           class="_button__label_doayp_24"
         >
-          <span>
-            Save
-          </span>
+          Save
         </span>
       </button>
       <button
@@ -16457,10 +16464,15 @@ exports[`components/admin_console/permission_schemes_settings/permission_system_
         </span>
       </button>
       <button
-        class="btn btn-quaternary"
+        class="_button_doayp_2 _button--emphasis-quaternary_doayp_105 _button--size-medium_doayp_47"
         data-testid="resetPermissionsToDefault"
+        type="button"
       >
-        Reset to Defaults
+        <span
+          class="_button__label_doayp_24"
+        >
+          Reset to Defaults
+        </span>
       </button>
       <div
         class="error-message"
diff --git a/webapp/channels/src/components/admin_console/plugin_management/__snapshots__/plugin_management.test.tsx.snap b/webapp/channels/src/components/admin_console/plugin_management/__snapshots__/plugin_management.test.tsx.snap
index 3db2d722f6f..fe9acf1ae1b 100644
--- a/webapp/channels/src/components/admin_console/plugin_management/__snapshots__/plugin_management.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/plugin_management/__snapshots__/plugin_management.test.tsx.snap
@@ -403,9 +403,7 @@ exports[`components/PluginManagement should match snapshot 1`] = `
           <span
             class="_button__label_doayp_24"
           >
-            <span>
-              Save
-            </span>
+            Save
           </span>
         </button>
         <div
@@ -823,9 +821,7 @@ exports[`components/PluginManagement should match snapshot when \`Enable Marketp
           <span
             class="_button__label_doayp_24"
           >
-            <span>
-              Save
-            </span>
+            Save
           </span>
         </button>
         <div
@@ -900,9 +896,7 @@ exports[`components/PluginManagement should match snapshot when \`Enable Plugins
           <span
             class="_button__label_doayp_24"
           >
-            <span>
-              Save
-            </span>
+            Save
           </span>
         </button>
         <div
@@ -1318,9 +1312,7 @@ exports[`components/PluginManagement should match snapshot when \`Enable Remote
           <span
             class="_button__label_doayp_24"
           >
-            <span>
-              Save
-            </span>
+            Save
           </span>
         </button>
         <div
@@ -1744,9 +1736,7 @@ exports[`components/PluginManagement should match snapshot when \`Require Signat
           <span
             class="_button__label_doayp_24"
           >
-            <span>
-              Save
-            </span>
+            Save
           </span>
         </button>
         <div
@@ -2162,9 +2152,7 @@ exports[`components/PluginManagement should match snapshot, No installed plugins
           <span
             class="_button__label_doayp_24"
           >
-            <span>
-              Save
-            </span>
+            Save
           </span>
         </button>
         <div
@@ -2579,9 +2567,7 @@ exports[`components/PluginManagement should match snapshot, allow insecure URL e
           <span
             class="_button__label_doayp_24"
           >
-            <span>
-              Save
-            </span>
+            Save
           </span>
         </button>
         <div
@@ -2999,9 +2985,7 @@ exports[`components/PluginManagement should match snapshot, disabled 1`] = `
           <span
             class="_button__label_doayp_24"
           >
-            <span>
-              Save
-            </span>
+            Save
           </span>
         </button>
         <div
@@ -3416,9 +3400,7 @@ exports[`components/PluginManagement should match snapshot, text entered into th
           <span
             class="_button__label_doayp_24"
           >
-            <span>
-              Save
-            </span>
+            Save
           </span>
         </button>
         <div
@@ -3854,9 +3836,7 @@ exports[`components/PluginManagement should match snapshot, upload disabled 1`]
           <span
             class="_button__label_doayp_24"
           >
-            <span>
-              Save
-            </span>
+            Save
           </span>
         </button>
         <div
@@ -4554,9 +4534,7 @@ exports[`components/PluginManagement should match snapshot, with installed plugi
           <span
             class="_button__label_doayp_24"
           >
-            <span>
-              Save
-            </span>
+            Save
           </span>
         </button>
         <div
@@ -5052,9 +5030,7 @@ exports[`components/PluginManagement should match snapshot, with installed plugi
           <span
             class="_button__label_doayp_24"
           >
-            <span>
-              Save
-            </span>
+            Save
           </span>
         </button>
         <div
@@ -5550,9 +5526,7 @@ exports[`components/PluginManagement should match snapshot, with installed plugi
           <span
             class="_button__label_doayp_24"
           >
-            <span>
-              Save
-            </span>
+            Save
           </span>
         </button>
         <div
@@ -6048,9 +6022,7 @@ exports[`components/PluginManagement should match snapshot, with installed plugi
           <span
             class="_button__label_doayp_24"
           >
-            <span>
-              Save
-            </span>
+            Save
           </span>
         </button>
         <div
@@ -6732,9 +6704,7 @@ exports[`components/PluginManagement should match snapshot, with installed plugi
           <span
             class="_button__label_doayp_24"
           >
-            <span>
-              Save
-            </span>
+            Save
           </span>
         </button>
         <div
diff --git a/webapp/channels/src/components/admin_console/system_roles/system_role/__snapshots__/system_role.test.tsx.snap b/webapp/channels/src/components/admin_console/system_roles/system_role/__snapshots__/system_role.test.tsx.snap
index e1644c519d6..19084f4dd70 100644
--- a/webapp/channels/src/components/admin_console/system_roles/system_role/__snapshots__/system_role.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/system_roles/system_role/__snapshots__/system_role.test.tsx.snap
@@ -53,9 +53,7 @@ exports[`admin_console/system_role should match snapshot 1`] = `
         <span
           class="_button__label_doayp_24"
         >
-          <span>
-            Save
-          </span>
+          Save
         </span>
       </button>
       <button
@@ -131,9 +129,7 @@ exports[`admin_console/system_role should match snapshot with isLicensedForCloud
         <span
           class="_button__label_doayp_24"
         >
-          <span>
-            Save
-          </span>
+          Save
         </span>
       </button>
       <button
diff --git a/webapp/channels/src/components/admin_console/system_roles/system_role/add_users_to_role_modal/__snapshots__/add_users_to_role_modal.test.tsx.snap b/webapp/channels/src/components/admin_console/system_roles/system_role/add_users_to_role_modal/__snapshots__/add_users_to_role_modal.test.tsx.snap
index f1894c968bc..7e6b77990f5 100644
--- a/webapp/channels/src/components/admin_console/system_roles/system_role/add_users_to_role_modal/__snapshots__/add_users_to_role_modal.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/system_roles/system_role/add_users_to_role_modal/__snapshots__/add_users_to_role_modal.test.tsx.snap
@@ -130,9 +130,7 @@ exports[`admin_console/add_users_to_role_modal search should not include bot use
                   <span
                     class="_button__label_doayp_24"
                   >
-                    <span>
-                      Add
-                    </span>
+                    Add
                   </span>
                 </button>
               </div>
@@ -320,9 +318,7 @@ exports[`admin_console/add_users_to_role_modal should exclude user 1`] = `
                   <span
                     class="_button__label_doayp_24"
                   >
-                    <span>
-                      Add
-                    </span>
+                    Add
                   </span>
                 </button>
               </div>
@@ -510,9 +506,7 @@ exports[`admin_console/add_users_to_role_modal should have single passed value 1
                   <span
                     class="_button__label_doayp_24"
                   >
-                    <span>
-                      Add
-                    </span>
+                    Add
                   </span>
                 </button>
               </div>
@@ -700,9 +694,7 @@ exports[`admin_console/add_users_to_role_modal should include additional user 1`
                   <span
                     class="_button__label_doayp_24"
                   >
-                    <span>
-                      Add
-                    </span>
+                    Add
                   </span>
                 </button>
               </div>
@@ -890,9 +882,7 @@ exports[`admin_console/add_users_to_role_modal should not include bot user 1`] =
                   <span
                     class="_button__label_doayp_24"
                   >
-                    <span>
-                      Add
-                    </span>
+                    Add
                   </span>
                 </button>
               </div>
diff --git a/webapp/channels/src/components/admin_console/system_roles/system_role/system_role_users/__snapshots__/system_role_users.test.tsx.snap b/webapp/channels/src/components/admin_console/system_roles/system_role/system_role_users/__snapshots__/system_role_users.test.tsx.snap
index 5f43b1553ae..dfc839fbc67 100644
--- a/webapp/channels/src/components/admin_console/system_roles/system_role/system_role_users/__snapshots__/system_role_users.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/system_roles/system_role/system_role_users/__snapshots__/system_role_users.test.tsx.snap
@@ -23,10 +23,15 @@ exports[`admin_console/system_role_users should match snapshot 1`] = `
         class="button"
       >
         <button
-          class="style--none btn btn-primary"
+          class="_button_doayp_2 _button--emphasis-primary_doayp_61 _button--size-medium_doayp_47"
           id="addRoleMembers"
+          type="button"
         >
-          Add People
+          <span
+            class="_button__label_doayp_24"
+          >
+            Add People
+          </span>
         </button>
       </div>
     </div>
@@ -163,11 +168,16 @@ exports[`admin_console/system_role_users should match snapshot with readOnly tru
         class="button"
       >
         <button
-          class="style--none btn btn-primary"
+          class="_button_doayp_2 _button--emphasis-primary_doayp_61 _button--size-medium_doayp_47"
           disabled=""
           id="addRoleMembers"
+          type="button"
         >
-          Add People
+          <span
+            class="_button__label_doayp_24"
+          >
+            Add People
+          </span>
         </button>
       </div>
     </div>
diff --git a/webapp/channels/src/components/admin_console/system_user_detail/__snapshots__/system_user_detail.test.tsx.snap b/webapp/channels/src/components/admin_console/system_user_detail/__snapshots__/system_user_detail.test.tsx.snap
index ff60ec74e43..22a709a098c 100644
--- a/webapp/channels/src/components/admin_console/system_user_detail/__snapshots__/system_user_detail.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/system_user_detail/__snapshots__/system_user_detail.test.tsx.snap
@@ -340,9 +340,7 @@ exports[`SystemUserDetail should match default snapshot 1`] = `
           <span
             class="_button__label_doayp_24"
           >
-            <span>
-              Save
-            </span>
+            Save
           </span>
         </button>
       </div>
@@ -696,9 +694,7 @@ exports[`SystemUserDetail should match snapshot if MFA is enabled 1`] = `
           <span
             class="_button__label_doayp_24"
           >
-            <span>
-              Save
-            </span>
+            Save
           </span>
         </button>
       </div>
@@ -1052,9 +1048,7 @@ exports[`SystemUserDetail should not fetch CPA data if disabled 1`] = `
           <span
             class="_button__label_doayp_24"
           >
-            <span>
-              Save
-            </span>
+            Save
           </span>
         </button>
       </div>
@@ -1408,9 +1402,7 @@ exports[`SystemUserDetail should not show manage user settings button when user
           <span
             class="_button__label_doayp_24"
           >
-            <span>
-              Save
-            </span>
+            Save
           </span>
         </button>
       </div>
@@ -1775,9 +1767,7 @@ exports[`SystemUserDetail should show manage user settings button as activated 1
           <span
             class="_button__label_doayp_24"
           >
-            <span>
-              Save
-            </span>
+            Save
           </span>
         </button>
       </div>
@@ -2131,9 +2121,7 @@ exports[`SystemUserDetail should show manage user settings button as disabled wh
           <span
             class="_button__label_doayp_24"
           >
-            <span>
-              Save
-            </span>
+            Save
           </span>
         </button>
       </div>
@@ -2518,9 +2506,7 @@ exports[`SystemUserDetail should show the activate user button as disabled when
           <span
             class="_button__label_doayp_24"
           >
-            <span>
-              Save
-            </span>
+            Save
           </span>
         </button>
       </div>
diff --git a/webapp/channels/src/components/admin_console/system_user_detail/team_list/__snapshots__/abstract_list.test.tsx.snap b/webapp/channels/src/components/admin_console/system_user_detail/team_list/__snapshots__/abstract_list.test.tsx.snap
index 27124ef6efc..3cc086d8ac8 100644
--- a/webapp/channels/src/components/admin_console/system_user_detail/team_list/__snapshots__/abstract_list.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/system_user_detail/team_list/__snapshots__/abstract_list.test.tsx.snap
@@ -132,22 +132,30 @@ exports[`admin_console/system_user_detail/team_list/AbstractList should match sn
         11 - 20 of 30
       </div>
       <button
-        class="btn btn-tertiary prev"
+        class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47 prev"
         type="button"
       >
-        <i
-          class="icon icon-chevron-left"
-          title="Previous Icon"
-        />
+        <span
+          class="_button__label_doayp_24"
+        >
+          <i
+            class="icon icon-chevron-left"
+            title="Previous Icon"
+          />
+        </span>
       </button>
       <button
-        class="btn btn-tertiary next"
+        class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47 next"
         type="button"
       >
-        <i
-          class="icon icon-chevron-right"
-          title="Next Icon"
-        />
+        <span
+          class="_button__label_doayp_24"
+        >
+          <i
+            class="icon icon-chevron-right"
+            title="Next Icon"
+          />
+        </span>
       </button>
     </div>
   </div>
@@ -248,23 +256,31 @@ exports[`admin_console/system_user_detail/team_list/AbstractList should match sn
         1 - 10 of 30
       </div>
       <button
-        class="btn btn-tertiary prev disabled"
+        class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47 prev disabled"
         disabled=""
         type="button"
       >
-        <i
-          class="icon icon-chevron-left"
-          title="Previous Icon"
-        />
+        <span
+          class="_button__label_doayp_24"
+        >
+          <i
+            class="icon icon-chevron-left"
+            title="Previous Icon"
+          />
+        </span>
       </button>
       <button
-        class="btn btn-tertiary next"
+        class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47 next"
         type="button"
       >
-        <i
-          class="icon icon-chevron-right"
-          title="Next Icon"
-        />
+        <span
+          class="_button__label_doayp_24"
+        >
+          <i
+            class="icon icon-chevron-right"
+            title="Next Icon"
+          />
+        </span>
       </button>
     </div>
   </div>
@@ -325,24 +341,32 @@ exports[`admin_console/system_user_detail/team_list/AbstractList should match sn
         1 - 2 of 2
       </div>
       <button
-        class="btn btn-tertiary prev disabled"
+        class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47 prev disabled"
         disabled=""
         type="button"
       >
-        <i
-          class="icon icon-chevron-left"
-          title="Previous Icon"
-        />
+        <span
+          class="_button__label_doayp_24"
+        >
+          <i
+            class="icon icon-chevron-left"
+            title="Previous Icon"
+          />
+        </span>
       </button>
       <button
-        class="btn btn-tertiary next disabled"
+        class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47 next disabled"
         disabled=""
         type="button"
       >
-        <i
-          class="icon icon-chevron-right"
-          title="Next Icon"
-        />
+        <span
+          class="_button__label_doayp_24"
+        >
+          <i
+            class="icon icon-chevron-right"
+            title="Next Icon"
+          />
+        </span>
       </button>
     </div>
   </div>
diff --git a/webapp/channels/src/components/admin_console/system_user_detail/team_list/__snapshots__/team_list.test.tsx.snap b/webapp/channels/src/components/admin_console/system_user_detail/team_list/__snapshots__/team_list.test.tsx.snap
index 0a1ad3ebdb9..95f64d11438 100644
--- a/webapp/channels/src/components/admin_console/system_user_detail/team_list/__snapshots__/team_list.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/system_user_detail/team_list/__snapshots__/team_list.test.tsx.snap
@@ -74,24 +74,32 @@ exports[`admin_console/system_user_detail/team_list/TeamList should match snapsh
         1 - 2 of 2
       </div>
       <button
-        class="btn btn-tertiary prev disabled"
+        class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47 prev disabled"
         disabled=""
         type="button"
       >
-        <i
-          class="icon icon-chevron-left"
-          title="Previous Icon"
-        />
+        <span
+          class="_button__label_doayp_24"
+        >
+          <i
+            class="icon icon-chevron-left"
+            title="Previous Icon"
+          />
+        </span>
       </button>
       <button
-        class="btn btn-tertiary next disabled"
+        class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47 next disabled"
         disabled=""
         type="button"
       >
-        <i
-          class="icon icon-chevron-right"
-          title="Next Icon"
-        />
+        <span
+          class="_button__label_doayp_24"
+        >
+          <i
+            class="icon icon-chevron-right"
+            title="Next Icon"
+          />
+        </span>
       </button>
     </div>
   </div>
diff --git a/webapp/channels/src/components/admin_console/team_channel_settings/__snapshots__/abstract_list.test.tsx.snap b/webapp/channels/src/components/admin_console/team_channel_settings/__snapshots__/abstract_list.test.tsx.snap
index 7485be90e96..b8b53000c1c 100644
--- a/webapp/channels/src/components/admin_console/team_channel_settings/__snapshots__/abstract_list.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/team_channel_settings/__snapshots__/abstract_list.test.tsx.snap
@@ -120,25 +120,33 @@ exports[`admin_console/team_channel_settings/AbstractList should match snapshot,
         1 - 1 of 1
       </div>
       <button
-        class="btn btn-tertiary disabled"
+        class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47 disabled"
         disabled=""
         type="button"
       >
-        <i
-          class="icon icon-chevron-left"
-          title="Previous Icon"
-        />
+        <span
+          class="_button__label_doayp_24"
+        >
+          <i
+            class="icon icon-chevron-left"
+            title="Previous Icon"
+          />
+        </span>
       </button>
       <button
-        class="btn btn-tertiary disabled"
+        class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47 disabled"
         data-testid="page-link-next"
         disabled=""
         type="button"
       >
-        <i
-          class="icon icon-chevron-right"
-          title="Next Icon"
-        />
+        <span
+          class="_button__label_doayp_24"
+        >
+          <i
+            class="icon icon-chevron-right"
+            title="Next Icon"
+          />
+        </span>
       </button>
     </div>
   </div>
diff --git a/webapp/channels/src/components/admin_console/team_channel_settings/channel/details/__snapshots__/channel_details.test.tsx.snap b/webapp/channels/src/components/admin_console/team_channel_settings/channel/details/__snapshots__/channel_details.test.tsx.snap
index 69523db3b9b..84bc9638de3 100644
--- a/webapp/channels/src/components/admin_console/team_channel_settings/channel/details/__snapshots__/channel_details.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/team_channel_settings/channel/details/__snapshots__/channel_details.test.tsx.snap
@@ -356,10 +356,15 @@ exports[`admin_console/team_channel_settings/channel/ChannelDetails should match
               class="button"
             >
               <button
-                class="style--none btn btn-primary"
+                class="_button_doayp_2 _button--emphasis-primary_doayp_61 _button--size-medium_doayp_47"
                 id="addGroupsToChannelToggle"
+                type="button"
               >
-                Add Group
+                <span
+                  class="_button__label_doayp_24"
+                >
+                  Add Group
+                </span>
               </button>
             </div>
           </div>
@@ -413,25 +418,33 @@ exports[`admin_console/team_channel_settings/channel/ChannelDetails should match
                 1 - 1 of 1
               </div>
               <button
-                class="btn btn-tertiary disabled"
+                class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47 disabled"
                 disabled=""
                 type="button"
               >
-                <i
-                  class="icon icon-chevron-left"
-                  title="Previous Icon"
-                />
+                <span
+                  class="_button__label_doayp_24"
+                >
+                  <i
+                    class="icon icon-chevron-left"
+                    title="Previous Icon"
+                  />
+                </span>
               </button>
               <button
-                class="btn btn-tertiary disabled"
+                class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47 disabled"
                 data-testid="page-link-next"
                 disabled=""
                 type="button"
               >
-                <i
-                  class="icon icon-chevron-right"
-                  title="Next Icon"
-                />
+                <span
+                  class="_button__label_doayp_24"
+                >
+                  <i
+                    class="icon icon-chevron-right"
+                    title="Next Icon"
+                  />
+                </span>
               </button>
             </div>
           </div>
@@ -454,9 +467,7 @@ exports[`admin_console/team_channel_settings/channel/ChannelDetails should match
         <span
           class="_button__label_doayp_24"
         >
-          <span>
-            Save
-          </span>
+          Save
         </span>
       </button>
       <button
@@ -834,10 +845,15 @@ exports[`admin_console/team_channel_settings/channel/ChannelDetails should match
               class="button"
             >
               <button
-                class="style--none btn btn-primary"
+                class="_button_doayp_2 _button--emphasis-primary_doayp_61 _button--size-medium_doayp_47"
                 id="addGroupsToChannelToggle"
+                type="button"
               >
-                Add Group
+                <span
+                  class="_button__label_doayp_24"
+                >
+                  Add Group
+                </span>
               </button>
             </div>
           </div>
@@ -891,25 +907,33 @@ exports[`admin_console/team_channel_settings/channel/ChannelDetails should match
                 1 - 1 of 1
               </div>
               <button
-                class="btn btn-tertiary disabled"
+                class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47 disabled"
                 disabled=""
                 type="button"
               >
-                <i
-                  class="icon icon-chevron-left"
-                  title="Previous Icon"
-                />
+                <span
+                  class="_button__label_doayp_24"
+                >
+                  <i
+                    class="icon icon-chevron-left"
+                    title="Previous Icon"
+                  />
+                </span>
               </button>
               <button
-                class="btn btn-tertiary disabled"
+                class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47 disabled"
                 data-testid="page-link-next"
                 disabled=""
                 type="button"
               >
-                <i
-                  class="icon icon-chevron-right"
-                  title="Next Icon"
-                />
+                <span
+                  class="_button__label_doayp_24"
+                >
+                  <i
+                    class="icon icon-chevron-right"
+                    title="Next Icon"
+                  />
+                </span>
               </button>
             </div>
           </div>
@@ -932,9 +956,7 @@ exports[`admin_console/team_channel_settings/channel/ChannelDetails should match
         <span
           class="_button__label_doayp_24"
         >
-          <span>
-            Save
-          </span>
+          Save
         </span>
       </button>
       <button
@@ -1254,9 +1276,7 @@ exports[`admin_console/team_channel_settings/channel/ChannelDetails should match
         <span
           class="_button__label_doayp_24"
         >
-          <span>
-            Save
-          </span>
+          Save
         </span>
       </button>
       <button
@@ -1575,9 +1595,7 @@ exports[`admin_console/team_channel_settings/channel/ChannelDetails should match
         <span
           class="_button__label_doayp_24"
         >
-          <span>
-            Save
-          </span>
+          Save
         </span>
       </button>
       <button
@@ -1856,9 +1874,7 @@ exports[`admin_console/team_channel_settings/channel/ChannelDetails should match
         <span
           class="_button__label_doayp_24"
         >
-          <span>
-            Save
-          </span>
+          Save
         </span>
       </button>
       <button
@@ -2136,9 +2152,7 @@ exports[`admin_console/team_channel_settings/channel/ChannelDetails should match
         <span
           class="_button__label_doayp_24"
         >
-          <span>
-            Save
-          </span>
+          Save
         </span>
       </button>
       <button
diff --git a/webapp/channels/src/components/admin_console/team_channel_settings/channel/details/__snapshots__/channel_groups.test.tsx.snap b/webapp/channels/src/components/admin_console/team_channel_settings/channel/details/__snapshots__/channel_groups.test.tsx.snap
index e35856a2a02..b5ae4554c97 100644
--- a/webapp/channels/src/components/admin_console/team_channel_settings/channel/details/__snapshots__/channel_groups.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/team_channel_settings/channel/details/__snapshots__/channel_groups.test.tsx.snap
@@ -23,10 +23,15 @@ exports[`admin_console/team_channel_settings/channel/ChannelGroups should match
         class="button"
       >
         <button
-          class="style--none btn btn-primary"
+          class="_button_doayp_2 _button--emphasis-primary_doayp_61 _button--size-medium_doayp_47"
           id="addGroupsToChannelToggle"
+          type="button"
         >
-          Add Group
+          <span
+            class="_button__label_doayp_24"
+          >
+            Add Group
+          </span>
         </button>
       </div>
     </div>
@@ -80,25 +85,33 @@ exports[`admin_console/team_channel_settings/channel/ChannelGroups should match
           1 - 1 of 1
         </div>
         <button
-          class="btn btn-tertiary disabled"
+          class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47 disabled"
           disabled=""
           type="button"
         >
-          <i
-            class="icon icon-chevron-left"
-            title="Previous Icon"
-          />
+          <span
+            class="_button__label_doayp_24"
+          >
+            <i
+              class="icon icon-chevron-left"
+              title="Previous Icon"
+            />
+          </span>
         </button>
         <button
-          class="btn btn-tertiary disabled"
+          class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47 disabled"
           data-testid="page-link-next"
           disabled=""
           type="button"
         >
-          <i
-            class="icon icon-chevron-right"
-            title="Next Icon"
-          />
+          <span
+            class="_button__label_doayp_24"
+          >
+            <i
+              class="icon icon-chevron-right"
+              title="Next Icon"
+            />
+          </span>
         </button>
       </div>
     </div>
diff --git a/webapp/channels/src/components/admin_console/team_channel_settings/channel/details/channel_members/__snapshots__/channel_members.test.tsx.snap b/webapp/channels/src/components/admin_console/team_channel_settings/channel/details/channel_members/__snapshots__/channel_members.test.tsx.snap
index a27b0443f5c..26858232730 100644
--- a/webapp/channels/src/components/admin_console/team_channel_settings/channel/details/channel_members/__snapshots__/channel_members.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/team_channel_settings/channel/details/channel_members/__snapshots__/channel_members.test.tsx.snap
@@ -23,10 +23,15 @@ exports[`admin_console/team_channel_settings/channel/ChannelMembers should match
         class="button"
       >
         <button
-          class="style--none btn btn-primary"
+          class="_button_doayp_2 _button--emphasis-primary_doayp_61 _button--size-medium_doayp_47"
           id="addChannelMembers"
+          type="button"
         >
-          Add Members
+          <span
+            class="_button__label_doayp_24"
+          >
+            Add Members
+          </span>
         </button>
       </div>
     </div>
@@ -168,11 +173,15 @@ exports[`admin_console/team_channel_settings/channel/ChannelMembers should match
               </div>
             </div>
             <button
-              class="btn btn-primary btn-sm Filter_apply"
+              class="_button_doayp_2 _button--emphasis-primary_doayp_61 _button--size-small_doayp_40 Filter_apply"
               disabled=""
               type="button"
             >
-              Apply
+              <span
+                class="_button__label_doayp_24"
+              >
+                Apply
+              </span>
             </button>
           </div>
         </div>
@@ -279,10 +288,15 @@ exports[`admin_console/team_channel_settings/channel/ChannelMembers should match
         class="button"
       >
         <button
-          class="style--none btn btn-primary"
+          class="_button_doayp_2 _button--emphasis-primary_doayp_61 _button--size-medium_doayp_47"
           id="addChannelMembers"
+          type="button"
         >
-          Add Members
+          <span
+            class="_button__label_doayp_24"
+          >
+            Add Members
+          </span>
         </button>
       </div>
     </div>
@@ -424,11 +438,15 @@ exports[`admin_console/team_channel_settings/channel/ChannelMembers should match
               </div>
             </div>
             <button
-              class="btn btn-primary btn-sm Filter_apply"
+              class="_button_doayp_2 _button--emphasis-primary_doayp_61 _button--size-small_doayp_40 Filter_apply"
               disabled=""
               type="button"
             >
-              Apply
+              <span
+                class="_button__label_doayp_24"
+              >
+                Apply
+              </span>
             </button>
           </div>
         </div>
diff --git a/webapp/channels/src/components/admin_console/team_channel_settings/channel/list/__snapshots__/channel_list.test.tsx.snap b/webapp/channels/src/components/admin_console/team_channel_settings/channel/list/__snapshots__/channel_list.test.tsx.snap
index 73780031958..599cc62529d 100644
--- a/webapp/channels/src/components/admin_console/team_channel_settings/channel/list/__snapshots__/channel_list.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/team_channel_settings/channel/list/__snapshots__/channel_list.test.tsx.snap
@@ -269,11 +269,15 @@ exports[`admin_console/team_channel_settings/channel/ChannelList should match sn
               </div>
             </div>
             <button
-              class="btn btn-primary btn-sm Filter_apply"
+              class="_button_doayp_2 _button--emphasis-primary_doayp_61 _button--size-small_doayp_40 Filter_apply"
               disabled=""
               type="button"
             >
-              Apply
+              <span
+                class="_button__label_doayp_24"
+              >
+                Apply
+              </span>
             </button>
           </div>
         </div>
@@ -703,11 +707,15 @@ exports[`admin_console/team_channel_settings/channel/ChannelList should match sn
               </div>
             </div>
             <button
-              class="btn btn-primary btn-sm Filter_apply"
+              class="_button_doayp_2 _button--emphasis-primary_doayp_61 _button--size-small_doayp_40 Filter_apply"
               disabled=""
               type="button"
             >
-              Apply
+              <span
+                class="_button__label_doayp_24"
+              >
+                Apply
+              </span>
             </button>
           </div>
         </div>
@@ -1892,11 +1900,15 @@ exports[`admin_console/team_channel_settings/channel/ChannelList should match sn
               </div>
             </div>
             <button
-              class="btn btn-primary btn-sm Filter_apply"
+              class="_button_doayp_2 _button--emphasis-primary_doayp_61 _button--size-small_doayp_40 Filter_apply"
               disabled=""
               type="button"
             >
-              Apply
+              <span
+                class="_button__label_doayp_24"
+              >
+                Apply
+              </span>
             </button>
           </div>
         </div>
@@ -2330,11 +2342,15 @@ exports[`admin_console/team_channel_settings/channel/ChannelList should render c
               </div>
             </div>
             <button
-              class="btn btn-primary btn-sm Filter_apply"
+              class="_button_doayp_2 _button--emphasis-primary_doayp_61 _button--size-small_doayp_40 Filter_apply"
               disabled=""
               type="button"
             >
-              Apply
+              <span
+                class="_button__label_doayp_24"
+              >
+                Apply
+              </span>
             </button>
           </div>
         </div>
@@ -2756,11 +2772,15 @@ exports[`admin_console/team_channel_settings/channel/ChannelList should render c
               </div>
             </div>
             <button
-              class="btn btn-primary btn-sm Filter_apply"
+              class="_button_doayp_2 _button--emphasis-primary_doayp_61 _button--size-small_doayp_40 Filter_apply"
               disabled=""
               type="button"
             >
-              Apply
+              <span
+                class="_button__label_doayp_24"
+              >
+                Apply
+              </span>
             </button>
           </div>
         </div>
diff --git a/webapp/channels/src/components/admin_console/team_channel_settings/group/__snapshots__/group_list.test.tsx.snap b/webapp/channels/src/components/admin_console/team_channel_settings/group/__snapshots__/group_list.test.tsx.snap
index 6d1310a0204..28d75057bbe 100644
--- a/webapp/channels/src/components/admin_console/team_channel_settings/group/__snapshots__/group_list.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/team_channel_settings/group/__snapshots__/group_list.test.tsx.snap
@@ -101,25 +101,33 @@ exports[`admin_console/team_channel_settings/group/GroupList should match snapsh
         1 - 1 of 1
       </div>
       <button
-        class="btn btn-tertiary disabled"
+        class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47 disabled"
         disabled=""
         type="button"
       >
-        <i
-          class="icon icon-chevron-left"
-          title="Previous Icon"
-        />
+        <span
+          class="_button__label_doayp_24"
+        >
+          <i
+            class="icon icon-chevron-left"
+            title="Previous Icon"
+          />
+        </span>
       </button>
       <button
-        class="btn btn-tertiary disabled"
+        class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47 disabled"
         data-testid="page-link-next"
         disabled=""
         type="button"
       >
-        <i
-          class="icon icon-chevron-right"
-          title="Next Icon"
-        />
+        <span
+          class="_button__label_doayp_24"
+        >
+          <i
+            class="icon icon-chevron-right"
+            title="Next Icon"
+          />
+        </span>
       </button>
     </div>
   </div>
@@ -731,24 +739,32 @@ exports[`admin_console/team_channel_settings/group/GroupList should match snapsh
         1 - 10 of 30
       </div>
       <button
-        class="btn btn-tertiary disabled"
+        class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47 disabled"
         disabled=""
         type="button"
       >
-        <i
-          class="icon icon-chevron-left"
-          title="Previous Icon"
-        />
+        <span
+          class="_button__label_doayp_24"
+        >
+          <i
+            class="icon icon-chevron-left"
+            title="Previous Icon"
+          />
+        </span>
       </button>
       <button
-        class="btn btn-tertiary"
+        class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47"
         data-testid="page-link-next"
         type="button"
       >
-        <i
-          class="icon icon-chevron-right"
-          title="Next Icon"
-        />
+        <span
+          class="_button__label_doayp_24"
+        >
+          <i
+            class="icon icon-chevron-right"
+            title="Next Icon"
+          />
+        </span>
       </button>
     </div>
   </div>
diff --git a/webapp/channels/src/components/admin_console/team_channel_settings/group/group_users/__snapshots__/users_to_remove.test.tsx.snap b/webapp/channels/src/components/admin_console/team_channel_settings/group/group_users/__snapshots__/users_to_remove.test.tsx.snap
index cce053e10a4..3493aea5742 100644
--- a/webapp/channels/src/components/admin_console/team_channel_settings/group/group_users/__snapshots__/users_to_remove.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/team_channel_settings/group/group_users/__snapshots__/users_to_remove.test.tsx.snap
@@ -143,11 +143,15 @@ exports[`components/admin_console/team_channel_settings/group/UsersToRemove shou
               </div>
             </div>
             <button
-              class="btn btn-primary btn-sm Filter_apply"
+              class="_button_doayp_2 _button--emphasis-primary_doayp_61 _button--size-small_doayp_40 Filter_apply"
               disabled=""
               type="button"
             >
-              Apply
+              <span
+                class="_button__label_doayp_24"
+              >
+                Apply
+              </span>
             </button>
           </div>
         </div>
@@ -360,11 +364,15 @@ exports[`components/admin_console/team_channel_settings/group/UsersToRemove shou
               </div>
             </div>
             <button
-              class="btn btn-primary btn-sm Filter_apply"
+              class="_button_doayp_2 _button--emphasis-primary_doayp_61 _button--size-small_doayp_40 Filter_apply"
               disabled=""
               type="button"
             >
-              Apply
+              <span
+                class="_button__label_doayp_24"
+              >
+                Apply
+              </span>
             </button>
           </div>
         </div>
@@ -697,11 +705,15 @@ exports[`components/admin_console/team_channel_settings/group/UsersToRemove shou
               </div>
             </div>
             <button
-              class="btn btn-primary btn-sm Filter_apply"
+              class="_button_doayp_2 _button--emphasis-primary_doayp_61 _button--size-small_doayp_40 Filter_apply"
               disabled=""
               type="button"
             >
-              Apply
+              <span
+                class="_button__label_doayp_24"
+              >
+                Apply
+              </span>
             </button>
           </div>
         </div>
diff --git a/webapp/channels/src/components/admin_console/team_channel_settings/team/details/__snapshots__/team_details.test.tsx.snap b/webapp/channels/src/components/admin_console/team_channel_settings/team/details/__snapshots__/team_details.test.tsx.snap
index f0cede621a5..26196746bfc 100644
--- a/webapp/channels/src/components/admin_console/team_channel_settings/team/details/__snapshots__/team_details.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/team_channel_settings/team/details/__snapshots__/team_details.test.tsx.snap
@@ -182,9 +182,7 @@ exports[`admin_console/team_channel_settings/team/TeamDetails should match snaps
         <span
           class="_button__label_doayp_24"
         >
-          <span>
-            Save
-          </span>
+          Save
         </span>
       </button>
       <button
@@ -259,9 +257,7 @@ exports[`admin_console/team_channel_settings/team/TeamDetails should match snaps
         <span
           class="_button__label_doayp_24"
         >
-          <span>
-            Save
-          </span>
+          Save
         </span>
       </button>
       <button
diff --git a/webapp/channels/src/components/admin_console/team_channel_settings/team/details/__snapshots__/team_groups.test.tsx.snap b/webapp/channels/src/components/admin_console/team_channel_settings/team/details/__snapshots__/team_groups.test.tsx.snap
index a42d02f02b1..d8290f99dd7 100644
--- a/webapp/channels/src/components/admin_console/team_channel_settings/team/details/__snapshots__/team_groups.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/team_channel_settings/team/details/__snapshots__/team_groups.test.tsx.snap
@@ -23,10 +23,15 @@ exports[`admin_console/team_channel_settings/team/TeamGroups should match snapsh
         class="button"
       >
         <button
-          class="style--none btn btn-primary"
+          class="_button_doayp_2 _button--emphasis-primary_doayp_61 _button--size-medium_doayp_47"
           id="addGroupsToTeamToggle"
+          type="button"
         >
-          Add Group
+          <span
+            class="_button__label_doayp_24"
+          >
+            Add Group
+          </span>
         </button>
       </div>
     </div>
@@ -80,25 +85,33 @@ exports[`admin_console/team_channel_settings/team/TeamGroups should match snapsh
           1 - 1 of 1
         </div>
         <button
-          class="btn btn-tertiary disabled"
+          class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47 disabled"
           disabled=""
           type="button"
         >
-          <i
-            class="icon icon-chevron-left"
-            title="Previous Icon"
-          />
+          <span
+            class="_button__label_doayp_24"
+          >
+            <i
+              class="icon icon-chevron-left"
+              title="Previous Icon"
+            />
+          </span>
         </button>
         <button
-          class="btn btn-tertiary disabled"
+          class="_button_doayp_2 _button--emphasis-tertiary_doayp_91 _button--size-medium_doayp_47 disabled"
           data-testid="page-link-next"
           disabled=""
           type="button"
         >
-          <i
-            class="icon icon-chevron-right"
-            title="Next Icon"
-          />
+          <span
+            class="_button__label_doayp_24"
+          >
+            <i
+              class="icon icon-chevron-right"
+              title="Next Icon"
+            />
+          </span>
         </button>
       </div>
     </div>
diff --git a/webapp/channels/src/components/admin_console/team_channel_settings/team/details/team_members/__snapshots__/team_members.test.tsx.snap b/webapp/channels/src/components/admin_console/team_channel_settings/team/details/team_members/__snapshots__/team_members.test.tsx.snap
index 3cdf9c6c22c..fbb3f8c5f62 100644
--- a/webapp/channels/src/components/admin_console/team_channel_settings/team/details/team_members/__snapshots__/team_members.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/team_channel_settings/team/details/team_members/__snapshots__/team_members.test.tsx.snap
@@ -23,10 +23,15 @@ exports[`admin_console/team_channel_settings/team/TeamMembers should match snaps
         class="button"
       >
         <button
-          class="style--none btn btn-primary"
+          class="_button_doayp_2 _button--emphasis-primary_doayp_61 _button--size-medium_doayp_47"
           id="addTeamMembers"
+          type="button"
         >
-          Add Members
+          <span
+            class="_button__label_doayp_24"
+          >
+            Add Members
+          </span>
         </button>
       </div>
     </div>
@@ -168,11 +173,15 @@ exports[`admin_console/team_channel_settings/team/TeamMembers should match snaps
               </div>
             </div>
             <button
-              class="btn btn-primary btn-sm Filter_apply"
+              class="_button_doayp_2 _button--emphasis-primary_doayp_61 _button--size-small_doayp_40 Filter_apply"
               disabled=""
               type="button"
             >
-              Apply
+              <span
+                class="_button__label_doayp_24"
+              >
+                Apply
+              </span>
             </button>
           </div>
         </div>
@@ -279,10 +288,15 @@ exports[`admin_console/team_channel_settings/team/TeamMembers should match snaps
         class="button"
       >
         <button
-          class="style--none btn btn-primary"
+          class="_button_doayp_2 _button--emphasis-primary_doayp_61 _button--size-medium_doayp_47"
           id="addTeamMembers"
+          type="button"
         >
-          Add Members
+          <span
+            class="_button__label_doayp_24"
+          >
+            Add Members
+          </span>
         </button>
       </div>
     </div>
@@ -424,11 +438,15 @@ exports[`admin_console/team_channel_settings/team/TeamMembers should match snaps
               </div>
             </div>
             <button
-              class="btn btn-primary btn-sm Filter_apply"
+              class="_button_doayp_2 _button--emphasis-primary_doayp_61 _button--size-small_doayp_40 Filter_apply"
               disabled=""
               type="button"
             >
-              Apply
+              <span
+                class="_button__label_doayp_24"
+              >
+                Apply
+              </span>
             </button>
           </div>
         </div>
diff --git a/webapp/channels/src/components/admin_console/user_grid/__snapshots__/user_grid.test.tsx.snap b/webapp/channels/src/components/admin_console/user_grid/__snapshots__/user_grid.test.tsx.snap
index e66a49340ab..fa8ad15331b 100644
--- a/webapp/channels/src/components/admin_console/user_grid/__snapshots__/user_grid.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/user_grid/__snapshots__/user_grid.test.tsx.snap
@@ -66,11 +66,15 @@ exports[`components/admin_console/user_grid/UserGrid should match snapshot with
             class="Filter_lists"
           />
           <button
-            class="btn btn-primary btn-sm Filter_apply"
+            class="_button_doayp_2 _button--emphasis-primary_doayp_61 _button--size-small_doayp_40 Filter_apply"
             disabled=""
             type="button"
           >
-            Apply
+            <span
+              class="_button__label_doayp_24"
+            >
+              Apply
+            </span>
           </button>
         </div>
       </div>
@@ -334,11 +338,15 @@ exports[`components/admin_console/user_grid/UserGrid should match snapshot with
             class="Filter_lists"
           />
           <button
-            class="btn btn-primary btn-sm Filter_apply"
+            class="_button_doayp_2 _button--emphasis-primary_doayp_61 _button--size-small_doayp_40 Filter_apply"
             disabled=""
             type="button"
           >
-            Apply
+            <span
+              class="_button__label_doayp_24"
+            >
+              Apply
+            </span>
           </button>
         </div>
       </div>
@@ -677,11 +685,15 @@ exports[`components/admin_console/user_grid/UserGrid should match snapshot with
             class="Filter_lists"
           />
           <button
-            class="btn btn-primary btn-sm Filter_apply"
+            class="_button_doayp_2 _button--emphasis-primary_doayp_61 _button--size-small_doayp_40 Filter_apply"
             disabled=""
             type="button"
           >
-            Apply
+            <span
+              class="_button__label_doayp_24"
+            >
+              Apply
+            </span>
           </button>
         </div>
       </div>
diff --git a/webapp/channels/src/components/learn_more_trial_modal/__snapshots__/learn_more_trial_modal.test.tsx.snap b/webapp/channels/src/components/learn_more_trial_modal/__snapshots__/learn_more_trial_modal.test.tsx.snap
index fc95ffd87d3..95d1d834fbb 100644
--- a/webapp/channels/src/components/learn_more_trial_modal/__snapshots__/learn_more_trial_modal.test.tsx.snap
+++ b/webapp/channels/src/components/learn_more_trial_modal/__snapshots__/learn_more_trial_modal.test.tsx.snap
@@ -1212,12 +1212,17 @@ exports[`components/learn_more_trial_modal/learn_more_trial_modal should match s
                   <div
                     class=" buttons container-buttons"
                   >
-                    <a
-                      class="btn btn-secondary"
+                    <button
+                      class="_button_doayp_2 _button--emphasis-secondary_doayp_75 _button--size-medium_doayp_47"
                       id="start_trial_btn"
+                      type="button"
                     >
-                      Start trial
-                    </a>
+                      <span
+                        class="_button__label_doayp_24"
+                      >
+                        Start trial
+                      </span>
+                    </button>
                   </div>
                 </div>
               </div>
diff --git a/webapp/channels/src/components/login/__snapshots__/login_mfa.test.tsx.snap b/webapp/channels/src/components/login/__snapshots__/login_mfa.test.tsx.snap
index 6e123814b8a..3e8fb07dcbe 100644
--- a/webapp/channels/src/components/login/__snapshots__/login_mfa.test.tsx.snap
+++ b/webapp/channels/src/components/login/__snapshots__/login_mfa.test.tsx.snap
@@ -268,9 +268,7 @@ exports[`components/login/LoginMfa should match snapshot 1`] = `
             <span
               class="_button__label_doayp_24"
             >
-              <span>
-                Submit
-              </span>
+              Submit
             </span>
           </button>
         </div>
diff --git a/webapp/channels/src/components/more_direct_channels/__snapshots__/more_direct_channels.test.tsx.snap b/webapp/channels/src/components/more_direct_channels/__snapshots__/more_direct_channels.test.tsx.snap
index 6dc957987f1..ff466cf8814 100644
--- a/webapp/channels/src/components/more_direct_channels/__snapshots__/more_direct_channels.test.tsx.snap
+++ b/webapp/channels/src/components/more_direct_channels/__snapshots__/more_direct_channels.test.tsx.snap
@@ -146,9 +146,7 @@ exports[`components/MoreDirectChannels should exclude deleted users if there is
                         <span
                           class="_button__label_doayp_24"
                         >
-                          <span>
-                            Go
-                          </span>
+                          Go
                         </span>
                       </button>
                     </div>
@@ -399,9 +397,7 @@ exports[`components/MoreDirectChannels should match snapshot 1`] = `
                         <span
                           class="_button__label_doayp_24"
                         >
-                          <span>
-                            Go
-                          </span>
+                          Go
                         </span>
                       </button>
                     </div>
diff --git a/webapp/channels/src/components/multiselect/__snapshots__/multiselect.test.tsx.snap b/webapp/channels/src/components/multiselect/__snapshots__/multiselect.test.tsx.snap
index 4e5a3fa6cfb..f5037c10f41 100644
--- a/webapp/channels/src/components/multiselect/__snapshots__/multiselect.test.tsx.snap
+++ b/webapp/channels/src/components/multiselect/__snapshots__/multiselect.test.tsx.snap
@@ -96,9 +96,7 @@ exports[`components/multiselect/multiselect MultiSelectList should match snapsho
           <span
             class="_button__label_doayp_24"
           >
-            <span>
-              Save
-            </span>
+            Save
           </span>
         </button>
       </div>
@@ -265,9 +263,7 @@ exports[`components/multiselect/multiselect should match snapshot 1`] = `
           <span
             class="_button__label_doayp_24"
           >
-            <span>
-              Save
-            </span>
+            Save
           </span>
         </button>
       </div>
@@ -434,9 +430,7 @@ exports[`components/multiselect/multiselect should match snapshot for page 2 1`]
           <span
             class="_button__label_doayp_24"
           >
-            <span>
-              Save
-            </span>
+            Save
           </span>
         </button>
       </div>
diff --git a/webapp/channels/src/components/onboarding_tasklist/__snapshots__/onboarding_tasklist_completed.test.tsx.snap b/webapp/channels/src/components/onboarding_tasklist/__snapshots__/onboarding_tasklist_completed.test.tsx.snap
index 8d41a04e6e7..4a0b7015f23 100644
--- a/webapp/channels/src/components/onboarding_tasklist/__snapshots__/onboarding_tasklist_completed.test.tsx.snap
+++ b/webapp/channels/src/components/onboarding_tasklist/__snapshots__/onboarding_tasklist_completed.test.tsx.snap
@@ -25,12 +25,17 @@ exports[`components/onboarding_tasklist/onboarding_tasklist_completed.tsx should
       <br />
       Start your free Enterprise trial now!
     </span>
-    <a
-      class="btn btn-secondary"
+    <button
+      class="_button_doayp_2 _button--emphasis-secondary_doayp_75 _button--size-medium_doayp_47"
       id="start_trial_btn"
+      type="button"
     >
-      Start trial
-    </a>
+      <span
+        class="_button__label_doayp_24"
+      >
+        Start trial
+      </span>
+    </button>
     <button
       class="no-thanks-link style-link"
     >
diff --git a/webapp/channels/src/components/signup/__snapshots__/signup.test.tsx.snap b/webapp/channels/src/components/signup/__snapshots__/signup.test.tsx.snap
index bef92a70e7c..6ba6814770e 100644
--- a/webapp/channels/src/components/signup/__snapshots__/signup.test.tsx.snap
+++ b/webapp/channels/src/components/signup/__snapshots__/signup.test.tsx.snap
@@ -356,9 +356,7 @@ exports[`components/signup/Signup should match snapshot for all signup options e
                 <span
                   class="_button__label_doayp_24"
                 >
-                  <span>
-                    Create account
-                  </span>
+                  Create account
                 </span>
               </button>
             </form>
@@ -656,9 +654,7 @@ exports[`components/signup/Signup should match snapshot for all signup options e
                 <span
                   class="_button__label_doayp_24"
                 >
-                  <span>
-                    Create account
-                  </span>
+                  Create account
                 </span>
               </button>
             </form>
diff --git a/webapp/channels/src/components/update_user_group_modal/__snapshots__/update_user_group_modal.test.tsx.snap b/webapp/channels/src/components/update_user_group_modal/__snapshots__/update_user_group_modal.test.tsx.snap
index a3644c57683..15a65c5a0da 100644
--- a/webapp/channels/src/components/update_user_group_modal/__snapshots__/update_user_group_modal.test.tsx.snap
+++ b/webapp/channels/src/components/update_user_group_modal/__snapshots__/update_user_group_modal.test.tsx.snap
@@ -156,9 +156,7 @@ exports[`component/update_user_group_modal should match snapshot 1`] = `
                 <span
                   class="_button__label_doayp_24"
                 >
-                  <span>
-                    Save Details
-                  </span>
+                  Save Details
                 </span>
               </button>
             </div>
diff --git a/webapp/channels/src/components/user_settings/security/__snapshots__/user_settings_security.test.tsx.snap b/webapp/channels/src/components/user_settings/security/__snapshots__/user_settings_security.test.tsx.snap
index 62ee3689183..fa4c1c14f2b 100644
--- a/webapp/channels/src/components/user_settings/security/__snapshots__/user_settings_security.test.tsx.snap
+++ b/webapp/channels/src/components/user_settings/security/__snapshots__/user_settings_security.test.tsx.snap
@@ -83,9 +83,9 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
           id="passwordDesc"
         >
           Last updated 
-          Feb 14, 2009
+          Feb 13, 2009
            at 
-          12:31 AM
+          11:31 PM
         </div>
       </div>
       <div
@@ -254,9 +254,9 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
           id="passwordDesc"
         >
           Last updated 
-          Feb 14, 2009
+          Feb 13, 2009
            at 
-          12:31 AM
+          11:31 PM
         </div>
       </div>
       <div
@@ -425,9 +425,9 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
           id="passwordDesc"
         >
           Last updated 
-          Feb 14, 2009
+          Feb 13, 2009
            at 
-          12:31 AM
+          11:31 PM
         </div>
       </div>
       <div
@@ -596,9 +596,9 @@ exports[`components/user_settings/display/UserSettingsDisplay should match snaps
           id="passwordDesc"
         >
           Last updated 
-          Feb 14, 2009
+          Feb 13, 2009
            at 
-          12:31 AM
+          11:31 PM
         </div>
       </div>
       <div