diff --git a/frontend/components/buttons/Button/Button.tsx b/frontend/components/buttons/Button/Button.tsx
index f9bc116926..8a6927284e 100644
--- a/frontend/components/buttons/Button/Button.tsx
+++ b/frontend/components/buttons/Button/Button.tsx
@@ -4,12 +4,12 @@ const classnames = require('classnames');
 const baseClass = 'button';
 
 interface IButtonProps {
+  children: React.ReactChild;
   className: string;
   disabled: boolean;
   onClick: (evt: React.MouseEvent<HTMLButtonElement>) => boolean;
   size: string;
   tabIndex: number;
-  text: any;
   type: string;
   variant: string;
 }
@@ -19,6 +19,7 @@ interface IButtonState {}
 class Button extends React.Component<IButtonProps, IButtonState> {
   static defaultProps = {
     size: '',
+    type: 'button',
     variant: 'default',
   };
 
@@ -38,7 +39,7 @@ class Button extends React.Component<IButtonProps, IButtonState> {
 
   render () {
     const { handleClick } = this;
-    const { className, disabled, size, tabIndex, text, type, variant } = this.props;
+    const { children, className, disabled, size, tabIndex, type, variant } = this.props;
     const fullClassName = classnames(baseClass, `${baseClass}--${variant}`, className, {
       [baseClass]: variant !== 'unstyled',
       [`${baseClass}--disabled`]: disabled,
@@ -53,7 +54,7 @@ class Button extends React.Component<IButtonProps, IButtonState> {
         tabIndex={tabIndex}
         type={type}
       >
-        {text}
+        {children}
       </button>
     );
   }
diff --git a/frontend/components/forms/ChangePasswordForm/ChangePasswordForm.jsx b/frontend/components/forms/ChangePasswordForm/ChangePasswordForm.jsx
index 8cba136731..f1d4ba139f 100644
--- a/frontend/components/forms/ChangePasswordForm/ChangePasswordForm.jsx
+++ b/frontend/components/forms/ChangePasswordForm/ChangePasswordForm.jsx
@@ -39,17 +39,8 @@ class ChangePasswordForm extends Component {
           label="New Password Confirmation"
           type="password"
         />
-        <Button
-          onClick={onCancel}
-          text="CANCEL"
-          type="button"
-          variant="inverse"
-        />
-        <Button
-          text="CHANGE PASSWORD"
-          type="submit"
-          variant="brand"
-        />
+        <Button onClick={onCancel} variant="inverse">CANCEL</Button>
+        <Button type="submit" variant="brand">CHANGE PASSWORD</Button>
       </form>
     );
   }
diff --git a/frontend/components/forms/ChangePasswordForm/ChangePasswordForm.tests.jsx b/frontend/components/forms/ChangePasswordForm/ChangePasswordForm.tests.jsx
index dd322f5624..1ea85446e1 100644
--- a/frontend/components/forms/ChangePasswordForm/ChangePasswordForm.tests.jsx
+++ b/frontend/components/forms/ChangePasswordForm/ChangePasswordForm.tests.jsx
@@ -39,7 +39,7 @@ describe('ChangePasswordForm - component', () => {
   it('calls the onCancel prop when CANCEL is clicked', () => {
     const onCancelSpy = createSpy();
     const form = mount(<ChangePasswordForm handleSubmit={noop} onCancel={onCancelSpy} />);
-    const cancelBtn = form.find('Button').findWhere(n => n.prop('text') === 'CANCEL').find('button');
+    const cancelBtn = form.find('Button').findWhere(n => n.prop('children') === 'CANCEL').find('button');
 
     cancelBtn.simulate('click');
 
diff --git a/frontend/components/forms/ConfigurePackQueryForm/ConfigurePackQueryForm.jsx b/frontend/components/forms/ConfigurePackQueryForm/ConfigurePackQueryForm.jsx
index e3df627eeb..574dcac34d 100644
--- a/frontend/components/forms/ConfigurePackQueryForm/ConfigurePackQueryForm.jsx
+++ b/frontend/components/forms/ConfigurePackQueryForm/ConfigurePackQueryForm.jsx
@@ -90,18 +90,12 @@ class ConfigurePackQueryForm extends Component {
             wrapperClassName={`${baseClass}__form-field ${baseClass}__form-field--logging`}
           />
           <div className={`${baseClass}__btn-wrapper`}>
-            <Button
-              className={`${baseClass}__cancel-btn`}
-              onClick={onCancel}
-              text="Cancel"
-              variant="inverse"
-            />
-            <Button
-              className={`${baseClass}__submit-btn`}
-              text="Save"
-              type="submit"
-              variant="brand"
-            />
+            <Button className={`${baseClass}__cancel-btn`} onClick={onCancel} variant="inverse">
+              Cancel
+            </Button>
+            <Button className={`${baseClass}__submit-btn`} type="submit" variant="brand">
+              Save
+            </Button>
           </div>
         </div>
       </form>
diff --git a/frontend/components/forms/ForgotPasswordForm/ForgotPasswordForm.jsx b/frontend/components/forms/ForgotPasswordForm/ForgotPasswordForm.jsx
index 62bd7e82d4..e817366ab3 100644
--- a/frontend/components/forms/ForgotPasswordForm/ForgotPasswordForm.jsx
+++ b/frontend/components/forms/ForgotPasswordForm/ForgotPasswordForm.jsx
@@ -33,9 +33,10 @@ class ForgotPasswordForm extends Component {
           <Button
             className={`${baseClass}__submit-btn`}
             type="submit"
-            text="Reset Password"
             variant="gradient"
-          />
+          >
+            Reset Password
+          </Button>
         </div>
       </form>
     );
diff --git a/frontend/components/forms/InviteUserForm/InviteUserForm.jsx b/frontend/components/forms/InviteUserForm/InviteUserForm.jsx
index f73b72032f..1ab6b8d26b 100644
--- a/frontend/components/forms/InviteUserForm/InviteUserForm.jsx
+++ b/frontend/components/forms/InviteUserForm/InviteUserForm.jsx
@@ -165,18 +165,17 @@ class InviteUserForm extends Component {
           /> ADMIN
         </div>
         <div className={`${baseClass}__btn-wrap`}>
-          <Button
-            className={`${baseClass}__btn`}
-            text="Invite"
-            type="submit"
-          />
+          <Button className={`${baseClass}__btn`} type="submit">
+            Invite
+          </Button>
           <Button
             className={`${baseClass}__btn`}
             onClick={onCancel}
-            text="Cancel"
             type="input"
             variant="inverse"
-          />
+          >
+            Cancel
+          </Button>
         </div>
       </form>
     );
diff --git a/frontend/components/forms/LoginForm/LoginForm.jsx b/frontend/components/forms/LoginForm/LoginForm.jsx
index 9d0611dcc0..a36dc9c33c 100644
--- a/frontend/components/forms/LoginForm/LoginForm.jsx
+++ b/frontend/components/forms/LoginForm/LoginForm.jsx
@@ -54,10 +54,11 @@ class LoginForm extends Component {
         <Button
           className={`${baseClass}__submit-btn`}
           onClick={handleSubmit}
-          text="Login"
           type="submit"
           variant="gradient"
-        />
+        >
+          Login
+        </Button>
       </form>
     );
   }
diff --git a/frontend/components/forms/LogoutForm/LogoutForm.jsx b/frontend/components/forms/LogoutForm/LogoutForm.jsx
index 17c230fd90..020682e273 100644
--- a/frontend/components/forms/LogoutForm/LogoutForm.jsx
+++ b/frontend/components/forms/LogoutForm/LogoutForm.jsx
@@ -34,10 +34,11 @@ class LogoutForm extends Component {
         <Button
           className={`${baseClass}__submit-btn`}
           onClick={onFormSubmit}
-          text="Logout"
           type="submit"
           variant="gradient"
-        />
+        >
+          Logout
+        </Button>
       </form>
     );
   }
diff --git a/frontend/components/forms/RegistrationForm/AdminDetails/AdminDetails.jsx b/frontend/components/forms/RegistrationForm/AdminDetails/AdminDetails.jsx
index 45bfa6f60f..44ea8761d7 100644
--- a/frontend/components/forms/RegistrationForm/AdminDetails/AdminDetails.jsx
+++ b/frontend/components/forms/RegistrationForm/AdminDetails/AdminDetails.jsx
@@ -56,12 +56,9 @@ class AdminDetails extends Component {
             tabIndex={tabIndex}
           />
         </div>
-        <Button
-          onClick={handleSubmit}
-          text="Submit"
-          variant="gradient"
-          tabIndex={tabIndex}
-        />
+        <Button onClick={handleSubmit} variant="gradient" tabIndex={tabIndex}>
+          Submit
+        </Button>
       </div>
     );
   }
diff --git a/frontend/components/forms/RegistrationForm/ConfirmationPage/ConfirmationPage.jsx b/frontend/components/forms/RegistrationForm/ConfirmationPage/ConfirmationPage.jsx
index 27c548e640..a979d3b976 100644
--- a/frontend/components/forms/RegistrationForm/ConfirmationPage/ConfirmationPage.jsx
+++ b/frontend/components/forms/RegistrationForm/ConfirmationPage/ConfirmationPage.jsx
@@ -71,12 +71,9 @@ class ConfirmationPage extends Component {
           </div>
         </div>
 
-        <Button
-          onClick={onSubmit}
-          text="Finish"
-          variant="gradient"
-          className={`${baseClass}__submit`}
-        />
+        <Button onClick={onSubmit} variant="gradient" className={`${baseClass}__submit`}>
+          Finish
+        </Button>
       </div>
     );
   }
diff --git a/frontend/components/forms/RegistrationForm/KolideDetails/KolideDetails.jsx b/frontend/components/forms/RegistrationForm/KolideDetails/KolideDetails.jsx
index baccf1ef02..f8e496976a 100644
--- a/frontend/components/forms/RegistrationForm/KolideDetails/KolideDetails.jsx
+++ b/frontend/components/forms/RegistrationForm/KolideDetails/KolideDetails.jsx
@@ -33,12 +33,9 @@ class KolideDetails extends Component {
             hint={['Don’t include ', <code key="hint">/v1</code>, ' or any other path']}
           />
         </div>
-        <Button
-          onClick={handleSubmit}
-          text="Submit"
-          variant="gradient"
-          tabIndex={tabIndex}
-        />
+        <Button onClick={handleSubmit} variant="gradient" tabIndex={tabIndex}>
+          Submit
+        </Button>
       </div>
     );
   }
diff --git a/frontend/components/forms/RegistrationForm/OrgDetails/OrgDetails.jsx b/frontend/components/forms/RegistrationForm/OrgDetails/OrgDetails.jsx
index abf7755df8..e4f1de723f 100644
--- a/frontend/components/forms/RegistrationForm/OrgDetails/OrgDetails.jsx
+++ b/frontend/components/forms/RegistrationForm/OrgDetails/OrgDetails.jsx
@@ -39,12 +39,9 @@ class OrgDetails extends Component {
             hint="must start with https://"
           />
         </div>
-        <Button
-          onClick={handleSubmit}
-          text="Submit"
-          variant="gradient"
-          tabIndex={tabIndex}
-        />
+        <Button onClick={handleSubmit} variant="gradient" tabIndex={tabIndex}>
+          Submit
+        </Button>
       </div>
     );
   }
diff --git a/frontend/components/forms/ResetPasswordForm/ResetPasswordForm.jsx b/frontend/components/forms/ResetPasswordForm/ResetPasswordForm.jsx
index c584049f91..8f53f76343 100644
--- a/frontend/components/forms/ResetPasswordForm/ResetPasswordForm.jsx
+++ b/frontend/components/forms/ResetPasswordForm/ResetPasswordForm.jsx
@@ -42,10 +42,11 @@ class ResetPasswordForm extends Component {
           <Button
             onClick={handleSubmit}
             className={`${baseClass}__btn`}
-            text="Reset Password"
             type="submit"
             variant="gradient"
-          />
+          >
+            Reset Password
+          </Button>
         </div>
       </form>
     );
diff --git a/frontend/components/forms/UserSettingsForm/UserSettingsForm.jsx b/frontend/components/forms/UserSettingsForm/UserSettingsForm.jsx
index 459e1b58b8..c4b3b00dc6 100644
--- a/frontend/components/forms/UserSettingsForm/UserSettingsForm.jsx
+++ b/frontend/components/forms/UserSettingsForm/UserSettingsForm.jsx
@@ -44,17 +44,8 @@ class UserSettingsForm extends Component {
           label="Position"
         />
         <div className={`${baseClass}__button-wrap`}>
-          <Button
-            onClick={onCancel}
-            text="CANCEL"
-            type="button"
-            variant="inverse"
-          />
-          <Button
-            text="UPDATE"
-            type="submit"
-            variant="brand"
-          />
+          <Button onClick={onCancel} variant="inverse">CANCEL</Button>
+          <Button type="submit" variant="brand">UPDATE</Button>
         </div>
       </form>
     );
diff --git a/frontend/components/forms/admin/AppConfigForm/AppConfigForm.jsx b/frontend/components/forms/admin/AppConfigForm/AppConfigForm.jsx
index 4edf62f548..0c5de4430e 100644
--- a/frontend/components/forms/admin/AppConfigForm/AppConfigForm.jsx
+++ b/frontend/components/forms/admin/AppConfigForm/AppConfigForm.jsx
@@ -161,7 +161,7 @@ class AppConfigForm extends Component {
           <div className={`${baseClass}__details`}>
             <p>What base URL should <strong>osqueryd</strong> clients user to connect and register with <strong>Kolide</strong>?</p>
             <p className={`${baseClass}__note`}><strong>Note:</strong>Please ensure the URL you choose is accessible to all endpoints that need to communicate with Kolide, otherwise they will not be able to correctly register.</p>
-            <Button text="SEND TEST" variant="inverse" />
+            <Button variant="inverse">SEND TEST</Button>
           </div>
         </div>
         <div className={`${baseClass}__section`}>
@@ -212,10 +212,11 @@ class AppConfigForm extends Component {
           {renderAdvancedOptions()}
         </div>
         <Button
-          text="UPDATE SETTINGS"
           type="submit"
           variant="brand"
-        />
+        >
+          UPDATE SETTINGS
+        </Button>
       </form>
     );
   }
diff --git a/frontend/components/forms/admin/EditUserForm/EditUserForm.jsx b/frontend/components/forms/admin/EditUserForm/EditUserForm.jsx
index 4069142804..bf2712c9a6 100644
--- a/frontend/components/forms/admin/EditUserForm/EditUserForm.jsx
+++ b/frontend/components/forms/admin/EditUserForm/EditUserForm.jsx
@@ -56,16 +56,18 @@ class EditUserForm extends Component {
         <div className={`${baseClass}__btn-wrap`}>
           <Button
             className={`${baseClass}__form-btn ${baseClass}__form-btn--submit`}
-            text="Submit"
             type="submit"
             variant="brand"
-          />
+          >
+            Submit
+          </Button>
           <Button
             className={`${baseClass}__form-btn`}
             onClick={onCancel}
-            text="Cancel"
             variant="inverse"
-          />
+          >
+            Cancel
+          </Button>
         </div>
       </form>
     );
diff --git a/frontend/components/forms/packs/EditPackForm/EditPackForm.jsx b/frontend/components/forms/packs/EditPackForm/EditPackForm.jsx
index 4883e8113d..871ad3d3d0 100644
--- a/frontend/components/forms/packs/EditPackForm/EditPackForm.jsx
+++ b/frontend/components/forms/packs/EditPackForm/EditPackForm.jsx
@@ -29,17 +29,8 @@ class EditPackForm extends Component {
         <InputField
           {...fields.description}
         />
-        <Button
-          onClick={onCancel}
-          text="CANCEL"
-          type="button"
-          variant="inverse"
-        />
-        <Button
-          text="SAVE"
-          type="submit"
-          variant="brand"
-        />
+        <Button onClick={onCancel} type="button" variant="inverse">CANCEL</Button>
+        <Button type="submit" variant="brand">SAVE</Button>
       </form>
     );
   }
diff --git a/frontend/components/forms/packs/EditPackForm/EditPackForm.tests.jsx b/frontend/components/forms/packs/EditPackForm/EditPackForm.tests.jsx
index 4bc4b9d26d..579b48be84 100644
--- a/frontend/components/forms/packs/EditPackForm/EditPackForm.tests.jsx
+++ b/frontend/components/forms/packs/EditPackForm/EditPackForm.tests.jsx
@@ -44,9 +44,9 @@ describe('EditPackForm - component', () => {
     it('calls the onCancel prop when "CANCEL" is clicked', () => {
       const spy = createSpy();
       const form = mount(<EditPackForm formData={packStub} handleSubmit={noop} onCancel={spy} />);
-      const cancelBtn = form.find('Button').findWhere(f => f.prop('text') === 'CANCEL');
+      const cancelBtn = form.find('Button').find({ children: 'CANCEL' });
 
-      cancelBtn.simulate('click');
+      cancelBtn.first().simulate('click');
 
       expect(spy).toHaveBeenCalled();
     });
diff --git a/frontend/components/forms/packs/PackForm/PackForm.jsx b/frontend/components/forms/packs/PackForm/PackForm.jsx
index f0ea3f4ae3..23e2b163c1 100644
--- a/frontend/components/forms/packs/PackForm/PackForm.jsx
+++ b/frontend/components/forms/packs/PackForm/PackForm.jsx
@@ -62,11 +62,9 @@ class PackForm extends Component {
           />
         </div>
         <div className={`${baseClass}__pack-buttons`}>
-          <Button
-            text="Save Query pack"
-            type="submit"
-            variant="brand"
-          />
+          <Button type="submit" variant="brand">
+            Save Query Pack
+          </Button>
         </div>
       </form>
     );
diff --git a/frontend/components/forms/queries/QueryForm/QueryForm.jsx b/frontend/components/forms/queries/QueryForm/QueryForm.jsx
index e7199644c8..bb527ae9df 100644
--- a/frontend/components/forms/queries/QueryForm/QueryForm.jsx
+++ b/frontend/components/forms/queries/QueryForm/QueryForm.jsx
@@ -180,18 +180,20 @@ class QueryForm extends Component {
         <Button
           className={`${baseClass}__stop-query-btn`}
           onClick={onStopQuery}
-          text="Stop Query"
           variant="alert"
-        />
+        >
+          Stop Query
+        </Button>
       );
     } else {
       runQueryButton = (
         <Button
           className={`${baseClass}__run-query-btn`}
           onClick={onRunQuery}
-          text="Run Query"
           variant="brand"
-        />
+        >
+          Run Query
+        </Button>
       );
     }
 
@@ -201,16 +203,18 @@ class QueryForm extends Component {
           <Button
             className={`${baseClass}__save-changes-btn`}
             onClick={onCancel}
-            text="Cancel"
             variant="inverse"
-          />
+          >
+            Cancel
+          </Button>
           <Button
             className={`${baseClass}__save-as-new-btn`}
             disabled={!canSaveAsNew(formData, query)}
             onClick={onSave}
-            text="Save Label"
             variant="brand"
-          />
+          >
+            Save Label
+          </Button>
         </div>
       );
     }
@@ -221,16 +225,18 @@ class QueryForm extends Component {
           className={`${baseClass}__save-changes-btn`}
           disabled={!canSaveChanges(formData, query)}
           onClick={onUpdate}
-          text="Save Changes"
           variant="inverse"
-        />
+        >
+          Save Changes
+        </Button>
         <Button
           className={`${baseClass}__save-as-new-btn`}
           disabled={!canSaveAsNew(formData, query)}
           onClick={onSave}
-          text="Save As New..."
           variant="success"
-        />
+        >
+          Save As New...
+        </Button>
         {runQueryButton}
       </div>
     );
diff --git a/frontend/components/packs/EditPackFormWrapper/EditPackFormWrapper.jsx b/frontend/components/packs/EditPackFormWrapper/EditPackFormWrapper.jsx
index 24b4f11d29..1dfe97ac45 100644
--- a/frontend/components/packs/EditPackFormWrapper/EditPackFormWrapper.jsx
+++ b/frontend/components/packs/EditPackFormWrapper/EditPackFormWrapper.jsx
@@ -44,12 +44,7 @@ class EditPackFormWrapper extends Component {
 
     return (
       <div className={className}>
-        <Button
-          onClick={onEditPack}
-          text="EDIT"
-          type="button"
-          variant="brand"
-        />
+        <Button onClick={onEditPack} variant="brand">EDIT</Button>
         <h1><Icon name="packs" /> {pack.name}</h1>
         <p>{pack.description}</p>
         <SelectTargetsDropdown
diff --git a/frontend/components/packs/EditPackFormWrapper/EditPackFormWrapper.tests.jsx b/frontend/components/packs/EditPackFormWrapper/EditPackFormWrapper.tests.jsx
index 2e342bd694..745fd54d01 100644
--- a/frontend/components/packs/EditPackFormWrapper/EditPackFormWrapper.tests.jsx
+++ b/frontend/components/packs/EditPackFormWrapper/EditPackFormWrapper.tests.jsx
@@ -39,12 +39,13 @@ describe('EditPackFormWrapper - component', () => {
     const spy = createSpy();
     const component = mount(
       <EditPackFormWrapper
+        isEdit={false}
         onCancelEditPack={noop}
         onEditPack={spy}
         pack={packStub}
       />
     );
-    const editBtn = component.find('Button').findWhere(b => b.prop('text') === 'EDIT');
+    const editBtn = component.find('Button').find({ children: 'EDIT' });
 
     editBtn.simulate('click');
 
diff --git a/frontend/components/queries/QueriesListWrapper/QueriesListWrapper.jsx b/frontend/components/queries/QueriesListWrapper/QueriesListWrapper.jsx
index 8ffba44770..502fb5fe42 100644
--- a/frontend/components/queries/QueriesListWrapper/QueriesListWrapper.jsx
+++ b/frontend/components/queries/QueriesListWrapper/QueriesListWrapper.jsx
@@ -87,9 +87,10 @@ class QueriesListWrapper extends Component {
         <Button
           className={`${baseClass}__query-btn`}
           onClick={onRemoveScheduledQueries}
-          text={`Remove ${queryText}`}
           variant="alert"
-        />
+        >
+          Remove {queryText}
+        </Button>
       );
     }
 
diff --git a/frontend/components/queries/QueriesListWrapper/QueriesListWrapper.tests.jsx b/frontend/components/queries/QueriesListWrapper/QueriesListWrapper.tests.jsx
index d683f81576..9509eab9e5 100644
--- a/frontend/components/queries/QueriesListWrapper/QueriesListWrapper.tests.jsx
+++ b/frontend/components/queries/QueriesListWrapper/QueriesListWrapper.tests.jsx
@@ -25,8 +25,8 @@ describe('QueriesListWrapper - component', () => {
 
     component.find('Checkbox').last().find('input').simulate('change');
 
-    const addQueryBtn = component.find('Button').findWhere(b => b.prop('text') === 'Add New Query');
-    const removeQueryBtn = component.find('Button').findWhere(b => b.prop('text') === 'Remove Query');
+    const addQueryBtn = component.find('Button').find({ children: 'Add New Query' });
+    const removeQueryBtn = component.find('Button').find({ children: ['Remove ', 'Query'] });
 
     expect(addQueryBtn.length).toEqual(0);
     expect(removeQueryBtn.length).toEqual(1);
@@ -44,7 +44,7 @@ describe('QueriesListWrapper - component', () => {
 
     component.find('Checkbox').last().find('input').simulate('change');
 
-    const removeQueryBtn = component.find('Button').findWhere(b => b.prop('text') === 'Remove Query');
+    const removeQueryBtn = component.find('Button').find({ children: ['Remove ', 'Query'] });
 
     removeQueryBtn.simulate('click');
 
diff --git a/frontend/pages/Admin/AppSettingsPage/SmtpWarning.jsx b/frontend/pages/Admin/AppSettingsPage/SmtpWarning.jsx
index 4ece285f8c..ab0797e2c8 100644
--- a/frontend/pages/Admin/AppSettingsPage/SmtpWarning.jsx
+++ b/frontend/pages/Admin/AppSettingsPage/SmtpWarning.jsx
@@ -17,8 +17,8 @@ const SmtpWarning = ({ onDismiss, shouldShowWarning }) => {
         <span className={`${baseClass}__label`}>Warning!</span>
       </div>
       <span className={`${baseClass}__text`}>Email is not currently configured in Kolide. Many features rely on email to work.</span>
-      <Button onClick={onDismiss} text="Dismiss" variant="unstyled" />
-      <Button text="Resolve" variant="unstyled" />
+      <Button onClick={onDismiss} variant="unstyled">Dismiss</Button>
+      <Button variant="unstyled">Resolve</Button>
     </div>
   );
 };
diff --git a/frontend/pages/Admin/UserManagementPage/UserManagementPage.jsx b/frontend/pages/Admin/UserManagementPage/UserManagementPage.jsx
index 72ad9c1262..5201ecc6b5 100644
--- a/frontend/pages/Admin/UserManagementPage/UserManagementPage.jsx
+++ b/frontend/pages/Admin/UserManagementPage/UserManagementPage.jsx
@@ -192,11 +192,9 @@ class UserManagementPage extends Component {
       <div className={`${baseClass} body-wrap`}>
         <h1 className={`${baseClass}__user-count`}>Listing {resourcesCount} users</h1>
         <div className={`${baseClass}__add-user-wrap`}>
-          <Button
-            onClick={toggleInviteUserModal}
-            className={`${baseClass}__add-user-btn`}
-            text="Add User"
-          />
+          <Button onClick={toggleInviteUserModal} className={`${baseClass}__add-user-btn`}>
+            Add User
+          </Button>
         </div>
         <div className={`${baseClass}__users`}>
           {users.map((user) => {
diff --git a/frontend/pages/UserSettingsPage/UserSettingsPage.jsx b/frontend/pages/UserSettingsPage/UserSettingsPage.jsx
index dbc9a4906c..5dd7ac474c 100644
--- a/frontend/pages/UserSettingsPage/UserSettingsPage.jsx
+++ b/frontend/pages/UserSettingsPage/UserSettingsPage.jsx
@@ -138,9 +138,13 @@ class UserSettingsPage extends Component {
             <Icon name="lock-big" />
             <strong>Password</strong>
           </div>
-          <Button onClick={onShowModal} text="CHANGE PASSWORD" variant="brand" className={`${baseClass}__button`} />
+          <Button onClick={onShowModal} variant="brand" className={`${baseClass}__button`}>
+            CHANGE PASSWORD
+          </Button>
           <p className={`${baseClass}__last-updated`}>Last changed: {lastUpdatedAt}</p>
-          <Button onClick={onLogout} text="LOGOUT" variant="alert" className={`${baseClass}__button`} />
+          <Button onClick={onLogout} variant="alert" className={`${baseClass}__button`}>
+            LOGOUT
+          </Button>
         </div>
         {renderModal()}
       </div>
diff --git a/frontend/pages/packs/AllPacksPage/AllPacksPage.jsx b/frontend/pages/packs/AllPacksPage/AllPacksPage.jsx
index db835dc102..5ff098196f 100644
--- a/frontend/pages/packs/AllPacksPage/AllPacksPage.jsx
+++ b/frontend/pages/packs/AllPacksPage/AllPacksPage.jsx
@@ -63,11 +63,9 @@ class AllPacksPage extends Component {
             Query Packs
           </p>
           <div className={`${baseClass}__new_pack`}>
-            <Button
-              text="CREATE NEW PACK"
-              variant="brand"
-              onClick={goToNewPackPage}
-            />
+            <Button variant="brand" onClick={goToNewPackPage}>
+              CREATE NEW PACK
+            </Button>
           </div>
           <table className={`${baseClass}__table`}>
             <thead>