diff --git a/native/account/logged-out-modal.react.js b/native/account/logged-out-modal.react.js
index 5d5e3223e..49a65d077 100644
--- a/native/account/logged-out-modal.react.js
+++ b/native/account/logged-out-modal.react.js
@@ -1,672 +1,621 @@
 // @flow
 
 import Icon from '@expo/vector-icons/FontAwesome.js';
 import * as React from 'react';
 import {
   View,
   Text,
   TouchableOpacity,
   Image,
   Keyboard,
   Platform,
   BackHandler,
   ActivityIndicator,
 } from 'react-native';
 import {
   Easing,
   useSharedValue,
   withTiming,
   useAnimatedStyle,
   runOnJS,
 } from 'react-native-reanimated';
 import { SafeAreaView } from 'react-native-safe-area-context';
 
 import { useIsLoggedInToAuthoritativeKeyserver } from 'lib/hooks/account-hooks.js';
 import { setActiveSessionRecoveryActionType } from 'lib/keyserver-conn/keyserver-conn-types.js';
 import { usePersistedStateLoaded } from 'lib/selectors/app-state-selectors.js';
 import { isLoggedIn } from 'lib/selectors/user-selectors.js';
 import { recoveryFromReduxActionSources } from 'lib/types/account-types.js';
 import { useDispatch } from 'lib/utils/redux-utils.js';
 import {
   usingCommServicesAccessToken,
   usingRestoreFlow,
 } from 'lib/utils/services-utils.js';
 
 import { splashBackgroundURI } from './background-info.js';
 import FullscreenSIWEPanel from './fullscreen-siwe-panel.react.js';
 import LogInPanel from './log-in-panel.react.js';
 import type { LogInState } from './log-in-panel.react.js';
 import LoggedOutStaffInfo from './logged-out-staff-info.react.js';
+import PromptButton from './prompt-button.react.js';
 import { authoritativeKeyserverID } from '../authoritative-keyserver.js';
 import KeyboardAvoidingView from '../components/keyboard-avoiding-view.react.js';
 import ConnectedStatusBar from '../connected-status-bar.react.js';
 import { useRatchetingKeyboardHeight } from '../keyboard/animated-keyboard.js';
 import { createIsForegroundSelector } from '../navigation/nav-selectors.js';
 import { NavContext } from '../navigation/navigation-context.js';
 import type { RootNavigationProp } from '../navigation/root-navigator.react.js';
 import {
   type NavigationRoute,
   LoggedOutModalRouteName,
   RegistrationRouteName,
   SignInNavigatorRouteName,
 } from '../navigation/route-names.js';
 import { useSelector } from '../redux/redux-utils.js';
 import { derivedDimensionsInfoSelector } from '../selectors/dimensions-selectors.js';
 import { splashStyleSelector } from '../splash.js';
 import { useStyles } from '../themes/colors.js';
 import { AnimatedView } from '../types/styles.js';
