diff --git a/src/components/Button.tsx b/src/components/Button.tsx
index 5c503d215ee..1a79353d231 100644
--- a/src/components/Button.tsx
+++ b/src/components/Button.tsx
@@ -16,9 +16,8 @@ export enum BtnTypes {
   PRIMARY = 'Primary',
   SECONDARY = 'Secondary',
   SECONDARY_WHITE_BG = 'SecondaryWhiteBg',
-  ONBOARDING = 'Onboarding',
-  ONBOARDING_SECONDARY = 'OnboardingSecondary',
   GRAY_WITH_BORDER = 'GrayWithBorder',
+  ONBOARDING_SECONDARY = 'OnboardingSecondary',
 }
 
 export enum BtnSizes {
@@ -173,22 +172,18 @@ function getColors(type: BtnTypes, disabled: boolean | undefined) {
       textColor = colors.gray3
       backgroundColor = colors.white
       break
-    case BtnTypes.ONBOARDING:
-      textColor = colors.white
-      backgroundColor = colors.successDark
+    case BtnTypes.GRAY_WITH_BORDER:
+      textColor = colors.black
+      backgroundColor = colors.gray1
+      borderColor = colors.gray2
       opacity = disabled ? 0.5 : 1.0
       break
+    /** @deprecated TODO(ACT-1200): Remove and replace with GRAY_WITHBORDER*/
     case BtnTypes.ONBOARDING_SECONDARY:
       textColor = colors.successDark
       backgroundColor = colors.white
       opacity = disabled ? 0.5 : 1.0
       break
-    case BtnTypes.GRAY_WITH_BORDER:
-      textColor = colors.black
-      backgroundColor = colors.gray1
-      borderColor = colors.gray2
-      opacity = disabled ? 0.5 : 1.0
-      break
   }
 
   return { textColor, backgroundColor, opacity, borderColor }
diff --git a/src/import/ImportWallet.tsx b/src/import/ImportWallet.tsx
index c135b32dfb5..698a07b1ea9 100644
--- a/src/import/ImportWallet.tsx
+++ b/src/import/ImportWallet.tsx
@@ -221,7 +221,7 @@ function ImportWallet({ navigation, route }: Props) {
                   onPress={onPressRestore}
                   text={t('restore')}
                   size={BtnSizes.FULL}
-                  type={BtnTypes.ONBOARDING}
+                  type={BtnTypes.PRIMARY}
                   disabled={
                     isImportingWallet || !isValidBackupPhrase(backupPhrase) || !appConnected
                   }
diff --git a/src/keylessBackup/KeylessBackupProgress.tsx b/src/keylessBackup/KeylessBackupProgress.tsx
index 19d3e8bd993..5ebcbc3313c 100644
--- a/src/keylessBackup/KeylessBackupProgress.tsx
+++ b/src/keylessBackup/KeylessBackupProgress.tsx
@@ -315,7 +315,7 @@ function Setup() {
             onPress={onPressLater}
             text={t('keylessBackupStatus.setup.failed.later')}
             size={BtnSizes.FULL}
-            type={BtnTypes.ONBOARDING}
+            type={BtnTypes.PRIMARY}
             style={styles.button}
             touchableStyle={styles.buttonTouchable}
           />
@@ -324,7 +324,7 @@ function Setup() {
             onPress={onPressManual}
             text={t('keylessBackupStatus.setup.failed.manual')}
             size={BtnSizes.FULL}
-            type={BtnTypes.ONBOARDING_SECONDARY}
+            type={BtnTypes.GRAY_WITH_BORDER}
             style={styles.button}
             touchableStyle={styles.buttonTouchable}
           />
diff --git a/src/onboarding/registration/EnableBiometry.tsx b/src/onboarding/registration/EnableBiometry.tsx
index 64c02184136..878ff0c02eb 100644
--- a/src/onboarding/registration/EnableBiometry.tsx
+++ b/src/onboarding/registration/EnableBiometry.tsx
@@ -129,7 +129,7 @@ export default function EnableBiometry({ navigation }: Props) {
             biometryType: t(`biometryType.${supportedBiometryType}`),
           })}
           size={BtnSizes.FULL}
-          type={BtnTypes.ONBOARDING}
+          type={BtnTypes.PRIMARY}
           testID="EnableBiometryButton"
           icon={
             supportedBiometryType && (
diff --git a/src/onboarding/registration/OnboardingRecoveryPhrase.tsx b/src/onboarding/registration/OnboardingRecoveryPhrase.tsx
index dd681c95f0c..4f52998cf17 100644
--- a/src/onboarding/registration/OnboardingRecoveryPhrase.tsx
+++ b/src/onboarding/registration/OnboardingRecoveryPhrase.tsx
@@ -108,7 +108,7 @@ function OnboardingRecoveryPhrase({ navigation }: Props) {
             onPress={onPressContinue}
             text={t('recoveryPhrase.continue')}
             size={BtnSizes.FULL}
-            type={BtnTypes.ONBOARDING}
+            type={BtnTypes.PRIMARY}
             testID={'protectWalletBottomSheetContinue'}
           />
         </View>
diff --git a/src/onboarding/registration/RegulatoryTerms.tsx b/src/onboarding/registration/RegulatoryTerms.tsx
index cdd19472ba2..a9dbd384267 100644
--- a/src/onboarding/registration/RegulatoryTerms.tsx
+++ b/src/onboarding/registration/RegulatoryTerms.tsx
@@ -181,7 +181,7 @@ export class RegulatoryTerms extends React.Component<Props> {
           {(insets) => (
             <Button
               style={[styles.button, insets && insets.bottom <= MARGIN && { marginBottom: MARGIN }]}
-              type={BtnTypes.ONBOARDING}
+              type={BtnTypes.PRIMARY}
               size={BtnSizes.FULL}
               text={t('accept')}
               onPress={this.onPressAccept}
diff --git a/src/onboarding/welcome/Welcome.tsx b/src/onboarding/welcome/Welcome.tsx
index 7c8c255ee6b..ecf654dea88 100644
--- a/src/onboarding/welcome/Welcome.tsx
+++ b/src/onboarding/welcome/Welcome.tsx
@@ -116,7 +116,7 @@ export default function Welcome() {
           onPress={onPressCreateAccount}
           text={t('welcome.getStarted')}
           size={BtnSizes.FULL}
-          type={BtnTypes.ONBOARDING}
+          type={BtnTypes.PRIMARY}
           style={styles.createAccountButton}
           testID={'CreateAccountButton'}
           disabled={buttonsDisabled}
@@ -125,7 +125,7 @@ export default function Welcome() {
           onPress={onPressRestoreAccount}
           text={t('welcome.hasWallet')}
           size={BtnSizes.FULL}
-          type={BtnTypes.ONBOARDING_SECONDARY}
+          type={BtnTypes.GRAY_WITH_BORDER}
           testID={'RestoreAccountButton'}
           disabled={buttonsDisabled}
         />
diff --git a/src/verify/VerificationStartScreen.tsx b/src/verify/VerificationStartScreen.tsx
index d9bd865deaa..885917f11ed 100644
--- a/src/verify/VerificationStartScreen.tsx
+++ b/src/verify/VerificationStartScreen.tsx
@@ -232,7 +232,7 @@ function VerificationStartScreen({
         <Button
           text={t('phoneVerificationScreen.startButtonLabel')}
           onPress={onPressStart}
-          type={BtnTypes.ONBOARDING}
+          type={BtnTypes.PRIMARY}
           size={BtnSizes.FULL}
           showLoading={!signedMessageCreated}
           style={styles.startButton}