diff --git a/components/admin_console/reset_password_modal/reset_password_modal.jsx b/components/admin_console/reset_password_modal/reset_password_modal.jsx
index 173eed202b66..0f24cd2ab652 100644
--- a/components/admin_console/reset_password_modal/reset_password_modal.jsx
+++ b/components/admin_console/reset_password_modal/reset_password_modal.jsx
@@ -204,7 +204,7 @@ export default class ResetPasswordModal extends React.Component {
                     <Modal.Footer>
                         <button
                             type='button'
-                            className='btn btn-default'
+                            className='btn btn-link'
                             onClick={this.doCancel}
                         >
                             <FormattedMessage
diff --git a/components/change_url_modal/__snapshots__/change_url_modal.test.jsx.snap b/components/change_url_modal/__snapshots__/change_url_modal.test.jsx.snap
index 85589b5f81a6..1a82416d0e2b 100644
--- a/components/change_url_modal/__snapshots__/change_url_modal.test.jsx.snap
+++ b/components/change_url_modal/__snapshots__/change_url_modal.test.jsx.snap
@@ -117,7 +117,7 @@ exports[`components/ChangeURLModal should match snapshot, modal not showing 1`]
       componentClass="div"
     >
       <button
-        className="btn btn-default"
+        className="btn btn-link"
         onClick={[Function]}
         type="button"
       >
@@ -257,7 +257,7 @@ exports[`components/ChangeURLModal should match snapshot, modal showing 1`] = `
       componentClass="div"
     >
       <button
-        className="btn btn-default"
+        className="btn btn-link"
         onClick={[Function]}
         type="button"
       >
@@ -406,7 +406,7 @@ exports[`components/ChangeURLModal should match snapshot, on currentURL 1`] = `
       componentClass="div"
     >
       <button
-        className="btn btn-default"
+        className="btn btn-link"
         onClick={[Function]}
         type="button"
       >
@@ -555,7 +555,7 @@ exports[`components/ChangeURLModal should match snapshot, on urlError 1`] = `
       componentClass="div"
     >
       <button
-        className="btn btn-default"
+        className="btn btn-link"
         onClick={[Function]}
         type="button"
       >
@@ -695,7 +695,7 @@ exports[`components/ChangeURLModal should match snapshot, with a input 1`] = `
       componentClass="div"
     >
       <button
-        className="btn btn-default"
+        className="btn btn-link"
         onClick={[Function]}
         type="button"
       >
diff --git a/components/change_url_modal/change_url_modal.jsx b/components/change_url_modal/change_url_modal.jsx
index 9554e6916bb3..805e557ba73d 100644
--- a/components/change_url_modal/change_url_modal.jsx
+++ b/components/change_url_modal/change_url_modal.jsx
@@ -230,7 +230,7 @@ export default class ChangeURLModal extends React.PureComponent {
                     <Modal.Footer>
                         <button
                             type='button'
-                            className='btn btn-default'
+                            className='btn btn-link'
                             onClick={this.onCancel}
                         >
                             <FormattedMessage
diff --git a/components/convert_channel_modal/convert_channel_modal.jsx b/components/convert_channel_modal/convert_channel_modal.jsx
index 6660d4d9c0c5..59bc2f3a0992 100644
--- a/components/convert_channel_modal/convert_channel_modal.jsx
+++ b/components/convert_channel_modal/convert_channel_modal.jsx
@@ -103,7 +103,7 @@ export default class ConvertChannelModal extends React.PureComponent {
                 <Modal.Footer>
                     <button
                         type='button'
-                        className='btn btn-default'
+                        className='btn btn-link'
                         onClick={this.onHide}
                         tabIndex='2'
                     >
diff --git a/components/leave_team_modal/__snapshots__/leave_team_modal.test.jsx.snap b/components/leave_team_modal/__snapshots__/leave_team_modal.test.jsx.snap
index 4b693da1e976..cc0810683fef 100644
--- a/components/leave_team_modal/__snapshots__/leave_team_modal.test.jsx.snap
+++ b/components/leave_team_modal/__snapshots__/leave_team_modal.test.jsx.snap
@@ -59,7 +59,7 @@ exports[`components/LeaveTeamModal should render the leave team model 1`] = `
     componentClass="div"
   >
     <button
-      className="btn btn-default"
+      className="btn btn-link"
       id="leaveTeamNo"
       onClick={[MockFunction]}
       type="button"
diff --git a/components/leave_team_modal/leave_team_modal.jsx b/components/leave_team_modal/leave_team_modal.jsx
index e96cf961d01e..35d674a0a114 100644
--- a/components/leave_team_modal/leave_team_modal.jsx
+++ b/components/leave_team_modal/leave_team_modal.jsx
@@ -99,7 +99,7 @@ class LeaveTeamModal extends React.PureComponent {
                 <Modal.Footer>
                     <button
                         type='button'
-                        className='btn btn-default'
+                        className='btn btn-link'
                         onClick={this.props.onHide}
                         id='leaveTeamNo'
                     >
diff --git a/components/leave_team_modal/leave_team_modal.test.jsx b/components/leave_team_modal/leave_team_modal.test.jsx
index eaa8e92d6780..55d06f9c769e 100644
--- a/components/leave_team_modal/leave_team_modal.test.jsx
+++ b/components/leave_team_modal/leave_team_modal.test.jsx
@@ -29,7 +29,7 @@ describe('components/LeaveTeamModal', () => {
     it('should call onHide when cancel is clicked', () => {
         const wrapper = shallowWithIntl(<LeaveTeamModal {...requiredProps}/>).
             dive({disableLifecycleMethods: true});
-        const cancel = wrapper.find('.btn-default').first();
+        const cancel = wrapper.find('.btn-link').first();
 
         cancel.simulate('click');
         expect(requiredProps.onHide).toHaveBeenCalledTimes(1);