-import EthereumLogo from '../vectors/ethereum-logo.react.js';
 
 let initialAppLoad = true;
 const safeAreaEdges = ['top', 'bottom'];
 
 export type LoggedOutMode = 'loading' | 'prompt' | 'log-in' | 'siwe';
 
 const timingConfig = {
   duration: 250,
   easing: Easing.out(Easing.ease),
 };
 
 // prettier-ignore
 function getPanelPaddingTop(
   modeValue /*: string */,
   keyboardHeightValue /*: number */,
   contentHeightValue /*: number */,
 ) /*: number */ {
   'worklet';
   const headerHeight = Platform.OS === 'ios' ? 62.33 : 58.54;
   let containerSize = headerHeight;
   if (modeValue === 'loading' || modeValue === 'prompt') {
     containerSize += Platform.OS === 'ios' ? 40 : 61;
   } else if (modeValue === 'log-in') {
     containerSize += 140;
   } else if (modeValue === 'siwe') {
     containerSize += 250;
   }
 
   const freeSpace = contentHeightValue - keyboardHeightValue - containerSize;
   const targetPanelPaddingTop = Math.max(freeSpace, 0) / 2;
   return withTiming(targetPanelPaddingTop, timingConfig);
 }
 
 // prettier-ignore
 function getPanelOpacity(
   modeValue /*: string */,
   finishResettingToPrompt/*: () => void */,
 ) /*: number */ {
   'worklet';
   const targetPanelOpacity =
     modeValue === 'loading' || modeValue === 'prompt' ? 0 : 1;
   return withTiming(
     targetPanelOpacity,
     timingConfig,
     (succeeded /*?: boolean */) => {
       if (succeeded && targetPanelOpacity === 0) {
         runOnJS(finishResettingToPrompt)();
       }
     },
   );
 }
 
 const unboundStyles = {
   animationContainer: {
     flex: 1,
   },
   backButton: {
     position: 'absolute',
     top: 13,
   },
-  button: {
-    borderRadius: 4,
-    marginBottom: 4,
-    marginTop: 4,
-    marginLeft: 4,
-    marginRight: 4,
-    paddingBottom: 14,
-    paddingLeft: 18,
-    paddingRight: 18,
-    paddingTop: 14,
-    flex: 1,
-  },
   buttonContainer: {
     bottom: 0,
     left: 0,
     marginLeft: 26,
     marginRight: 26,
     paddingBottom: 20,
     position: 'absolute',
     right: 0,
   },
-  buttonText: {
-    fontFamily: 'OpenSans-Semibold',
-    fontSize: 17,
-    textAlign: 'center',
-  },
-  classicAuthButton: {
-    backgroundColor: 'purpleButton',
-  },
-  classicAuthButtonText: {
-    color: 'whiteText',
-  },
-  registerButtons: {
-    flexDirection: 'row',
-  },
   signInButtons: {
     flexDirection: 'row',
   },
+  firstSignInButton: {
+    marginRight: 8,
+    flex: 1,
+  },
+  lastSignInButton: {
+    marginLeft: 8,
+    flex: 1,
+  },
   container: {
     backgroundColor: 'transparent',
     flex: 1,
   },
   header: {
     color: 'white',
     fontFamily: Platform.OS === 'ios' ? 'IBMPlexSans' : 'IBMPlexSans-Medium',
     fontSize: 56,
     fontWeight: '500',
     lineHeight: 66,
     textAlign: 'center',
   },
   loadingIndicator: {
     paddingTop: 15,
   },
   modalBackground: {
     bottom: 0,
     left: 0,
     position: 'absolute',
     right: 0,
     top: 0,
   },
-  siweButton: {
-    backgroundColor: 'siweButton',
-    flex: 1,
-    flexDirection: 'row',
-    justifyContent: 'center',
-  },
-  siweButtonText: {
-    color: 'siweButtonText',
-  },
   siweOr: {
     flex: 1,
     flexDirection: 'row',
     marginBottom: 18,
     marginTop: 14,
   },
   siweOrLeftHR: {
     borderColor: 'logInSpacer',
     borderTopWidth: 1,
     flex: 1,
     marginRight: 18,
     marginTop: 10,
   },
   siweOrRightHR: {
     borderColor: 'logInSpacer',
     borderTopWidth: 1,
     flex: 1,
     marginLeft: 18,
     marginTop: 10,
   },
   siweOrText: {
     color: 'whiteText',
     fontSize: 17,
     textAlign: 'center',
   },
-  siweIcon: {
-    paddingRight: 10,
-  },
 };
 
 const isForegroundSelector = createIsForegroundSelector(
   LoggedOutModalRouteName,
 );
 
 const backgroundSource = { uri: splashBackgroundURI };
 
 const initialLogInState = {
   usernameInputText: null,
   passwordInputText: null,
 };
 
 type Mode = {
   +curMode: LoggedOutMode,
   +nextMode: LoggedOutMode,
 };
 
 type Props = {
   +navigation: RootNavigationProp<'LoggedOutModal'>,
   +route: NavigationRoute<'LoggedOutModal'>,
 };
 function LoggedOutModal(props: Props) {
   const mountedRef = React.useRef(false);
   React.useEffect(() => {
     mountedRef.current = true;
     return () => {
       mountedRef.current = false;
     };
   }, []);
 
   const [logInState, baseSetLogInState] =
     React.useState<LogInState>(initialLogInState);
   const setLogInState = React.useCallback(
     (newLogInState: Partial<LogInState>) => {
       if (!mountedRef.current) {
         return;
       }
       baseSetLogInState(prevLogInState => ({
         ...prevLogInState,
         ...newLogInState,
       }));
     },
     [],
   );
   const logInStateContainer = React.useMemo(
     () => ({
       state: logInState,
       setState: setLogInState,
     }),
     [logInState, setLogInState],
   );
 
   const persistedStateLoaded = usePersistedStateLoaded();
   const initialMode = persistedStateLoaded ? 'prompt' : 'loading';
   const [mode, baseSetMode] = React.useState(() => ({
     curMode: initialMode,
     nextMode: initialMode,
   }));
   const setMode = React.useCallback((newMode: Partial<Mode>) => {
     if (!mountedRef.current) {
       return;
     }
     baseSetMode(prevMode => ({
       ...prevMode,
       ...newMode,
     }));
   }, []);
 
   const nextModeRef = React.useRef<LoggedOutMode>(initialMode);
 
   const dimensions = useSelector(derivedDimensionsInfoSelector);
   const contentHeight = useSharedValue(dimensions.safeAreaHeight);
   const modeValue = useSharedValue(initialMode);
   const buttonOpacity = useSharedValue(persistedStateLoaded ? 1 : 0);
 
   const onPrompt = mode.curMode === 'prompt';
   const prevOnPromptRef = React.useRef(onPrompt);
   React.useEffect(() => {
     if (onPrompt && !prevOnPromptRef.current) {
       buttonOpacity.value = withTiming(1, {
         easing: Easing.out(Easing.ease),
       });
     }
     prevOnPromptRef.current = onPrompt;
   }, [onPrompt, buttonOpacity]);
 
   const curContentHeight = dimensions.safeAreaHeight;
   const prevContentHeightRef = React.useRef(curContentHeight);
   React.useEffect(() => {
     if (curContentHeight === prevContentHeightRef.current) {
       return;
     }
     prevContentHeightRef.current = curContentHeight;
     contentHeight.value = curContentHeight;
   }, [curContentHeight, contentHeight]);
 
   const combinedSetMode = React.useCallback(
     (newMode: LoggedOutMode) => {
       nextModeRef.current = newMode;
       setMode({ curMode: newMode, nextMode: newMode });
       modeValue.value = newMode;
     },
     [setMode, modeValue],
   );
 
   const goBackToPrompt = React.useCallback(() => {
     nextModeRef.current = 'prompt';
     setMode({ nextMode: 'prompt' });
     modeValue.value = 'prompt';
     Keyboard.dismiss();
   }, [setMode, modeValue]);
 
   const loadingCompleteRef = React.useRef(persistedStateLoaded);
   React.useEffect(() => {
     if (!loadingCompleteRef.current && persistedStateLoaded) {
       combinedSetMode('prompt');
       loadingCompleteRef.current = true;
     }
   }, [persistedStateLoaded, combinedSetMode]);
 
   const [activeAlert, setActiveAlert] = React.useState(false);
 
   const navContext = React.useContext(NavContext);
   const isForeground = isForegroundSelector(navContext);
 
   const ratchetingKeyboardHeightInput = React.useMemo(
     () => ({
       ignoreKeyboardDismissal: activeAlert,
       disabled: !isForeground,
     }),
     [activeAlert, isForeground],
   );
   const keyboardHeightValue = useRatchetingKeyboardHeight(
     ratchetingKeyboardHeightInput,
   );
 
   // We remove the password from the TextInput on iOS before dismissing it,
   // because otherwise iOS will prompt the user to save the password if the
   // iCloud password manager is enabled. We'll put the password back after the
   // dismissal concludes.
   const temporarilyHiddenPassword = React.useRef<?string>();
 
   const curLogInPassword = logInState.passwordInputText;
   const resetToPrompt = React.useCallback(() => {
     if (nextModeRef.current === 'prompt') {
       return false;
     }
     if (Platform.OS === 'ios' && curLogInPassword) {
       temporarilyHiddenPassword.current = curLogInPassword;
       setLogInState({ passwordInputText: null });
     }
     goBackToPrompt();
     return true;
   }, [goBackToPrompt, curLogInPassword, setLogInState]);
 
   const finishResettingToPrompt = React.useCallback(() => {
     setMode({ curMode: nextModeRef.current });
     if (temporarilyHiddenPassword.current) {
       setLogInState({ passwordInputText: temporarilyHiddenPassword.current });
       temporarilyHiddenPassword.current = null;
     }
   }, [setMode, setLogInState]);
 
   React.useEffect(() => {
     if (!isForeground) {
       return undefined;
     }
     BackHandler.addEventListener('hardwareBackPress', resetToPrompt);
     return () => {
       BackHandler.removeEventListener('hardwareBackPress', resetToPrompt);
     };
   }, [isForeground, resetToPrompt]);
 
   const rehydrateConcluded = useSelector(
     state => !!(state._persist && state._persist.rehydrated && navContext),
   );
   const isLoggedInToAuthKeyserver = useIsLoggedInToAuthoritativeKeyserver();
   const loggedIn = useSelector(isLoggedIn);
   const dispatch = useDispatch();
   React.useEffect(() => {
     // This gets triggered when an app is killed and restarted
     // Not when it is returned from being backgrounded
     if (!initialAppLoad || !rehydrateConcluded) {
       return;
     }
     initialAppLoad = false;
 
     if (usingCommServicesAccessToken || __DEV__) {
       return;
     }
 
     if (loggedIn === isLoggedInToAuthKeyserver) {
       return;
     }
 
     const actionSource = loggedIn
       ? recoveryFromReduxActionSources.appStartReduxLoggedInButInvalidCookie
       : recoveryFromReduxActionSources.appStartCookieLoggedInButInvalidRedux;
     dispatch({
       type: setActiveSessionRecoveryActionType,
       payload: {
         activeSessionRecovery: actionSource,
         keyserverID: authoritativeKeyserverID,
       },
     });
   }, [rehydrateConcluded, loggedIn, isLoggedInToAuthKeyserver, dispatch]);
 
   const onPressSIWE = React.useCallback(() => {
     combinedSetMode('siwe');
   }, [combinedSetMode]);
 
   const onPressLogIn = React.useCallback(() => {
     combinedSetMode('log-in');
   }, [combinedSetMode]);
 
   const { navigate } = props.navigation;
   const onPressQRCodeSignIn = React.useCallback(() => {
     navigate(SignInNavigatorRouteName);
   }, [navigate]);
 
   const onPressNewRegister = React.useCallback(() => {
     navigate(RegistrationRouteName);
   }, [navigate]);
 
   const opacityStyle = useAnimatedStyle(() => ({
     opacity: getPanelOpacity(modeValue.value, finishResettingToPrompt),
   }));
 
   const styles = useStyles(unboundStyles);
   const panel = React.useMemo(() => {
     if (mode.curMode === 'log-in') {
       return (
         <LogInPanel
           setActiveAlert={setActiveAlert}
           opacityStyle={opacityStyle}
           logInState={logInStateContainer}
         />
       );
     } else if (mode.curMode === 'loading') {
       return (
         <ActivityIndicator
           color="white"
           size="large"
           style={styles.loadingIndicator}
         />
       );
     }
     return null;
   }, [
     mode.curMode,
     setActiveAlert,
     opacityStyle,
     logInStateContainer,
     styles.loadingIndicator,
   ]);
 
-  const classicAuthButtonStyle = React.useMemo(
-    () => [styles.button, styles.classicAuthButton],
-    [styles.button, styles.classicAuthButton],
-  );
-  const classicAuthButtonTextStyle = React.useMemo(
-    () => [styles.buttonText, styles.classicAuthButtonText],
-    [styles.buttonText, styles.classicAuthButtonText],
-  );
-  const siweAuthButtonStyle = React.useMemo(
-    () => [styles.button, styles.siweButton],
-    [styles.button, styles.siweButton],
-  );
-  const siweAuthButtonTextStyle = React.useMemo(
-    () => [styles.buttonText, styles.siweButtonText],
-    [styles.buttonText, styles.siweButtonText],
-  );
   const buttonsViewOpacity = useAnimatedStyle(() => ({
     opacity: buttonOpacity.value,
   }));
   const buttonsViewStyle = React.useMemo(
     () => [styles.buttonContainer, buttonsViewOpacity],
     [styles.buttonContainer, buttonsViewOpacity],
   );
   const buttons = React.useMemo(() => {
     if (mode.curMode !== 'prompt') {
       return null;
     }
 
-    const signInButtons = [];
+    const signInButtons: Array<React.Element<any>> = [];
     if (!usingRestoreFlow) {
       signInButtons.push(
-        <TouchableOpacity
+        <PromptButton
+          text="Sign in"
           onPress={onPressLogIn}
-          style={classicAuthButtonStyle}
-          activeOpacity={0.6}
+          variant="regular"
           key="login-form"
-        >
-          <Text style={classicAuthButtonTextStyle}>Sign in</Text>
-        </TouchableOpacity>,
+        />,
       );
     }
     if (__DEV__ || usingRestoreFlow) {
       const buttonText = usingRestoreFlow ? 'Sign in' : 'Sign in (QR)';
       signInButtons.push(
-        <TouchableOpacity
+        <PromptButton
+          text={buttonText}
           onPress={onPressQRCodeSignIn}
-          style={classicAuthButtonStyle}
-          activeOpacity={0.6}
+          variant="regular"
           key="qr-code-login"
-        >
-          <Text style={classicAuthButtonTextStyle}>{buttonText}</Text>
-        </TouchableOpacity>,
+        />,
+      );
+    }
+
+    if (signInButtons.length === 2) {
+      signInButtons[0] = (
+        <View style={styles.firstSignInButton} key="login-form">
+          {signInButtons[0]}
+        </View>
+      );
+      signInButtons[1] = (
+        <View style={styles.lastSignInButton} key="qr-code-login">
+          {signInButtons[1]}
+        </View>
       );
     }
 
     let siweSection = null;
     if (!usingRestoreFlow) {
       siweSection = (
         <>
-          <TouchableOpacity
+          <PromptButton
+            text="Sign in with Ethereum"
             onPress={onPressSIWE}
-            style={siweAuthButtonStyle}
-            activeOpacity={0.6}
-          >
-            <View style={styles.siweIcon}>
-              <EthereumLogo />
-            </View>
-            <Text style={siweAuthButtonTextStyle}>Sign in with Ethereum</Text>
-          </TouchableOpacity>
+            variant="siwe"
+          />
           <View style={styles.siweOr}>
             <View style={styles.siweOrLeftHR} />
             <Text style={styles.siweOrText}>or</Text>
             <View style={styles.siweOrRightHR} />
           </View>
         </>
       );
     }
 
     return (
       <AnimatedView style={buttonsViewStyle}>
         <LoggedOutStaffInfo />
         {siweSection}
         <View style={styles.signInButtons}>{signInButtons}</View>
-        <View style={styles.registerButtons}>
-          <TouchableOpacity
-            onPress={onPressNewRegister}
-            style={classicAuthButtonStyle}
-            activeOpacity={0.6}
-            key="new"
-          >
-            <Text style={classicAuthButtonTextStyle}>Register</Text>
-          </TouchableOpacity>
-        </View>
+        <PromptButton
+          text="Register"
+          onPress={onPressNewRegister}
+          variant="regular"
+        />
       </AnimatedView>
     );
   }, [
     mode.curMode,
     onPressNewRegister,
     onPressLogIn,
     onPressQRCodeSignIn,
     onPressSIWE,
-    classicAuthButtonStyle,
-    classicAuthButtonTextStyle,
-    siweAuthButtonStyle,
-    siweAuthButtonTextStyle,
     buttonsViewStyle,
-    styles.siweIcon,
+    styles.firstSignInButton,
+    styles.lastSignInButton,
     styles.siweOr,
     styles.siweOrLeftHR,
     styles.siweOrText,
     styles.siweOrRightHR,
     styles.signInButtons,
-    styles.registerButtons,
   ]);
 
   const windowWidth = dimensions.width;
   const backButtonStyle = React.useMemo(
     () => [
       styles.backButton,
       opacityStyle,
       { left: windowWidth < 360 ? 28 : 40 },
     ],
     [styles.backButton, opacityStyle, windowWidth],
   );
 
   const paddingTopStyle = useAnimatedStyle(() => ({
     paddingTop: getPanelPaddingTop(
       modeValue.value,
       keyboardHeightValue.value,
       contentHeight.value,
     ),
   }));
   const animatedContentStyle = React.useMemo(
     () => [styles.animationContainer, paddingTopStyle],
     [styles.animationContainer, paddingTopStyle],
   );
   const animatedContent = React.useMemo(
     () => (
       <AnimatedView style={animatedContentStyle}>
         <View>
           <Text style={styles.header}>Comm</Text>
           <AnimatedView style={backButtonStyle}>
             <TouchableOpacity activeOpacity={0.6} onPress={resetToPrompt}>
               <Icon name="arrow-circle-o-left" size={36} color="#FFFFFFAA" />
             </TouchableOpacity>
           </AnimatedView>
         </View>
         {panel}
       </AnimatedView>
     ),
     [
       animatedContentStyle,
       styles.header,
       backButtonStyle,
       resetToPrompt,
       panel,
     ],
   );
 
   const curModeIsSIWE = mode.curMode === 'siwe';
   const nextModeIsPrompt = mode.nextMode === 'prompt';
   const siwePanel = React.useMemo(() => {
     if (!curModeIsSIWE) {
       return null;
     }
     return (
       <FullscreenSIWEPanel
         goBackToPrompt={goBackToPrompt}
         closing={nextModeIsPrompt}
       />
     );
   }, [curModeIsSIWE, goBackToPrompt, nextModeIsPrompt]);
 
   const splashStyle = useSelector(splashStyleSelector);
   const backgroundStyle = React.useMemo(
     () => [styles.modalBackground, splashStyle],
     [styles.modalBackground, splashStyle],
   );
   return React.useMemo(
     () => (
       <>
         <ConnectedStatusBar barStyle="light-content" />
         <Image source={backgroundSource} style={backgroundStyle} />
         <SafeAreaView style={styles.container} edges={safeAreaEdges}>
           <KeyboardAvoidingView behavior="padding" style={styles.container}>
             {animatedContent}
             {buttons}
           </KeyboardAvoidingView>
         </SafeAreaView>
         {siwePanel}
       </>
     ),
     [backgroundStyle, styles.container, animatedContent, buttons, siwePanel],
   );
 }
 
 const MemoizedLoggedOutModal: React.ComponentType<Props> =
   React.memo<Props>(LoggedOutModal);
 
 export default MemoizedLoggedOutModal;
