diff --git a/packages/legacy/core/App/components/chat/ActionSlider.tsx b/packages/legacy/core/App/components/chat/ActionSlider.tsx
index a16df8ce90..32a50506da 100644
--- a/packages/legacy/core/App/components/chat/ActionSlider.tsx
+++ b/packages/legacy/core/App/components/chat/ActionSlider.tsx
@@ -45,8 +45,7 @@ const ActionSlider: React.FC<Props> = ({ actions, onDismiss }) => {
       elevation: 5,
     },
     drawerTitleText: {
-      ...TextTheme.normal,
-      fontWeight: 'bold',
+      ...TextTheme.bold,
       textAlign: 'center',
       marginVertical: 10,
     },
diff --git a/packages/legacy/core/App/components/listItems/NotificationListItem.tsx b/packages/legacy/core/App/components/listItems/NotificationListItem.tsx
index edb4a43ead..165f075782 100644
--- a/packages/legacy/core/App/components/listItems/NotificationListItem.tsx
+++ b/packages/legacy/core/App/components/listItems/NotificationListItem.tsx
@@ -115,9 +115,8 @@ const NotificationListItem: React.FC<NotificationListItemProps> = ({ notificatio
       paddingBottom: 5,
     },
     headerText: {
-      ...TextTheme.normal,
+      ...TextTheme.bold,
       flexGrow: 1,
-      fontWeight: 'bold',
       alignSelf: 'center',
       flex: 1,
     },
diff --git a/packages/legacy/core/App/components/misc/CredentialCard11.tsx b/packages/legacy/core/App/components/misc/CredentialCard11.tsx
index f7ff2a4200..b977199338 100644
--- a/packages/legacy/core/App/components/misc/CredentialCard11.tsx
+++ b/packages/legacy/core/App/components/misc/CredentialCard11.tsx
@@ -218,7 +218,7 @@ const CredentialCard11: React.FC<CredentialCard11Props> = ({
     },
     credActionText: {
       fontSize: 20,
-      fontWeight: 'bold',
+      fontWeight: TextTheme.bold.fontWeight,
       color: ColorPallet.brand.link,
     },
   })
