diff --git a/apcd_cms/src/client/src/components/Admin/ViewUsers/EditRecordModal.tsx b/apcd_cms/src/client/src/components/Admin/ViewUsers/EditRecordModal.tsx
index 3d0bb5d9..3918dbc8 100644
--- a/apcd_cms/src/client/src/components/Admin/ViewUsers/EditRecordModal.tsx
+++ b/apcd_cms/src/client/src/components/Admin/ViewUsers/EditRecordModal.tsx
@@ -8,6 +8,7 @@ import {
   Row,
   Col,
 } from 'reactstrap';
+import Button from 'core-components/Button';
 import { Formik, Field, Form, ErrorMessage } from 'formik';
 import { fetchUtil } from 'utils/fetchUtil';
 import * as Yup from 'yup';
@@ -236,9 +237,9 @@ const EditRecordModal: React.FC<EditRecordModalProps> = ({
                 </Row>
                 <br />
                 <Button
-                  type="primary"
                   attr="submit"
                   disabled={isSubmitting || !dirty}
+                  className={styles.customSubmitButton}
                 >
                   Submit
                 </Button>
diff --git a/apcd_cms/src/client/src/components/Forms/Registrations/RegistrationForm.tsx b/apcd_cms/src/client/src/components/Forms/Registrations/RegistrationForm.tsx
index e9a6b47d..ec8adecd 100644
--- a/apcd_cms/src/client/src/components/Forms/Registrations/RegistrationForm.tsx
+++ b/apcd_cms/src/client/src/components/Forms/Registrations/RegistrationForm.tsx
@@ -1,8 +1,9 @@
 import React, { useEffect } from 'react';
 import { Formik, Form, Field, ErrorMessage } from 'formik';
 import * as Yup from 'yup';
-import { FormGroup, Label, Button, FormFeedback } from 'reactstrap';
-import { useSearchParams } from 'react-router-dom';
+import { FormGroup, Label, FormFeedback } from 'reactstrap';
+import Button from 'core-components/Button';
+import { useNavigate, useSearchParams } from 'react-router-dom';
 import {
   RegistrationFormValues,
   transformToRegistrationFormValues,
@@ -214,6 +215,10 @@ export const RegistrationForm: React.FC<{
       : `register/request-to-submit/api/`;
     submitForm({ url, body: values });
   };
+  const navigate = useNavigate();
+  const handleClick = () => {
+    navigate('/workbench/dashboard');
+  };
 
   if (isLoading) {
     return (
@@ -284,8 +289,6 @@ export const RegistrationForm: React.FC<{
                 </div>
                 {isModal ? (
                   <Button
-                    type="button"
-                    className="c-button c-button--primary"
                     disabled={registrationSubmissionPending}
                     onClick={onSuccessCallback}
                   >
@@ -293,10 +296,8 @@ export const RegistrationForm: React.FC<{
                   </Button>
                 ) : (
                   <Button
-                    type="button"
-                    className="c-button c-button--primary"
                     disabled={registrationSubmissionPending}
-                    href="/workbench/dashboard"
+                    onClick={handleClick}
                   >
                     Go to Dashboard
                   </Button>
@@ -436,8 +437,6 @@ export const RegistrationForm: React.FC<{
                 <div className="button-wrapper">
                   <Button
                     className={`c-button c-button--primary ${styles.contactsAndEntitiesButtons}`}
-                    type="button"
-                    color="primary"
                     disabled={values.entities.length === 5}
                     onClick={() =>
                       setFieldValue('entities', [
@@ -467,13 +466,10 @@ export const RegistrationForm: React.FC<{
                     + Add Another Entity
                   </Button>{' '}
                   <Button
-                    className="c-button c-button--secondary"
-                    type="button"
                     onClick={() =>
                       values.entities.length > 1 &&
                       setFieldValue('entities', values.entities.slice(0, -1))
                     }
-                    color="secondary"
                     disabled={values.entities.length === 1}
                   >
                     - Remove Last Entity
@@ -487,8 +483,6 @@ export const RegistrationForm: React.FC<{
                 <div className="button-wrapper">
                   <Button
                     className={`c-button c-button--primary ${styles.contactsAndEntitiesButtons}`}
-                    type="button"
-                    color="primary"
                     disabled={values.contacts.length === 5}
                     onClick={() =>
                       setFieldValue('contacts', [
@@ -506,13 +500,10 @@ export const RegistrationForm: React.FC<{
                     + Add Another Contact
                   </Button>{' '}
                   <Button
-                    className="c-button c-button--secondary"
-                    type="button"
                     onClick={() =>
                       values.contacts.length > 1 &&
                       setFieldValue('contacts', values.contacts.slice(0, -1))
                     }
-                    color="secondary"
                     disabled={values.contacts.length === 1}
                   >
                     - Remove Last Contact
@@ -520,8 +511,7 @@ export const RegistrationForm: React.FC<{
                 </div>
                 <div className="button-wrapper submit">
                   <Button
-                    type="submit"
-                    color="primary"
+                    attr="submit"
                     className="form-button"
                     disabled={registrationSubmissionPending || !dirty}
                   >