diff --git a/native/account/prompt-button.react.js b/native/account/prompt-button.react.js
new file mode 100644
index 000000000..2574682ab
--- /dev/null
+++ b/native/account/prompt-button.react.js
@@ -0,0 +1,58 @@
+// @flow
+
+import * as React from 'react';
+import { Text, View } from 'react-native';
+
+import PrimaryButton from '../components/primary-button.react.js';
+import { useStyles } from '../themes/colors.js';
+import EthereumLogo from '../vectors/ethereum-logo.react.js';
+
+type Props = {
+  +text: string,
+  +onPress: () => mixed,
+  +variant: 'regular' | 'siwe',
+};
+
+function PromptButton(props: Props): React.Node {
+  const styles = useStyles(unboundStyles);
+
+  const { text, onPress, variant } = props;
+  if (variant === 'regular') {
+    return (
+      <View style={styles.container}>
+        <PrimaryButton onPress={onPress} label={text} />
+      </View>
+    );
+  }
+
+  return (
+    <View style={styles.container}>
+      <PrimaryButton onPress={onPress} style={styles.siweButton}>
+        <View style={styles.siweIcon}>
+          <EthereumLogo />
+        </View>
+        <Text style={styles.buttonText}>{text}</Text>
+      </PrimaryButton>
+    </View>
+  );
+}
+
+const unboundStyles = {
+  container: { flex: 1 },
+  buttonText: {
+    fontSize: 18,
+    textAlign: 'center',
+    color: 'siweButtonText',
+  },
+  siweButton: {
+    backgroundColor: 'siweButton',
+    flexDirection: 'row',
+    justifyContent: 'center',
+    padding: 12,
+  },
+  siweIcon: {
+    paddingRight: 10,
+  },
+};
+
+export default PromptButton;
diff --git a/native/components/primary-button.react.js b/native/components/primary-button.react.js
index 75af2dd76..d1c356fd7 100644
--- a/native/components/primary-button.react.js
+++ b/native/components/primary-button.react.js
@@ -1,101 +1,119 @@
 // @flow
 
 import * as React from 'react';
 import { Text, View, ActivityIndicator } from 'react-native';
 
 import Button from './button.react.js';
 import { useColors, useStyles } from '../themes/colors.js';