@@ -298,10 +298,9 @@ const CredentialCard11: React.FC<CredentialCard11Props> = ({
         ) : (
           <Text
             style={[
-              TextTheme.normal,
+              TextTheme.bold,
               {
                 fontSize: 0.5 * logoHeight,
-                fontWeight: 'bold',
                 alignSelf: 'center',
                 color: '#000',
               },
@@ -346,11 +345,10 @@ const CredentialCard11: React.FC<CredentialCard11Props> = ({
         ) : (
           <Text
             style={[
-              TextTheme.normal,
+              TextTheme.bold,
               styles.textContainer,
               {
                 lineHeight: 24,
-                fontWeight: 'bold',
               },
               { color: warn ? ColorPallet.notification.warnText : styles.textContainer.color },
             ]}
@@ -432,10 +430,9 @@ const CredentialCard11: React.FC<CredentialCard11Props> = ({
             <Text
               testID={testIdWithKey('CredentialName')}
               style={[
-                TextTheme.normal,
+                TextTheme.bold,
                 styles.textContainer,
                 {
-                  fontWeight: 'bold',
                   lineHeight: 24,
                   flex: 1,
                   flexWrap: 'wrap',
diff --git a/packages/legacy/core/App/components/misc/InfoBox.tsx b/packages/legacy/core/App/components/misc/InfoBox.tsx
index cad8dcab38..78fe51ee20 100644
--- a/packages/legacy/core/App/components/misc/InfoBox.tsx
+++ b/packages/legacy/core/App/components/misc/InfoBox.tsx
@@ -72,10 +72,9 @@ const InfoBox: React.FC<BifoldErrorProps> = ({
       flexGrow: 0,
     },
     headerText: {
-      ...TextTheme.normal,
+      ...TextTheme.bold,
       marginLeft: 7,
       flexShrink: 1,
-      fontWeight: 'bold',
       alignSelf: 'center',
       color: ColorPallet.notification.infoText,
     },
@@ -91,7 +90,7 @@ const InfoBox: React.FC<BifoldErrorProps> = ({
     },
     showDetailsText: {
       ...TextTheme.title,
-      fontWeight: 'normal',
+      fontWeight: TextTheme.normal.fontWeight,
       color: ColorPallet.brand.link,
     },
   })
diff --git a/packages/legacy/core/App/components/misc/ScanTab.tsx b/packages/legacy/core/App/components/misc/ScanTab.tsx
index 80b6e3a286..7f8a872fd7 100644
--- a/packages/legacy/core/App/components/misc/ScanTab.tsx
+++ b/packages/legacy/core/App/components/misc/ScanTab.tsx
@@ -13,7 +13,7 @@ interface ScanTabProps {
 }
 
 const ScanTab: React.FC<ScanTabProps> = ({ onPress, active, iconName, title }) => {
-  const { TabTheme } = useTheme()
+  const { TabTheme, TextTheme } = useTheme()
   const { fontScale } = useWindowDimensions()
   const showLabels = fontScale * TabTheme.tabBarTextStyle.fontSize < 18
 
@@ -24,7 +24,7 @@ const ScanTab: React.FC<ScanTabProps> = ({ onPress, active, iconName, title }) =
     text: {
       ...TabTheme.tabBarTextStyle,
       color: active ? TabTheme.tabBarActiveTintColor : TabTheme.tabBarInactiveTintColor,
-      fontWeight: active ? 'bold' : 'normal',
+      fontWeight: active ? TextTheme.bold.fontWeight : TextTheme.normal.fontWeight,
     },
   })
   return (
diff --git a/packages/legacy/core/App/components/misc/SharedProofData.tsx b/packages/legacy/core/App/components/misc/SharedProofData.tsx
index 41fe95b286..3f792b6cb3 100644
--- a/packages/legacy/core/App/components/misc/SharedProofData.tsx
+++ b/packages/legacy/core/App/components/misc/SharedProofData.tsx
@@ -69,12 +69,12 @@ const SharedDataCard: React.FC<{ sharedData: GroupedSharedProofDataItem }> = ({
     },
     attributeName: {
       fontSize: 16,
-      fontWeight: 'normal',
+      fontWeight: TextTheme.normal.fontWeight,
       color: ColorPallet.grayscale.black,
     },
     attributeValue: {
       fontSize: 18,
-      fontWeight: 'bold',
+      fontWeight: TextTheme.bold.fontWeight,
       color: ColorPallet.grayscale.black,
     },
   })
@@ -161,10 +161,9 @@ const SharedDataCard: React.FC<{ sharedData: GroupedSharedProofDataItem }> = ({
         ) : (
           <Text
             style={[
-              TextTheme.normal,
+              TextTheme.bold,
               {
                 fontSize: 0.5 * logoHeight,
-                fontWeight: 'bold',
                 alignSelf: 'center',
                 color: ColorPallet.grayscale.black,
               },
diff --git a/packages/legacy/core/App/components/modals/AppGuideModal.tsx b/packages/legacy/core/App/components/modals/AppGuideModal.tsx
index 4f18dc9098..06e4a639da 100644
--- a/packages/legacy/core/App/components/modals/AppGuideModal.tsx
+++ b/packages/legacy/core/App/components/modals/AppGuideModal.tsx
@@ -63,7 +63,6 @@ const AppGuideModal: React.FC<AppGuideModalProps> = ({
     },
     headerText: {
       ...TextTheme.headingThree,
-      fontWeight: 'bold',
       alignSelf: 'flex-start',
       flexWrap: 'wrap',
       color: ColorPallet.notification.infoText,
diff --git a/packages/legacy/core/App/components/modals/CommonRemoveModal.tsx b/packages/legacy/core/App/components/modals/CommonRemoveModal.tsx
index 90def7981a..42c0ef4c5d 100644
--- a/packages/legacy/core/App/components/modals/CommonRemoveModal.tsx
+++ b/packages/legacy/core/App/components/modals/CommonRemoveModal.tsx
@@ -52,7 +52,7 @@ const Dropdown: React.FC<RemoveProps> = ({ title, content }) => {
           },
         ]}
       >
-        <Text style={[TextTheme.modalNormal, { fontWeight: 'bold' }]}>{title}</Text>
+        <Text style={[TextTheme.modalNormal, { fontWeight: TextTheme.bold.fontWeight }]}>{title}</Text>
         <Icon name={isCollapsed ? 'expand-more' : 'expand-less'} size={24} color={TextTheme.modalNormal.color} />
       </TouchableOpacity>
       <Collapsible collapsed={isCollapsed} enablePointerEvents={true}>
diff --git a/packages/legacy/core/App/components/modals/DismissiblePopupModal.tsx b/packages/legacy/core/App/components/modals/DismissiblePopupModal.tsx
index 3d9f2e636d..fd6da56165 100644
--- a/packages/legacy/core/App/components/modals/DismissiblePopupModal.tsx
+++ b/packages/legacy/core/App/components/modals/DismissiblePopupModal.tsx
@@ -72,8 +72,7 @@ const DismissiblePopupModal: React.FC<DismissiblePopupModalProps> = ({
       flexGrow: 1,
     },
     headerText: {
-      ...TextTheme.normal,
-      fontWeight: 'bold',
+      ...TextTheme.bold,
       alignSelf: 'flex-start',
       color: ColorPallet.notification.infoText,
     },
diff --git a/packages/legacy/core/App/components/modals/NotificationModal.tsx b/packages/legacy/core/App/components/modals/NotificationModal.tsx
index 2fcf3197eb..ad1d214b2e 100644
--- a/packages/legacy/core/App/components/modals/NotificationModal.tsx
+++ b/packages/legacy/core/App/components/modals/NotificationModal.tsx
@@ -101,7 +101,9 @@ const NotificationModal: React.FC<NotificationModalProps> = ({
           </View>
         ) : null}
         <View style={styles.childContainer}>
-          <Text style={[TextTheme.headingThree, { fontWeight: 'normal', textAlign: 'center' }]}>{title}</Text>
+          <Text style={[TextTheme.headingThree, { fontWeight: TextTheme.normal.fontWeight, textAlign: 'center' }]}>
+            {title}
+          </Text>
           {children}
         </View>
         {doneVisible ? (
diff --git a/packages/legacy/core/App/components/record/RecordField.tsx b/packages/legacy/core/App/components/record/RecordField.tsx
index 1d135b1054..abf013eaf1 100644
--- a/packages/legacy/core/App/components/record/RecordField.tsx
+++ b/packages/legacy/core/App/components/record/RecordField.tsx
@@ -98,10 +98,7 @@ const RecordField: React.FC<RecordFieldProps> = ({
         {fieldLabel ? (
           fieldLabel(field)
         ) : (
-          <Text
-            style={[ListItems.recordAttributeLabel, { fontWeight: 'bold' }]}
-            testID={testIdWithKey('AttributeName')}
-          >
+          <Text style={[ListItems.recordAttributeLabel]} testID={testIdWithKey('AttributeName')}>
             {field.label ?? startCase(field.name || '')}
           </Text>
         )}
diff --git a/packages/legacy/core/App/components/texts/InfoTextBox.tsx b/packages/legacy/core/App/components/texts/InfoTextBox.tsx
index 0b69c22552..cb5cd85718 100644
--- a/packages/legacy/core/App/components/texts/InfoTextBox.tsx
+++ b/packages/legacy/core/App/components/texts/InfoTextBox.tsx
@@ -26,9 +26,8 @@ const InfoTextBox: React.FC<TextBoxProps> = ({ children }) => {
       alignItems: 'center',
     },
     textContainer: {
-      ...TextTheme.normal,
+      ...TextTheme.bold,
       color: ColorPallet.notification.infoText,
-      fontWeight: 'bold',
       alignSelf: 'center',
       flexShrink: 1,
     },
diff --git a/packages/legacy/core/App/components/toast/BaseToast.tsx b/packages/legacy/core/App/components/toast/BaseToast.tsx
index f24a865821..6c6d262246 100644
--- a/packages/legacy/core/App/components/toast/BaseToast.tsx
+++ b/packages/legacy/core/App/components/toast/BaseToast.tsx
@@ -50,7 +50,7 @@ const BaseToast: React.FC<BaseToastProps> = ({ title, body, toastType, onPress =
       marginHorizontal: 15,
     },
     title: {
-      fontWeight: 'bold',
+      fontWeight: TextTheme.bold.fontWeight,
     },
     body: {
       marginTop: 10,
diff --git a/packages/legacy/core/App/components/tour/TourBox.tsx b/packages/legacy/core/App/components/tour/TourBox.tsx
index adfe7c7429..cf485e3f38 100644
--- a/packages/legacy/core/App/components/tour/TourBox.tsx
+++ b/packages/legacy/core/App/components/tour/TourBox.tsx
@@ -100,7 +100,6 @@ export function TourBox(props: TourBoxProps): ReactElement {
     },
     headerText: {
       ...TextTheme.headingThree,
-      fontWeight: 'bold',
       alignSelf: 'flex-start',
       color: ColorPallet.notification.infoText,
     },
@@ -116,9 +115,8 @@ export function TourBox(props: TourBoxProps): ReactElement {
       justifyContent: 'space-around',
     },
     navText: {
-      ...TextTheme.normal,
+      ...TextTheme.bold,
       color: ColorPallet.brand.primary,
-      fontWeight: 'bold',
     },
     pagerContainer: {
       flexDirection: 'row',
diff --git a/packages/legacy/core/App/components/views/FauxNavigationBar.tsx b/packages/legacy/core/App/components/views/FauxNavigationBar.tsx
index 523c43d143..3fdc9d1dd9 100644
--- a/packages/legacy/core/App/components/views/FauxNavigationBar.tsx
+++ b/packages/legacy/core/App/components/views/FauxNavigationBar.tsx
@@ -33,10 +33,9 @@ const FauxNavigationBar: React.FC<FauxNavigationBarProps> = ({ title, onHomeTouc
       justifyContent: 'space-between',
     },
     label: {
-      ...TextTheme.normal,
+      ...TextTheme.bold,
       color: ColorPallet.brand.headerText,
       fontSize: 17,
-      fontWeight: 'bold',
       flexGrow: 1,
       textAlign: 'center',
       paddingBottom: 12,
diff --git a/packages/legacy/core/App/components/views/HomeFooterView.tsx b/packages/legacy/core/App/components/views/HomeFooterView.tsx
index 33edec48c5..4daf43d484 100644
--- a/packages/legacy/core/App/components/views/HomeFooterView.tsx
+++ b/packages/legacy/core/App/components/views/HomeFooterView.tsx
@@ -19,7 +19,7 @@ const HomeFooterView: React.FC<HomeFooterViewProps> = ({ children }) => {
     ...useCredentialByState(CredentialState.Done),
   ]
   const notifications = useNotifications()
-  const { HomeTheme } = useTheme()
+  const { HomeTheme, TextTheme } = useTheme()
   const { t } = useTranslation()
   const styles = StyleSheet.create({
     container: {
@@ -45,15 +45,15 @@ const HomeFooterView: React.FC<HomeFooterViewProps> = ({ children }) => {
     if (credentialCount === 1) {
       credentialMsg = (
         <Text>
-          {t('Home.YouHave')} <Text style={{ fontWeight: 'bold' }}>{credentialCount}</Text> {t('Home.Credential')}{' '}
-          {t('Home.InYourWallet')}
+          {t('Home.YouHave')} <Text style={{ fontWeight: TextTheme.bold.fontWeight }}>{credentialCount}</Text>{' '}
+          {t('Home.Credential')} {t('Home.InYourWallet')}
         </Text>
       )
     } else if (credentialCount > 1) {
       credentialMsg = (
         <Text>
-          {t('Home.YouHave')} <Text style={{ fontWeight: 'bold' }}>{credentialCount}</Text> {t('Home.Credentials')}{' '}
-          {t('Home.InYourWallet')}
+          {t('Home.YouHave')} <Text style={{ fontWeight: TextTheme.bold.fontWeight }}>{credentialCount}</Text>{' '}
+          {t('Home.Credentials')} {t('Home.InYourWallet')}
         </Text>
       )
     } else {
diff --git a/packages/legacy/core/App/navigators/TabStack.tsx b/packages/legacy/core/App/navigators/TabStack.tsx
index 09ef7780da..a4da31bd25 100644
--- a/packages/legacy/core/App/navigators/TabStack.tsx
+++ b/packages/legacy/core/App/navigators/TabStack.tsx
@@ -25,7 +25,7 @@ const TabStack: React.FC = () => {
   const { t } = useTranslation()
   const Tab = createBottomTabNavigator<TabStackParams>()
   const { assertConnectedNetwork } = useNetwork()
-  const { ColorPallet, TabTheme } = useTheme()
+  const { ColorPallet, TabTheme, TextTheme } = useTheme()
   const [orientation, setOrientation] = useState(OrientationType.PORTRAIT)
   const showLabels = fontScale * TabTheme.tabBarTextStyle.fontSize < 18
   const styles = StyleSheet.create({
@@ -74,7 +74,7 @@ const TabStack: React.FC = () => {
                       style={{
                         ...TabTheme.tabBarTextStyle,
                         color: focused ? TabTheme.tabBarActiveTintColor : TabTheme.tabBarInactiveTintColor,
-                        fontWeight: focused ? 'bold' : 'normal',
+                        fontWeight: focused ? TextTheme.bold.fontWeight : TextTheme.normal.fontWeight,
                       }}
                     >
                       {t('TabStack.Home')}
@@ -189,7 +189,7 @@ const TabStack: React.FC = () => {
                       style={{
                         ...TabTheme.tabBarTextStyle,
                         color: focused ? TabTheme.tabBarActiveTintColor : TabTheme.tabBarInactiveTintColor,
-                        fontWeight: focused ? 'bold' : 'normal',
+                        fontWeight: focused ? TextTheme.bold.fontWeight : TextTheme.normal.fontWeight,
                       }}
                     >
                       {t('TabStack.Credentials')}
diff --git a/packages/legacy/core/App/screens/AttemptLockout.tsx b/packages/legacy/core/App/screens/AttemptLockout.tsx
index af78bd5d21..fd3a2746b1 100644
--- a/packages/legacy/core/App/screens/AttemptLockout.tsx
+++ b/packages/legacy/core/App/screens/AttemptLockout.tsx
@@ -49,9 +49,8 @@ const AttemptLockout: React.FC = () => {
       textAlign: 'center',
     },
     countDown: {
-      ...TextTheme.normal,
+      ...TextTheme.bold,
       textAlign: 'center',
-      fontWeight: 'bold',
     },
     image: {
       width: 150,
diff --git a/packages/legacy/core/App/screens/Connection.tsx b/packages/legacy/core/App/screens/Connection.tsx
index fa52dd38f7..6f83a430c5 100644
--- a/packages/legacy/core/App/screens/Connection.tsx
+++ b/packages/legacy/core/App/screens/Connection.tsx
@@ -63,7 +63,7 @@ const Connection: React.FC<ConnectionProps> = ({ navigation, route }) => {
       alignItems: 'center',
     },
     messageText: {
-      fontWeight: 'normal',
+      fontWeight: TextTheme.normal.fontWeight,
       textAlign: 'center',
       marginTop: 30,
     },
diff --git a/packages/legacy/core/App/screens/CredentialOffer.tsx b/packages/legacy/core/App/screens/CredentialOffer.tsx
index 58a00b8332..25ad0c0b8c 100644
--- a/packages/legacy/core/App/screens/CredentialOffer.tsx
+++ b/packages/legacy/core/App/screens/CredentialOffer.tsx
@@ -49,7 +49,7 @@ const CredentialOffer: React.FC<CredentialOfferProps> = ({ navigation, route })
 
   const { agent } = useAppAgent()
   const { t, i18n } = useTranslation()
-  const { ListItems, ColorPallet } = useTheme()
+  const { TextTheme, ColorPallet } = useTheme()
   const { RecordLoading } = useAnimatedComponents()
   const { assertConnectedNetwork } = useNetwork()
   const { OCABundleResolver, enableTours: enableToursConfig } = useConfiguration()
@@ -71,7 +71,7 @@ const CredentialOffer: React.FC<CredentialOfferProps> = ({ navigation, route })
       paddingVertical: 16,
     },
     headerText: {
-      ...ListItems.recordAttributeLabel,
+      ...TextTheme.normal,
       flexShrink: 1,
     },
     footerButton: {
diff --git a/packages/legacy/core/App/screens/CredentialOfferAccept.tsx b/packages/legacy/core/App/screens/CredentialOfferAccept.tsx
index f57382072a..1d5bea98f3 100644
--- a/packages/legacy/core/App/screens/CredentialOfferAccept.tsx
+++ b/packages/legacy/core/App/screens/CredentialOfferAccept.tsx
@@ -50,7 +50,6 @@ const CredentialOfferAccept: React.FC<CredentialOfferAcceptProps> = ({ visible,
       alignItems: 'center',
     },
     messageText: {
-      fontWeight: 'normal',
       textAlign: 'center',
       marginTop: 30,
     },
diff --git a/packages/legacy/core/App/screens/Developer.tsx b/packages/legacy/core/App/screens/Developer.tsx
index a1ac08777d..1065f11feb 100644
--- a/packages/legacy/core/App/screens/Developer.tsx
+++ b/packages/legacy/core/App/screens/Developer.tsx
@@ -35,10 +35,9 @@ const Developer: React.FC = () => {
       alignItems: 'center',
     },
     settingLabelText: {
-      ...TextTheme.normal,
+      ...TextTheme.bold,
       marginRight: 10,
       textAlign: 'left',
-      fontWeight: 'bold',
     },
     settingSwitchContainer: {
       justifyContent: 'center',
diff --git a/packages/legacy/core/App/screens/OnboardingPages.tsx b/packages/legacy/core/App/screens/OnboardingPages.tsx
index 7520a69e97..790fce793f 100644
--- a/packages/legacy/core/App/screens/OnboardingPages.tsx
+++ b/packages/legacy/core/App/screens/OnboardingPages.tsx
@@ -51,8 +51,6 @@ export const createCarouselStyle = (OnboardingTheme: any): OnboardingStyleSheet
     },
     pagerNavigationButton: {
       ...OnboardingTheme.pagerNavigationButton,
-      fontSize: 18,
-      fontWeight: 'bold',
     },
   })
 }
diff --git a/packages/legacy/core/App/screens/PINCreate.tsx b/packages/legacy/core/App/screens/PINCreate.tsx
index bf6f29e1f8..f3b44c3cf2 100644
--- a/packages/legacy/core/App/screens/PINCreate.tsx
+++ b/packages/legacy/core/App/screens/PINCreate.tsx
@@ -175,7 +175,7 @@ const PINCreate: React.FC<PINCreateProps> = ({ setAuthenticated, route }) => {
       <View style={style.screenContainer}>
         <View style={style.contentContainer}>
           <Text style={[TextTheme.normal, { marginBottom: 16 }]}>
-            <Text style={{ fontWeight: 'bold' }}>
+            <Text style={{ fontWeight: TextTheme.bold.fontWeight }}>
               {updatePin ? t('PINCreate.RememberChangePIN') : t('PINCreate.RememberPIN')}
             </Text>{' '}
             {t('PINCreate.PINDisclaimer')}
diff --git a/packages/legacy/core/App/screens/PINEnter.tsx b/packages/legacy/core/App/screens/PINEnter.tsx
index b4ae4534e8..c42e9e9d48 100644
--- a/packages/legacy/core/App/screens/PINEnter.tsx
+++ b/packages/legacy/core/App/screens/PINEnter.tsx
@@ -44,7 +44,7 @@ const PINEnter: React.FC<PINEnterProps> = ({ setAuthenticated, usage = PINEntryU
   const [displayNotification, setDisplayNotification] = useState(false)
   const [alertModalVisible, setAlertModalVisible] = useState<boolean>(false)
   const [biometricsEnrollmentChange, setBiometricsEnrollmentChange] = useState<boolean>(false)
-  const { ColorPallet, TextTheme, Assets } = useTheme()
+  const { ColorPallet, TextTheme, Assets, PINEnterTheme } = useTheme()
   const { ButtonLoading } = useAnimatedComponents()
 
   const style = StyleSheet.create({
@@ -70,6 +70,12 @@ const PINEnter: React.FC<PINEnterProps> = ({ setAuthenticated, usage = PINEntryU
       ...TextTheme.popupModalText,
       marginVertical: 5,
     },
+    image: {
+      ...PINEnterTheme.image,
+      height: Assets.img.logoSecondary.height,
+      width: Assets.img.logoSecondary.width,
+      resizeMode: Assets.img.logoSecondary.resizeMode,
+    },
   })
 
   // listen for biometrics error event
@@ -294,16 +300,7 @@ const PINEnter: React.FC<PINEnterProps> = ({ setAuthenticated, usage = PINEntryU
       <StatusBar barStyle={StatusBarStyles.Light} />
       <View style={style.screenContainer}>
         <View style={style.contentContainer}>
-          <Image
-            source={Assets.img.logoSecondary.src}
-            style={{
-              height: Assets.img.logoSecondary.height,
-              width: Assets.img.logoSecondary.width,
-              resizeMode: Assets.img.logoSecondary.resizeMode,
-              alignSelf: 'center',
-              marginBottom: 20,
-            }}
-          />
+          <Image source={Assets.img.logoSecondary.src} style={style.image} />
           {biometricsEnrollmentChange ? (
             <>
               <Text style={[TextTheme.normal, { alignSelf: 'center', textAlign: 'center' }]}>
diff --git a/packages/legacy/core/App/screens/Preface.tsx b/packages/legacy/core/App/screens/Preface.tsx
index 94f048718c..5b10c406a5 100644
--- a/packages/legacy/core/App/screens/Preface.tsx
+++ b/packages/legacy/core/App/screens/Preface.tsx
@@ -55,7 +55,7 @@ const Preface: React.FC = () => {
               checked={checked}
               onPress={() => setChecked(!checked)}
               reverse
-              titleStyle={{ fontWeight: 'bold' }}
+              titleStyle={{ fontWeight: TextTheme.bold.fontWeight }}
             />
             <View style={[{ paddingTop: 10 }]}>
               <Button
diff --git a/packages/legacy/core/App/screens/ProofDetails.tsx b/packages/legacy/core/App/screens/ProofDetails.tsx
index d6196c014b..9e32ec4efb 100644
--- a/packages/legacy/core/App/screens/ProofDetails.tsx
+++ b/packages/legacy/core/App/screens/ProofDetails.tsx
@@ -75,8 +75,7 @@ const VerifiedProof: React.FC<VerifiedProofProps> = ({
       alignItems: 'center',
     },
     headerTitle: {
-      ...TextTheme.normal,
-      fontWeight: 'bold',
+      ...TextTheme.bold,
     },
     headerDetails: {
       ...TextTheme.normal,
@@ -90,7 +89,7 @@ const VerifiedProof: React.FC<VerifiedProofProps> = ({
       color: TextTheme.normal.color,
     },
     label: {
-      fontWeight: 'bold',
+      fontWeight: TextTheme.bold.fontWeight,
     },
     content: {
       flexGrow: 1,
@@ -218,7 +217,7 @@ const UnverifiedProof: React.FC<UnverifiedProofProps> = ({ record, navigation })
     },
     headerTitle: {
       ...TextTheme.headingTwo,
-      fontWeight: 'normal',
+      fontWeight: TextTheme.normal.fontWeight,
     },
     footerButtons: {
       margin: 20,
diff --git a/packages/legacy/core/App/screens/ProofRequestAccept.tsx b/packages/legacy/core/App/screens/ProofRequestAccept.tsx
index 423cdaccf8..8ed1e354b7 100644
--- a/packages/legacy/core/App/screens/ProofRequestAccept.tsx
+++ b/packages/legacy/core/App/screens/ProofRequestAccept.tsx
@@ -39,7 +39,7 @@ const ProofRequestAccept: React.FC<ProofRequestAcceptProps> = ({ visible, proofI
       alignItems: 'center',
     },
     messageText: {
-      fontWeight: 'normal',
+      fontWeight: TextTheme.normal.fontWeight,
       textAlign: 'center',
       marginTop: 30,
     },
diff --git a/packages/legacy/core/App/screens/ProofRequestDetails.tsx b/packages/legacy/core/App/screens/ProofRequestDetails.tsx
index f2c9f79562..6a3e07c435 100644
--- a/packages/legacy/core/App/screens/ProofRequestDetails.tsx
+++ b/packages/legacy/core/App/screens/ProofRequestDetails.tsx
@@ -97,13 +97,11 @@ const ProofRequestAttributesCard: React.FC<ProofRequestAttributesCardParams> = (
     },
     schemaTitle: {
       ...ListItems.requestTemplateTitle,
-      fontWeight: 'bold',
       fontSize: 20,
       paddingVertical: 8,
     },
     attributeTitle: {
       ...ListItems.requestTemplateTitle,
-      fontWeight: 'bold',
       fontSize: 18,
       marginRight: 8,
     },
@@ -234,7 +232,7 @@ const ProofRequestDetails: React.FC<ProofRequestDetailsProps> = ({ route, naviga
     title: {
       color: TextTheme.title.color,
       fontSize: 28,
-      fontWeight: 'bold',
+      fontWeight: TextTheme.bold.fontWeight,
     },
     description: {
       marginTop: 10,
diff --git a/packages/legacy/core/App/screens/ProofRequesting.tsx b/packages/legacy/core/App/screens/ProofRequesting.tsx
index 5715903536..0ec09089be 100644
--- a/packages/legacy/core/App/screens/ProofRequesting.tsx
+++ b/packages/legacy/core/App/screens/ProofRequesting.tsx
@@ -61,7 +61,7 @@ const ProofRequesting: React.FC<ProofRequestingProps> = ({ route, navigation })
   }
 
   const { t } = useTranslation()
-  const { ColorPallet } = useTheme()
+  const { ColorPallet, TextTheme } = useTheme()
   const isFocused = useIsFocused()
   const [generating, setGenerating] = useState(true)
   const [message, setMessage] = useState<string | undefined>(undefined)
@@ -85,13 +85,12 @@ const ProofRequesting: React.FC<ProofRequestingProps> = ({ route, navigation })
       textAlign: 'center',
     },
     primaryHeaderText: {
-      fontWeight: 'bold',
-      fontSize: 28,
+      ...TextTheme.headerTitle,
       textAlign: 'center',
       color: ColorPallet.grayscale.black,
     },
     secondaryHeaderText: {
-      fontWeight: 'normal',
+      fontWeight: TextTheme.normal.fontWeight,
       fontSize: 20,
       textAlign: 'center',
       marginTop: 8,
@@ -104,7 +103,7 @@ const ProofRequesting: React.FC<ProofRequestingProps> = ({ route, navigation })
       backgroundColor: ColorPallet.grayscale.white,
       zIndex: 100,
       textAlign: 'center',
-      fontWeight: 'bold',
+      fontWeight: TextTheme.bold.fontWeight,
       fontSize: 22,
       color: ColorPallet.brand.primary,
     },
diff --git a/packages/legacy/core/App/screens/Settings.tsx b/packages/legacy/core/App/screens/Settings.tsx
index cff95b9dc2..cb1e5dbdcf 100644
--- a/packages/legacy/core/App/screens/Settings.tsx
+++ b/packages/legacy/core/App/screens/Settings.tsx
@@ -314,8 +314,8 @@ const Settings: React.FC<SettingsProps> = ({ navigation }) => {
         style={styles.sectionRow}
         onPress={onPress}
       >
-        <Text style={[TextTheme.headingFour, { fontWeight: 'normal', marginRight: 14 }]}>{title}</Text>
-        <Text style={[TextTheme.headingFour, { fontWeight: 'normal', color: ColorPallet.brand.link }]}>{value}</Text>
+        <Text style={[TextTheme.settingsText, { marginRight: 14 }]}>{title}</Text>
+        <Text style={[TextTheme.settingsText, { color: ColorPallet.brand.link }]}>{value}</Text>
       </TouchableOpacity>
     </ScrollView>
   )
diff --git a/packages/legacy/core/App/screens/Terms.tsx b/packages/legacy/core/App/screens/Terms.tsx
index b5c0e85897..537b82ca77 100644
--- a/packages/legacy/core/App/screens/Terms.tsx
+++ b/packages/legacy/core/App/screens/Terms.tsx
@@ -20,7 +20,7 @@ const Terms: React.FC = () => {
   const [checked, setChecked] = useState(false)
   const { t } = useTranslation()
   const navigation = useNavigation<StackNavigationProp<AuthenticateStackParams>>()
-  const { OnboardingTheme } = useTheme()
+  const { OnboardingTheme, TextTheme } = useTheme()
   const onSubmitPressed = () => {
     dispatch({
       type: DispatchAction.DID_AGREE_TO_TERMS,
@@ -59,7 +59,7 @@ const Terms: React.FC = () => {
       <ScrollView style={[style.container]}>
         <InfoTextBox>Please agree to the terms and conditions below before using this application.</InfoTextBox>
         <Text style={[style.bodyText, { marginTop: 20, marginBottom: 20 }]}>
-          <Text style={[style.bodyText, { fontWeight: 'bold' }]}>
+          <Text style={[style.bodyText, { fontWeight: TextTheme.bold.fontWeight }]}>
             Lorem ipsum dolor sit amet, consectetur adipiscing elit.
           </Text>{' '}
           Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud
diff --git a/packages/legacy/core/App/screens/UseBiometry.tsx b/packages/legacy/core/App/screens/UseBiometry.tsx
index e642457da8..9a7cd0e4c5 100644
--- a/packages/legacy/core/App/screens/UseBiometry.tsx
+++ b/packages/legacy/core/App/screens/UseBiometry.tsx
@@ -133,7 +133,7 @@ const UseBiometry: React.FC = () => {
             <Text></Text>
             <Text style={[TextTheme.normal]}>
               {t('Biometry.EnabledText2')}
-              <Text style={[TextTheme.normal, { fontWeight: 'bold' }]}> {t('Biometry.Warning')}</Text>
+              <Text style={[TextTheme.bold]}> {t('Biometry.Warning')}</Text>
             </Text>
           </View>
         ) : (
@@ -150,7 +150,7 @@ const UseBiometry: React.FC = () => {
           }}
         >
           <View style={{ flexShrink: 1, marginRight: 10, justifyContent: 'center' }}>
-            <Text style={[TextTheme.normal, { fontWeight: 'bold' }]}>{t('Biometry.UseToUnlock')}</Text>
+            <Text style={[TextTheme.bold]}>{t('Biometry.UseToUnlock')}</Text>
           </View>
           <View style={{ justifyContent: 'center' }}>
             <Pressable
diff --git a/packages/legacy/core/App/theme.ts b/packages/legacy/core/App/theme.ts
index 1840701959..786cc1070c 100644
--- a/packages/legacy/core/App/theme.ts
+++ b/packages/legacy/core/App/theme.ts
@@ -47,7 +47,7 @@ export interface IFontAttributes {
   fontFamily?: string
   fontStyle?: 'normal' | 'italic'
   fontSize: number
-  fontWeight: 'normal' | 'bold' | '100' | '200' | '300' | '400' | '500' | '600' | '700' | '800' | '900'
+  fontWeight?: 'normal' | 'bold' | '100' | '200' | '300' | '400' | '500' | '600' | '700' | '800' | '900'
   color: string
 }
 
@@ -78,6 +78,7 @@ export interface ITextTheme {
   headingThree: IFontAttributes
   headingFour: IFontAttributes
   normal: IFontAttributes
+  bold: IFontAttributes
   label: IFontAttributes
   labelTitle: IFontAttributes
   labelSubtitle: IFontAttributes
@@ -90,6 +91,7 @@ export interface ITextTheme {
   popupModalText: IFontAttributes
   modalHeadingOne: IFontAttributes
   modalHeadingThree: IFontAttributes
+  settingsText: IFontAttributes
 }
 
 export interface IBrandColors {
@@ -267,6 +269,11 @@ export const TextTheme: ITextTheme = {
     fontWeight: 'normal',
     color: ColorPallet.brand.text,
   },
+  bold: {
+    fontSize: 18,
+    fontWeight: 'bold',
+    color: ColorPallet.brand.text,
+  },
   label: {
     fontSize: 14,
     fontWeight: 'bold',
@@ -328,6 +335,11 @@ export const TextTheme: ITextTheme = {
     fontWeight: 'normal',
     color: ColorPallet.grayscale.white,
   },
+  settingsText: {
+    fontSize: 21,
+    fontWeight: 'normal',
+    color: ColorPallet.brand.text,
+  },
 }
 
 export const Inputs: IInputs = StyleSheet.create({
@@ -382,14 +394,12 @@ export const Buttons = StyleSheet.create({
     backgroundColor: ColorPallet.brand.primaryDisabled,
   },
   primaryText: {
-    ...TextTheme.normal,
+    ...TextTheme.bold,
     color: ColorPallet.brand.buttonText,
-    fontWeight: 'bold',
     textAlign: 'center',
   },
   primaryTextDisabled: {
-    ...TextTheme.normal,
-    fontWeight: 'bold',
+    ...TextTheme.bold,
     textAlign: 'center',
   },
   secondary: {
@@ -405,14 +415,12 @@ export const Buttons = StyleSheet.create({
     borderColor: ColorPallet.brand.secondaryDisabled,
   },
   secondaryText: {
-    ...TextTheme.normal,
-    fontWeight: 'bold',
+    ...TextTheme.bold,
     color: ColorPallet.brand.primary,
     textAlign: 'center',
   },
   secondaryTextDisabled: {
-    ...TextTheme.normal,
-    fontWeight: 'bold',
+    ...TextTheme.bold,
     color: ColorPallet.brand.secondaryDisabled,
     textAlign: 'center',
   },
@@ -427,8 +435,7 @@ export const Buttons = StyleSheet.create({
     backgroundColor: ColorPallet.brand.modalPrimary,
   },
   modalPrimaryText: {
-    ...TextTheme.normal,
-    fontWeight: 'bold',
+    ...TextTheme.bold,
     textAlign: 'center',
   },
   modalSecondary: {
@@ -438,8 +445,7 @@ export const Buttons = StyleSheet.create({
     borderColor: ColorPallet.brand.modalPrimary,
   },
   modalSecondaryText: {
-    ...TextTheme.normal,
-    fontWeight: 'bold',
+    ...TextTheme.bold,
     color: ColorPallet.brand.modalPrimary,
     textAlign: 'center',
   },
@@ -460,6 +466,7 @@ export const ListItems = StyleSheet.create({
   },
   credentialOfferTitle: {
     ...TextTheme.modalHeadingThree,
+    fontWeight: 'normal',
   },
   credentialOfferDetails: {
     ...TextTheme.normal,
@@ -488,7 +495,7 @@ export const ListItems = StyleSheet.create({
     color: ColorPallet.grayscale.white,
   },
   recordAttributeLabel: {
-    ...TextTheme.normal,
+    ...TextTheme.bold,
   },
   recordContainer: {
     backgroundColor: ColorPallet.brand.secondaryBackground,
@@ -565,8 +572,7 @@ export const TabTheme = {
   tabBarActiveTintColor: ColorPallet.brand.primary,
   tabBarInactiveTintColor: ColorPallet.brand.tabBarInactive,
   tabBarTextStyle: {
-    ...TextTheme.label,
-    fontWeight: 'normal',
+    ...TextTheme.labelSubtitle,
     paddingBottom: 5,
   },
   tabBarButtonIconStyle: {
@@ -666,18 +672,16 @@ export const ChatTheme = {
     fontSize: TextTheme.normal.fontSize,
   },
   leftTextHighlighted: {
+    ...TextTheme.bold,
     color: ColorPallet.brand.secondary,
-    fontSize: TextTheme.normal.fontSize,
-    fontWeight: 'bold',
   },
   rightText: {
     color: ColorPallet.brand.secondary,
     fontSize: TextTheme.normal.fontSize,
   },
   rightTextHighlighted: {
+    ...TextTheme.bold,
     color: ColorPallet.brand.secondary,
-    fontSize: TextTheme.normal.fontSize,
-    fontWeight: 'bold',
   },
   inputToolbar: {
     backgroundColor: ColorPallet.brand.secondary,
@@ -746,6 +750,8 @@ export const OnboardingTheme = {
   },
   pagerNavigationButton: {
     color: ColorPallet.brand.primary,
+    fontWeight: 'bold',
+    fontSize: 18,
   },
   headerTintColor: ColorPallet.grayscale.white,
   headerText: {
@@ -780,7 +786,12 @@ export const DialogTheme = {
 const LoadingTheme = {
   backgroundColor: ColorPallet.brand.modalPrimaryBackground,
 }
-
+const PINEnterTheme = {
+  image: {
+    alignSelf: 'center',
+    marginBottom: 20,
+  },
+}
 const PINInputTheme = {
   cell: {
     backgroundColor: ColorPallet.brand.secondaryBackground,
@@ -852,6 +863,7 @@ export interface ITheme {
   OnboardingTheme: any
   DialogTheme: any
   LoadingTheme: any
+  PINEnterTheme: any
   PINInputTheme: any
   heavyOpacity: any
   borderRadius: any
@@ -873,6 +885,7 @@ export const theme: ITheme = {
   OnboardingTheme,
   DialogTheme,
   LoadingTheme,
+  PINEnterTheme,
   PINInputTheme,
   heavyOpacity,
   borderRadius,
diff --git a/packages/legacy/core/__tests__/components/__snapshots__/RecordField.test.tsx.snap b/packages/legacy/core/__tests__/components/__snapshots__/RecordField.test.tsx.snap
index e90dfb26fa..040a705e74 100644
--- a/packages/legacy/core/__tests__/components/__snapshots__/RecordField.test.tsx.snap
+++ b/packages/legacy/core/__tests__/components/__snapshots__/RecordField.test.tsx.snap
@@ -25,9 +25,6 @@ exports[`Record Field Component Shown binary field should render a binary field
           Object {
             "color": "#FFFFFF",
             "fontSize": 18,
-            "fontWeight": "normal",
-          },
-          Object {
             "fontWeight": "bold",
           },
         ]
@@ -152,9 +149,6 @@ exports[`Record Field Component Shown date field should render a date field 1`]
           Object {
             "color": "#FFFFFF",
             "fontSize": 18,
-            "fontWeight": "normal",
-          },
-          Object {
             "fontWeight": "bold",
           },
         ]
diff --git a/packages/legacy/core/__tests__/screens/__snapshots__/CredentialOffer.test.tsx.snap b/packages/legacy/core/__tests__/screens/__snapshots__/CredentialOffer.test.tsx.snap
index 56ce5608ca..b8c82d36cc 100644
--- a/packages/legacy/core/__tests__/screens/__snapshots__/CredentialOffer.test.tsx.snap
+++ b/packages/legacy/core/__tests__/screens/__snapshots__/CredentialOffer.test.tsx.snap
@@ -406,13 +406,12 @@ exports[`displays a credential offer screen accepting a credential 1`] = `
                               Object {
                                 "color": "#FFFFFF",
                                 "fontSize": 18,
-                                "fontWeight": "normal",
+                                "fontWeight": "bold",
                               },
                               Object {
                                 "alignSelf": "center",
                                 "color": "#000",
                                 "fontSize": 45,
-                                "fontWeight": "bold",
                               },
                             ]
                           }
@@ -476,7 +475,7 @@ exports[`displays a credential offer screen accepting a credential 1`] = `
                                   Object {
                                     "color": "#FFFFFF",
                                     "fontSize": 18,
-                                    "fontWeight": "normal",
+                                    "fontWeight": "bold",
                                   },
                                   Object {
                                     "color": "#FFFFFF",
@@ -486,7 +485,6 @@ exports[`displays a credential offer screen accepting a credential 1`] = `
                                     "color": "#FFFFFF",
                                     "flex": 1,
                                     "flexWrap": "wrap",
-                                    "fontWeight": "bold",
                                     "lineHeight": 24,
                                   },
                                 ]
@@ -609,9 +607,6 @@ exports[`displays a credential offer screen accepting a credential 1`] = `
                   Object {
                     "color": "#FFFFFF",
                     "fontSize": 18,
-                    "fontWeight": "normal",
-                  },
-                  Object {
                     "fontWeight": "bold",
                   },
                 ]
@@ -697,9 +692,6 @@ exports[`displays a credential offer screen accepting a credential 1`] = `
                   Object {
                     "color": "#FFFFFF",
                     "fontSize": 18,
-                    "fontWeight": "normal",
-                  },
-                  Object {
                     "fontWeight": "bold",
                   },
                 ]
@@ -785,9 +777,6 @@ exports[`displays a credential offer screen accepting a credential 1`] = `
                   Object {
                     "color": "#FFFFFF",
                     "fontSize": 18,
-                    "fontWeight": "normal",
-                  },
-                  Object {
                     "fontWeight": "bold",
                   },
                 ]
@@ -873,9 +862,6 @@ exports[`displays a credential offer screen accepting a credential 1`] = `
                   Object {
                     "color": "#FFFFFF",
                     "fontSize": 18,
-                    "fontWeight": "normal",
-                  },
-                  Object {
                     "fontWeight": "bold",
                   },
                 ]
@@ -961,9 +947,6 @@ exports[`displays a credential offer screen accepting a credential 1`] = `
                   Object {
                     "color": "#FFFFFF",
                     "fontSize": 18,
-                    "fontWeight": "normal",
-                  },
-                  Object {
                     "fontWeight": "bold",
                   },
                 ]
@@ -1241,10 +1224,9 @@ exports[`displays a credential offer screen accepting a credential 1`] = `
                   Object {
                     "color": "#FFFFFF",
                     "fontSize": 26,
-                    "fontWeight": "bold",
+                    "fontWeight": "normal",
                   },
                   Object {
-                    "fontWeight": "normal",
                     "marginTop": 30,
                     "textAlign": "center",
                   },
@@ -1832,13 +1814,12 @@ exports[`displays a credential offer screen declining a credential 1`] = `
                               Object {
                                 "color": "#FFFFFF",
                                 "fontSize": 18,
-                                "fontWeight": "normal",
+                                "fontWeight": "bold",
                               },
                               Object {
                                 "alignSelf": "center",
                                 "color": "#000",
                                 "fontSize": 45,
-                                "fontWeight": "bold",
                               },
                             ]
                           }
@@ -1902,7 +1883,7 @@ exports[`displays a credential offer screen declining a credential 1`] = `
                                   Object {
                                     "color": "#FFFFFF",
                                     "fontSize": 18,
-                                    "fontWeight": "normal",
+                                    "fontWeight": "bold",
                                   },
                                   Object {
                                     "color": "#FFFFFF",
@@ -1912,7 +1893,6 @@ exports[`displays a credential offer screen declining a credential 1`] = `
                                     "color": "#FFFFFF",
                                     "flex": 1,
                                     "flexWrap": "wrap",
-                                    "fontWeight": "bold",
                                     "lineHeight": 24,
                                   },
                                 ]
@@ -2035,9 +2015,6 @@ exports[`displays a credential offer screen declining a credential 1`] = `
                   Object {
                     "color": "#FFFFFF",
                     "fontSize": 18,
-                    "fontWeight": "normal",
-                  },
-                  Object {
                     "fontWeight": "bold",
                   },
                 ]
@@ -2123,9 +2100,6 @@ exports[`displays a credential offer screen declining a credential 1`] = `
                   Object {
                     "color": "#FFFFFF",
                     "fontSize": 18,
-                    "fontWeight": "normal",
-                  },
-                  Object {
                     "fontWeight": "bold",
                   },
                 ]
@@ -2211,9 +2185,6 @@ exports[`displays a credential offer screen declining a credential 1`] = `
                   Object {
                     "color": "#FFFFFF",
                     "fontSize": 18,
-                    "fontWeight": "normal",
-                  },
-                  Object {
                     "fontWeight": "bold",
                   },
                 ]
@@ -2299,9 +2270,6 @@ exports[`displays a credential offer screen declining a credential 1`] = `
                   Object {
                     "color": "#FFFFFF",
                     "fontSize": 18,
-                    "fontWeight": "normal",
-                  },
-                  Object {
                     "fontWeight": "bold",
                   },
                 ]
@@ -2387,9 +2355,6 @@ exports[`displays a credential offer screen declining a credential 1`] = `
                   Object {
                     "color": "#FFFFFF",
                     "fontSize": 18,
-                    "fontWeight": "normal",
-                  },
-                  Object {
                     "fontWeight": "bold",
                   },
                 ]
@@ -3474,13 +3439,12 @@ exports[`displays a credential offer screen renders correctly 1`] = `
                               Object {
                                 "color": "#FFFFFF",
                                 "fontSize": 18,
-                                "fontWeight": "normal",
+                                "fontWeight": "bold",
                               },
                               Object {
                                 "alignSelf": "center",
                                 "color": "#000",
                                 "fontSize": 45,
-                                "fontWeight": "bold",
                               },
                             ]
                           }
@@ -3544,7 +3508,7 @@ exports[`displays a credential offer screen renders correctly 1`] = `
                                   Object {
                                     "color": "#FFFFFF",
                                     "fontSize": 18,
-                                    "fontWeight": "normal",
+                                    "fontWeight": "bold",
                                   },
                                   Object {
                                     "color": "#FFFFFF",
@@ -3554,7 +3518,6 @@ exports[`displays a credential offer screen renders correctly 1`] = `
                                     "color": "#FFFFFF",
                                     "flex": 1,
                                     "flexWrap": "wrap",
-                                    "fontWeight": "bold",
                                     "lineHeight": 24,
                                   },
                                 ]
@@ -3677,9 +3640,6 @@ exports[`displays a credential offer screen renders correctly 1`] = `
                   Object {
                     "color": "#FFFFFF",
                     "fontSize": 18,
-                    "fontWeight": "normal",
-                  },
-                  Object {
                     "fontWeight": "bold",
                   },
                 ]
@@ -3765,9 +3725,6 @@ exports[`displays a credential offer screen renders correctly 1`] = `
                   Object {
                     "color": "#FFFFFF",
                     "fontSize": 18,
-                    "fontWeight": "normal",
-                  },
-                  Object {
                     "fontWeight": "bold",
                   },
                 ]
@@ -3853,9 +3810,6 @@ exports[`displays a credential offer screen renders correctly 1`] = `
                   Object {
                     "color": "#FFFFFF",
                     "fontSize": 18,
-                    "fontWeight": "normal",
-                  },
-                  Object {
                     "fontWeight": "bold",
                   },
                 ]
@@ -3941,9 +3895,6 @@ exports[`displays a credential offer screen renders correctly 1`] = `
                   Object {
                     "color": "#FFFFFF",
                     "fontSize": 18,
-                    "fontWeight": "normal",
-                  },
-                  Object {
                     "fontWeight": "bold",
                   },
                 ]
@@ -4029,9 +3980,6 @@ exports[`displays a credential offer screen renders correctly 1`] = `
                   Object {
                     "color": "#FFFFFF",
                     "fontSize": 18,
-                    "fontWeight": "normal",
-                  },
-                  Object {
                     "fontWeight": "bold",
                   },
                 ]
diff --git a/packages/legacy/core/__tests__/screens/__snapshots__/CredentialOfferAccept.test.tsx.snap b/packages/legacy/core/__tests__/screens/__snapshots__/CredentialOfferAccept.test.tsx.snap
index 5c91e73049..6169c75c8e 100644
--- a/packages/legacy/core/__tests__/screens/__snapshots__/CredentialOfferAccept.test.tsx.snap
+++ b/packages/legacy/core/__tests__/screens/__snapshots__/CredentialOfferAccept.test.tsx.snap
@@ -41,10 +41,9 @@ exports[`displays a credential accept screen renders correctly 1`] = `
                 Object {
                   "color": "#FFFFFF",
                   "fontSize": 26,
-                  "fontWeight": "bold",
+                  "fontWeight": "normal",
                 },
                 Object {
-                  "fontWeight": "normal",
                   "marginTop": 30,
                   "textAlign": "center",
                 },
@@ -260,10 +259,9 @@ exports[`displays a credential accept screen transitions to offer accepted 1`] =
                 Object {
                   "color": "#FFFFFF",
                   "fontSize": 26,
-                  "fontWeight": "bold",
+                  "fontWeight": "normal",
                 },
                 Object {
-                  "fontWeight": "normal",
                   "marginTop": 30,
                   "textAlign": "center",
                 },
@@ -495,10 +493,9 @@ exports[`displays a credential accept screen transitions to taking too delay mes
                 Object {
                   "color": "#FFFFFF",
                   "fontSize": 26,
-                  "fontWeight": "bold",
+                  "fontWeight": "normal",
                 },
                 Object {
-                  "fontWeight": "normal",
                   "marginTop": 30,
                   "textAlign": "center",
                 },
diff --git a/packages/legacy/core/__tests__/screens/__snapshots__/ProofDetails.test.tsx.snap b/packages/legacy/core/__tests__/screens/__snapshots__/ProofDetails.test.tsx.snap
index 5e5a84a225..05c7121398 100644
--- a/packages/legacy/core/__tests__/screens/__snapshots__/ProofDetails.test.tsx.snap
+++ b/packages/legacy/core/__tests__/screens/__snapshots__/ProofDetails.test.tsx.snap
@@ -382,13 +382,12 @@ exports[`ProofDetails Component with a verified proof record renders correctly w
                         Object {
                           "color": "#FFFFFF",
                           "fontSize": 18,
-                          "fontWeight": "normal",
+                          "fontWeight": "bold",
                         },
                         Object {
                           "alignSelf": "center",
                           "color": "#000000",
                           "fontSize": 45,
-                          "fontWeight": "bold",
                         },
                       ]
                     }
@@ -763,13 +762,12 @@ exports[`ProofDetails Component with a verified proof record renders correctly w
                         Object {
                           "color": "#FFFFFF",
                           "fontSize": 18,
-                          "fontWeight": "normal",
+                          "fontWeight": "bold",
                         },
                         Object {
                           "alignSelf": "center",
                           "color": "#000000",
                           "fontSize": 45,
-                          "fontWeight": "bold",
                         },
                       ]
                     }
diff --git a/packages/legacy/core/__tests__/screens/__snapshots__/Settings.test.tsx.snap b/packages/legacy/core/__tests__/screens/__snapshots__/Settings.test.tsx.snap
index 2cb1e5805c..fd00c283ba 100644
--- a/packages/legacy/core/__tests__/screens/__snapshots__/Settings.test.tsx.snap
+++ b/packages/legacy/core/__tests__/screens/__snapshots__/Settings.test.tsx.snap
@@ -254,10 +254,9 @@ exports[`Settings Screen Renders correctly 1`] = `
                       Object {
                         "color": "#FFFFFF",
                         "fontSize": 21,
-                        "fontWeight": "bold",
+                        "fontWeight": "normal",
                       },
                       Object {
-                        "fontWeight": "normal",
                         "marginRight": 14,
                       },
                     ]
@@ -271,11 +270,10 @@ exports[`Settings Screen Renders correctly 1`] = `
                       Object {
                         "color": "#FFFFFF",
                         "fontSize": 21,
-                        "fontWeight": "bold",
+                        "fontWeight": "normal",
                       },
                       Object {
                         "color": "#FFFFFF",
-                        "fontWeight": "normal",
                       },
                     ]
                   }
@@ -373,10 +371,9 @@ exports[`Settings Screen Renders correctly 1`] = `
                       Object {
                         "color": "#FFFFFF",
                         "fontSize": 21,
-                        "fontWeight": "bold",
+                        "fontWeight": "normal",
                       },
                       Object {
-                        "fontWeight": "normal",
                         "marginRight": 14,
                       },
                     ]
@@ -390,11 +387,10 @@ exports[`Settings Screen Renders correctly 1`] = `
                       Object {
                         "color": "#FFFFFF",
                         "fontSize": 21,
-                        "fontWeight": "bold",
+                        "fontWeight": "normal",
                       },
                       Object {
                         "color": "#FFFFFF",
-                        "fontWeight": "normal",
                       },
                     ]
                   }
@@ -564,10 +560,9 @@ exports[`Settings Screen Renders correctly 1`] = `
                       Object {
                         "color": "#FFFFFF",
                         "fontSize": 21,
-                        "fontWeight": "bold",
+                        "fontWeight": "normal",
                       },
                       Object {
-                        "fontWeight": "normal",
                         "marginRight": 14,
                       },
                     ]
@@ -581,11 +576,10 @@ exports[`Settings Screen Renders correctly 1`] = `
                       Object {
                         "color": "#FFFFFF",
                         "fontSize": 21,
-                        "fontWeight": "bold",
+                        "fontWeight": "normal",
                       },
                       Object {
                         "color": "#FFFFFF",
-                        "fontWeight": "normal",
                       },
                     ]
                   }
@@ -685,10 +679,9 @@ exports[`Settings Screen Renders correctly 1`] = `
                       Object {
                         "color": "#FFFFFF",
                         "fontSize": 21,
-                        "fontWeight": "bold",
+                        "fontWeight": "normal",
                       },
                       Object {
-                        "fontWeight": "normal",
                         "marginRight": 14,
                       },
                     ]
@@ -702,11 +695,10 @@ exports[`Settings Screen Renders correctly 1`] = `
                       Object {
                         "color": "#FFFFFF",
                         "fontSize": 21,
-                        "fontWeight": "bold",
+                        "fontWeight": "normal",
                       },
                       Object {
                         "color": "#FFFFFF",
-                        "fontWeight": "normal",
                       },
                     ]
                   }
@@ -804,10 +796,9 @@ exports[`Settings Screen Renders correctly 1`] = `
                       Object {
                         "color": "#FFFFFF",
                         "fontSize": 21,
-                        "fontWeight": "bold",
+                        "fontWeight": "normal",
                       },
                       Object {
-                        "fontWeight": "normal",
                         "marginRight": 14,
                       },
                     ]
@@ -821,11 +812,10 @@ exports[`Settings Screen Renders correctly 1`] = `
                       Object {
                         "color": "#FFFFFF",
                         "fontSize": 21,
-                        "fontWeight": "bold",
+                        "fontWeight": "normal",
                       },
                       Object {
                         "color": "#FFFFFF",
-                        "fontWeight": "normal",
                       },
                     ]
                   }
@@ -925,10 +915,9 @@ exports[`Settings Screen Renders correctly 1`] = `
                       Object {
                         "color": "#FFFFFF",
                         "fontSize": 21,
-                        "fontWeight": "bold",
+                        "fontWeight": "normal",
                       },
                       Object {
-                        "fontWeight": "normal",
                         "marginRight": 14,
                       },
                     ]
@@ -942,11 +931,10 @@ exports[`Settings Screen Renders correctly 1`] = `
                       Object {
                         "color": "#FFFFFF",
                         "fontSize": 21,
-                        "fontWeight": "bold",
+                        "fontWeight": "normal",
                       },
                       Object {
                         "color": "#FFFFFF",
-                        "fontWeight": "normal",
                       },
                     ]
                   }
diff --git a/packages/legacy/core/__tests__/screens/__snapshots__/UseBiometry.test.tsx.snap b/packages/legacy/core/__tests__/screens/__snapshots__/UseBiometry.test.tsx.snap
index e91e92c8be..8928de276e 100644
--- a/packages/legacy/core/__tests__/screens/__snapshots__/UseBiometry.test.tsx.snap
+++ b/packages/legacy/core/__tests__/screens/__snapshots__/UseBiometry.test.tsx.snap
@@ -72,9 +72,6 @@ exports[`UseBiometry Screen Renders correctly when biometry available 1`] = `
                 Object {
                   "color": "#FFFFFF",
                   "fontSize": 18,
-                  "fontWeight": "normal",
-                },
-                Object {
                   "fontWeight": "bold",
                 },
               ]
@@ -108,9 +105,6 @@ exports[`UseBiometry Screen Renders correctly when biometry available 1`] = `
                 Object {
                   "color": "#FFFFFF",
                   "fontSize": 18,
-                  "fontWeight": "normal",
-                },
-                Object {
                   "fontWeight": "bold",
                 },
               ]
@@ -370,9 +364,6 @@ exports[`UseBiometry Screen Renders correctly when biometry not available 1`] =
                 Object {
                   "color": "#FFFFFF",
                   "fontSize": 18,
-                  "fontWeight": "normal",
-                },
-                Object {
                   "fontWeight": "bold",
                 },
               ]
@@ -613,9 +604,6 @@ exports[`UseBiometry Screen Toggles use biometrics ok 1`] = `
                 Object {
                   "color": "#FFFFFF",
                   "fontSize": 18,
-                  "fontWeight": "normal",
-                },
-                Object {
                   "fontWeight": "bold",
                 },
               ]
@@ -649,9 +637,6 @@ exports[`UseBiometry Screen Toggles use biometrics ok 1`] = `
                 Object {
                   "color": "#FFFFFF",
                   "fontSize": 18,
-                  "fontWeight": "normal",
-                },
-                Object {
                   "fontWeight": "bold",
                 },
               ]