+import type { ViewStyle } from '../types/styles';
 
 type Props = {
   +onPress: () => mixed,
-  +label: string,
+  +label?: string,
   +variant?: 'enabled' | 'disabled' | 'loading' | 'outline',
+  +children?: React.Node,
+  +style?: ViewStyle,
 };
 function PrimaryButton(props: Props): React.Node {
   const { onPress, label, variant } = props;
 
   const styles = useStyles(unboundStyles);
   const buttonStyle = React.useMemo(() => {
+    let style;
     if (variant === 'disabled' || variant === 'loading') {
-      return [styles.button, styles.disabledButton];
+      style = [styles.button, styles.disabledButton];
     } else if (variant === 'outline') {
-      return [styles.button, styles.outlineButton];
+      style = [styles.button, styles.outlineButton];
     } else {
-      return styles.button;
+      style = [styles.button];
     }
-  }, [variant, styles.button, styles.disabledButton, styles.outlineButton]);
+    return [...style, props.style];
+  }, [
+    props.style,
+    styles.button,
+    styles.disabledButton,
+    styles.outlineButton,
+    variant,
+  ]);
   const buttonTextStyle = React.useMemo(() => {
     if (variant === 'disabled') {
       return [styles.buttonText, styles.disabledButtonText];
     } else if (variant === 'loading') {
       return [styles.buttonText, styles.invisibleLoadingText];
     }
     return styles.buttonText;
   }, [
     variant,
     styles.buttonText,
     styles.disabledButtonText,
     styles.invisibleLoadingText,
   ]);
 
   const colors = useColors();
   const spinner = React.useMemo(() => {
     if (variant !== 'loading') {
       return undefined;
     }
     return (
       <View style={styles.spinner}>
         <ActivityIndicator size="small" color={colors.panelForegroundLabel} />
       </View>
     );
   }, [variant, styles.spinner, colors.panelForegroundLabel]);
 
+  const content = React.useMemo(() => {
+    if (label) {
+      return <Text style={buttonTextStyle}>{label}</Text>;
+    }
+    return props.children;
+  }, [buttonTextStyle, label, props.children]);
+
   return (
     <Button
       onPress={onPress}
       iosActiveOpacity={0.6}
       style={buttonStyle}
       disabled={variant === 'disabled' || variant === 'loading'}
     >
-      <Text style={buttonTextStyle}>{label}</Text>
+      {content}
       {spinner}
     </Button>
   );
 }
 
 const unboundStyles = {
   button: {
     backgroundColor: 'purpleButton',
     borderRadius: 8,
     marginVertical: 8,
   },
   buttonText: {
     fontSize: 18,
     color: 'panelForegroundLabel',
     textAlign: 'center',
     padding: 12,
   },
   disabledButton: {
     backgroundColor: 'disabledButton',
   },
   outlineButton: {
     backgroundColor: 'panelBackground',
     borderColor: 'panelForegroundLabel',
     borderWidth: 1,
   },
   disabledButtonText: {
     color: 'disabledButtonText',
   },
   invisibleLoadingText: {
     color: 'transparent',
   },
   spinner: {
     position: 'absolute',
     width: '100%',
     height: '100%',
     justifyContent: 'center',
     alignItems: 'center',
   },
 };
 
 export default PrimaryButton;