diff --git a/src/locale/locales/an/messages.po b/src/locale/locales/an/messages.po
index a6f7e4c37c..1d70027617 100644
--- a/src/locale/locales/an/messages.po
+++ b/src/locale/locales/an/messages.po
@@ -6417,7 +6417,7 @@ msgstr "Salir?"
 #: src/view/shell/bottom-bar/BottomBarWeb.tsx:205
 #: src/view/shell/NavSignupCard.tsx:47
 #: src/view/shell/NavSignupCard.tsx:52
-msgid "Sign up"
+msgid "Create account"
 msgstr "Crear cuenta"
 
 #: src/components/moderation/ScreenHider.tsx:91
diff --git a/src/locale/locales/ast/messages.po b/src/locale/locales/ast/messages.po
index 8a36570116..618323b46d 100644
--- a/src/locale/locales/ast/messages.po
+++ b/src/locale/locales/ast/messages.po
@@ -6861,7 +6861,7 @@ msgstr "¿Quies zarrar la sesión?"
 #: src/view/shell/bottom-bar/BottomBarWeb.tsx:205
 #: src/view/shell/NavSignupCard.tsx:47
 #: src/view/shell/NavSignupCard.tsx:52
-msgid "Sign up"
+msgid "Create account"
 msgstr "Rexistrase"
 
 #: src/components/moderation/ScreenHider.tsx:91
diff --git a/src/locale/locales/ca/messages.po b/src/locale/locales/ca/messages.po
index 7d5637145b..2714c869bc 100644
--- a/src/locale/locales/ca/messages.po
+++ b/src/locale/locales/ca/messages.po
@@ -8301,7 +8301,7 @@ msgstr "Tancar la sessió?"
 #: src/view/shell/bottom-bar/BottomBarWeb.tsx:205
 #: src/view/shell/NavSignupCard.tsx:47
 #: src/view/shell/NavSignupCard.tsx:52
-msgid "Sign up"
+msgid "Create account"
 msgstr "Registra't"
 
 #: src/view/shell/NavSignupCard.tsx:47
diff --git a/src/locale/locales/de/messages.po b/src/locale/locales/de/messages.po
index e82024923c..075f992878 100644
--- a/src/locale/locales/de/messages.po
+++ b/src/locale/locales/de/messages.po
@@ -7634,7 +7634,7 @@ msgstr ""
 #: src/view/shell/bottom-bar/BottomBarWeb.tsx:205
 #: src/view/shell/NavSignupCard.tsx:47
 #: src/view/shell/NavSignupCard.tsx:52
-msgid "Sign up"
+msgid "Create account"
 msgstr "Registrieren"
 
 #: src/view/shell/NavSignupCard.tsx:47
diff --git a/src/locale/locales/el/messages.po b/src/locale/locales/el/messages.po
index f34e2a6adf..dd2fc993f9 100644
--- a/src/locale/locales/el/messages.po
+++ b/src/locale/locales/el/messages.po
@@ -6430,7 +6430,7 @@ msgstr "Αποσύνδεση;"
 #: src/view/shell/bottom-bar/BottomBarWeb.tsx:205
 #: src/view/shell/NavSignupCard.tsx:47
 #: src/view/shell/NavSignupCard.tsx:52
-msgid "Sign up"
+msgid "Create account"
 msgstr "Εγγραφή"
 
 #: src/components/moderation/ScreenHider.tsx:91
diff --git a/src/locale/locales/en-GB/messages.po b/src/locale/locales/en-GB/messages.po
index c4a1cfc135..ec700fad51 100644
--- a/src/locale/locales/en-GB/messages.po
+++ b/src/locale/locales/en-GB/messages.po
@@ -6861,7 +6861,7 @@ msgstr ""
 #: src/view/shell/bottom-bar/BottomBarWeb.tsx:205
 #: src/view/shell/NavSignupCard.tsx:47
 #: src/view/shell/NavSignupCard.tsx:52
-msgid "Sign up"
+msgid "Create account"
 msgstr ""
 
 #: src/components/moderation/ScreenHider.tsx:91
diff --git a/src/locale/locales/en/messages.po b/src/locale/locales/en/messages.po
index 9e74e96a01..1fdaf369f7 100644
--- a/src/locale/locales/en/messages.po
+++ b/src/locale/locales/en/messages.po
@@ -6861,7 +6861,7 @@ msgstr ""
 #: src/view/shell/bottom-bar/BottomBarWeb.tsx:205
 #: src/view/shell/NavSignupCard.tsx:47
 #: src/view/shell/NavSignupCard.tsx:52
-msgid "Sign up"
+msgid "Create account"
 msgstr ""
 
 #: src/components/moderation/ScreenHider.tsx:91
diff --git a/src/locale/locales/es/messages.po b/src/locale/locales/es/messages.po
index f9c5b2183f..16a6a7da7d 100644
--- a/src/locale/locales/es/messages.po
+++ b/src/locale/locales/es/messages.po
@@ -7569,7 +7569,7 @@ msgstr "¿Cerrar sesión?"
 #: src/view/shell/bottom-bar/BottomBarWeb.tsx:205
 #: src/view/shell/NavSignupCard.tsx:47
 #: src/view/shell/NavSignupCard.tsx:52
-msgid "Sign up"
+msgid "Create account"
 msgstr "Crear cuenta"
 
 #: src/view/shell/NavSignupCard.tsx:47
diff --git a/src/locale/locales/fi/messages.po b/src/locale/locales/fi/messages.po
index e9abd7e5f5..357c30d6cc 100644
--- a/src/locale/locales/fi/messages.po
+++ b/src/locale/locales/fi/messages.po
@@ -6282,7 +6282,7 @@ msgstr "Kirjaudutaanko ulos?"
 #: src/view/shell/bottom-bar/BottomBarWeb.tsx:205
 #: src/view/shell/NavSignupCard.tsx:47
 #: src/view/shell/NavSignupCard.tsx:52
-msgid "Sign up"
+msgid "Create account"
 msgstr "Rekisteröidy"
 
 #: src/components/moderation/ScreenHider.tsx:91
diff --git a/src/locale/locales/fr/messages.po b/src/locale/locales/fr/messages.po
index a50ea951be..305e675019 100644
--- a/src/locale/locales/fr/messages.po
+++ b/src/locale/locales/fr/messages.po
@@ -6282,7 +6282,7 @@ msgstr "Se déconnecter ?"
 #: src/view/shell/bottom-bar/BottomBarWeb.tsx:205
 #: src/view/shell/NavSignupCard.tsx:47
 #: src/view/shell/NavSignupCard.tsx:52
-msgid "Sign up"
+msgid "Create account"
 msgstr "S’inscrire"
 
 #: src/components/moderation/ScreenHider.tsx:91
diff --git a/src/locale/locales/ga/messages.po b/src/locale/locales/ga/messages.po
index 290ff6b86e..8ebc66f002 100644
--- a/src/locale/locales/ga/messages.po
+++ b/src/locale/locales/ga/messages.po
@@ -6860,7 +6860,7 @@ msgstr "Logáil amach?"
 #: src/view/shell/bottom-bar/BottomBarWeb.tsx:205
 #: src/view/shell/NavSignupCard.tsx:47
 #: src/view/shell/NavSignupCard.tsx:52
-msgid "Sign up"
+msgid "Create account"
 msgstr "Cláraigh"
 
 #: src/components/moderation/ScreenHider.tsx:91
diff --git a/src/locale/locales/gl/messages.po b/src/locale/locales/gl/messages.po
index 6c1eec5ccf..640fa15ed9 100644
--- a/src/locale/locales/gl/messages.po
+++ b/src/locale/locales/gl/messages.po
@@ -7574,7 +7574,7 @@ msgstr ""
 #: src/view/shell/bottom-bar/BottomBarWeb.tsx:205
 #: src/view/shell/NavSignupCard.tsx:47
 #: src/view/shell/NavSignupCard.tsx:52
-msgid "Sign up"
+msgid "Create account"
 msgstr "Crear conta"
 
 #: src/view/shell/NavSignupCard.tsx:47
diff --git a/src/locale/locales/hi/messages.po b/src/locale/locales/hi/messages.po
index e2143e6564..71924e641a 100644
--- a/src/locale/locales/hi/messages.po
+++ b/src/locale/locales/hi/messages.po
@@ -7248,7 +7248,7 @@ msgstr "साइन आउट करें?"
 #: src/view/shell/bottom-bar/BottomBarWeb.tsx:205
 #: src/view/shell/NavSignupCard.tsx:47
 #: src/view/shell/NavSignupCard.tsx:52
-msgid "Sign up"
+msgid "Create account"
 msgstr "साइन अप करें"
 
 #: src/components/moderation/ScreenHider.tsx:91
diff --git a/src/locale/locales/hu/messages.po b/src/locale/locales/hu/messages.po
index 17ba73508b..b383057aaa 100644
--- a/src/locale/locales/hu/messages.po
+++ b/src/locale/locales/hu/messages.po
@@ -6725,7 +6725,7 @@ msgstr "Kijelentkezés"
 #: src/view/shell/bottom-bar/BottomBarWeb.tsx:205
 #: src/view/shell/NavSignupCard.tsx:47
 #: src/view/shell/NavSignupCard.tsx:52
-msgid "Sign up"
+msgid "Create account"
 msgstr "Regisztráció"
 
 #~ msgid "Sign up or sign in to join the conversation"
diff --git a/src/locale/locales/id/messages.po b/src/locale/locales/id/messages.po
index 6ff6feba49..b702a44344 100644
--- a/src/locale/locales/id/messages.po
+++ b/src/locale/locales/id/messages.po
@@ -7717,7 +7717,7 @@ msgstr ""
 #: src/view/shell/bottom-bar/BottomBarWeb.tsx:205
 #: src/view/shell/NavSignupCard.tsx:47
 #: src/view/shell/NavSignupCard.tsx:52
-msgid "Sign up"
+msgid "Create account"
 msgstr "Daftar"
 
 #: src/view/shell/NavSignupCard.tsx:47
diff --git a/src/locale/locales/it/messages.po b/src/locale/locales/it/messages.po
index bf98cc266c..09dd99d5e7 100644
--- a/src/locale/locales/it/messages.po
+++ b/src/locale/locales/it/messages.po
@@ -6288,7 +6288,7 @@ msgstr "Uscire?"
 #: src/view/shell/bottom-bar/BottomBarWeb.tsx:205
 #: src/view/shell/NavSignupCard.tsx:47
 #: src/view/shell/NavSignupCard.tsx:52
-msgid "Sign up"
+msgid "Create account"
 msgstr "Iscriviti"
 
 #: src/components/moderation/ScreenHider.tsx:91
diff --git a/src/locale/locales/ja/messages.po b/src/locale/locales/ja/messages.po
index 1a640d5e71..09f8f847c4 100644
--- a/src/locale/locales/ja/messages.po
+++ b/src/locale/locales/ja/messages.po
@@ -6282,7 +6282,7 @@ msgstr "サインアウトしますか？"
 #: src/view/shell/bottom-bar/BottomBarWeb.tsx:205
 #: src/view/shell/NavSignupCard.tsx:47
 #: src/view/shell/NavSignupCard.tsx:52
-msgid "Sign up"
+msgid "Create account"
 msgstr "サインアップ"
 
 #: src/components/moderation/ScreenHider.tsx:91
diff --git a/src/locale/locales/km/messages.po b/src/locale/locales/km/messages.po
index a0c29c33d1..ad89017cf0 100644
--- a/src/locale/locales/km/messages.po
+++ b/src/locale/locales/km/messages.po
@@ -6865,7 +6865,7 @@ msgstr "ចេញ?"
 #: src/view/shell/bottom-bar/BottomBarWeb.tsx:205
 #: src/view/shell/NavSignupCard.tsx:47
 #: src/view/shell/NavSignupCard.tsx:52
-msgid "Sign up"
+msgid "Create account"
 msgstr "ចុះឈ្មោះ"
 
 #: src/components/moderation/ScreenHider.tsx:91
diff --git a/src/locale/locales/ko/messages.po b/src/locale/locales/ko/messages.po
index 2c7e174b52..8df97cc5c9 100644
--- a/src/locale/locales/ko/messages.po
+++ b/src/locale/locales/ko/messages.po
@@ -6282,7 +6282,7 @@ msgstr "로그아웃하시겠습니까?"
 #: src/view/shell/bottom-bar/BottomBarWeb.tsx:205
 #: src/view/shell/NavSignupCard.tsx:47
 #: src/view/shell/NavSignupCard.tsx:52
-msgid "Sign up"
+msgid "Create account"
 msgstr "가입하기"
 
 #: src/components/moderation/ScreenHider.tsx:91
diff --git a/src/locale/locales/ne/messages.po b/src/locale/locales/ne/messages.po
index 6f16fe2ce4..ec0b4dc639 100644
--- a/src/locale/locales/ne/messages.po
+++ b/src/locale/locales/ne/messages.po
@@ -7252,7 +7252,7 @@ msgstr "साइन आउट गर्नुहोस्?"
 #: src/view/shell/bottom-bar/BottomBarWeb.tsx:205
 #: src/view/shell/NavSignupCard.tsx:47
 #: src/view/shell/NavSignupCard.tsx:52
-msgid "Sign up"
+msgid "Create account"
 msgstr "साइन अप गर्नुहोस्"
 
 #: src/components/moderation/ScreenHider.tsx:91
diff --git a/src/locale/locales/nl/messages.po b/src/locale/locales/nl/messages.po
index 6a61aa078a..67f24f88d1 100644
--- a/src/locale/locales/nl/messages.po
+++ b/src/locale/locales/nl/messages.po
@@ -6417,7 +6417,7 @@ msgstr "Afmelden?"
 #: src/view/shell/bottom-bar/BottomBarWeb.tsx:205
 #: src/view/shell/NavSignupCard.tsx:47
 #: src/view/shell/NavSignupCard.tsx:52
-msgid "Sign up"
+msgid "Create account"
 msgstr "Registreren"
 
 #: src/components/moderation/ScreenHider.tsx:91
diff --git a/src/locale/locales/pl/messages.po b/src/locale/locales/pl/messages.po
index 98c84cdb28..08ca5607c3 100644
--- a/src/locale/locales/pl/messages.po
+++ b/src/locale/locales/pl/messages.po
@@ -6433,7 +6433,7 @@ msgstr "Wylogować się?"
 #: src/view/shell/bottom-bar/BottomBarWeb.tsx:205
 #: src/view/shell/NavSignupCard.tsx:47
 #: src/view/shell/NavSignupCard.tsx:52
-msgid "Sign up"
+msgid "Create account"
 msgstr "Zarejestruj się"
 
 #: src/components/moderation/ScreenHider.tsx:91
diff --git a/src/locale/locales/pt-BR/messages.po b/src/locale/locales/pt-BR/messages.po
index 52c3b8cbd7..e0e645b6eb 100644
--- a/src/locale/locales/pt-BR/messages.po
+++ b/src/locale/locales/pt-BR/messages.po
@@ -7709,7 +7709,7 @@ msgstr "Sair?"
 #: src/view/shell/bottom-bar/BottomBarWeb.tsx:205
 #: src/view/shell/NavSignupCard.tsx:47
 #: src/view/shell/NavSignupCard.tsx:52
-msgid "Sign up"
+msgid "Create account"
 msgstr "Inscrever-se"
 
 #: src/view/shell/NavSignupCard.tsx:47
diff --git a/src/locale/locales/ro/messages.po b/src/locale/locales/ro/messages.po
index 1aa7a0143e..5624c9f6c6 100644
--- a/src/locale/locales/ro/messages.po
+++ b/src/locale/locales/ro/messages.po
@@ -6865,7 +6865,7 @@ msgstr "Deconectează-te?"
 #: src/view/shell/bottom-bar/BottomBarWeb.tsx:205
 #: src/view/shell/NavSignupCard.tsx:47
 #: src/view/shell/NavSignupCard.tsx:52
-msgid "Sign up"
+msgid "Create account"
 msgstr "Înscrie-te"
 
 #: src/components/moderation/ScreenHider.tsx:91
diff --git a/src/locale/locales/ru/messages.po b/src/locale/locales/ru/messages.po
index 8c30afb6af..e639eb5dd8 100644
--- a/src/locale/locales/ru/messages.po
+++ b/src/locale/locales/ru/messages.po
@@ -6314,7 +6314,7 @@ msgstr "Выйти?"
 #: src/view/shell/bottom-bar/BottomBarWeb.tsx:205
 #: src/view/shell/NavSignupCard.tsx:47
 #: src/view/shell/NavSignupCard.tsx:52
-msgid "Sign up"
+msgid "Create account"
 msgstr "Регистрация"
 
 #: src/components/moderation/ScreenHider.tsx:91
diff --git a/src/locale/locales/th/messages.po b/src/locale/locales/th/messages.po
index a96136e4bc..a5bde54470 100644
--- a/src/locale/locales/th/messages.po
+++ b/src/locale/locales/th/messages.po
@@ -7704,7 +7704,7 @@ msgstr ""
 #: src/view/shell/bottom-bar/BottomBarWeb.tsx:205
 #: src/view/shell/NavSignupCard.tsx:47
 #: src/view/shell/NavSignupCard.tsx:52
-msgid "Sign up"
+msgid "Create account"
 msgstr "สมัครสมาชิก"
 
 #: src/view/shell/NavSignupCard.tsx:47
diff --git a/src/locale/locales/tr/messages.po b/src/locale/locales/tr/messages.po
index 08c743d444..d8713e022e 100644
--- a/src/locale/locales/tr/messages.po
+++ b/src/locale/locales/tr/messages.po
@@ -8147,7 +8147,7 @@ msgstr "Çıkış yap?"
 #: src/view/shell/bottom-bar/BottomBarWeb.tsx:205
 #: src/view/shell/NavSignupCard.tsx:47
 #: src/view/shell/NavSignupCard.tsx:52
-msgid "Sign up"
+msgid "Create account"
 msgstr "Kaydol"
 
 #: src/view/shell/NavSignupCard.tsx:47
diff --git a/src/locale/locales/uk/messages.po b/src/locale/locales/uk/messages.po
index e2855c3644..44762daa03 100644
--- a/src/locale/locales/uk/messages.po
+++ b/src/locale/locales/uk/messages.po
@@ -7717,7 +7717,7 @@ msgstr ""
 #: src/view/shell/bottom-bar/BottomBarWeb.tsx:205
 #: src/view/shell/NavSignupCard.tsx:47
 #: src/view/shell/NavSignupCard.tsx:52
-msgid "Sign up"
+msgid "Create account"
 msgstr "Реєстрація"
 
 #: src/view/shell/NavSignupCard.tsx:47
diff --git a/src/locale/locales/vi/messages.po b/src/locale/locales/vi/messages.po
index 293991cdaf..8c3c235980 100644
--- a/src/locale/locales/vi/messages.po
+++ b/src/locale/locales/vi/messages.po
@@ -6409,7 +6409,7 @@ msgstr "Đăng xuất?"
 #: src/view/shell/bottom-bar/BottomBarWeb.tsx:205
 #: src/view/shell/NavSignupCard.tsx:47
 #: src/view/shell/NavSignupCard.tsx:52
-msgid "Sign up"
+msgid "Create account"
 msgstr "Đăng ký"
 
 #: src/components/moderation/ScreenHider.tsx:91
diff --git a/src/locale/locales/zh-CN/messages.po b/src/locale/locales/zh-CN/messages.po
index 76bb4d11a8..2900585b81 100644
--- a/src/locale/locales/zh-CN/messages.po
+++ b/src/locale/locales/zh-CN/messages.po
@@ -6287,7 +6287,7 @@ msgstr "确定要登出吗？"
 #: src/view/shell/bottom-bar/BottomBarWeb.tsx:205
 #: src/view/shell/NavSignupCard.tsx:47
 #: src/view/shell/NavSignupCard.tsx:52
-msgid "Sign up"
+msgid "Create account"
 msgstr "注册"
 
 #: src/components/moderation/ScreenHider.tsx:91
diff --git a/src/locale/locales/zh-HK/messages.po b/src/locale/locales/zh-HK/messages.po
index fd9059841a..b404da7ffa 100644
--- a/src/locale/locales/zh-HK/messages.po
+++ b/src/locale/locales/zh-HK/messages.po
@@ -6289,7 +6289,7 @@ msgstr "係咪要登出？"
 #: src/view/shell/bottom-bar/BottomBarWeb.tsx:205
 #: src/view/shell/NavSignupCard.tsx:47
 #: src/view/shell/NavSignupCard.tsx:52
-msgid "Sign up"
+msgid "Create account"
 msgstr "註冊"
 
 #: src/components/moderation/ScreenHider.tsx:91
diff --git a/src/locale/locales/zh-TW/messages.po b/src/locale/locales/zh-TW/messages.po
index 550fcd90c7..c90221c729 100644
--- a/src/locale/locales/zh-TW/messages.po
+++ b/src/locale/locales/zh-TW/messages.po
@@ -6287,7 +6287,7 @@ msgstr "確定要登出嗎？"
 #: src/view/shell/bottom-bar/BottomBarWeb.tsx:205
 #: src/view/shell/NavSignupCard.tsx:47
 #: src/view/shell/NavSignupCard.tsx:52
-msgid "Sign up"
+msgid "Create account"
 msgstr "註冊"
 
 #: src/components/moderation/ScreenHider.tsx:91
diff --git a/src/view/shell/NavSignupCard.tsx b/src/view/shell/NavSignupCard.tsx
index 63648db4cf..e32c24dc43 100644
--- a/src/view/shell/NavSignupCard.tsx
+++ b/src/view/shell/NavSignupCard.tsx
@@ -44,12 +44,12 @@ let NavSignupCard = ({}: {}): React.ReactNode => {
       <View style={[a.flex_row, a.flex_wrap, a.gap_sm, a.pt_md]}>
         <Button
           onPress={showCreateAccount}
-          label={_(msg`Sign up`)}
+          label={_(msg`Create account`)}
           size="small"
           variant="solid"
           color="primary">
           <ButtonText>
-            <Trans>Sign up</Trans>
+            <Trans>Create account</Trans>
           </ButtonText>
         </Button>
         <Button
diff --git a/src/view/shell/bottom-bar/BottomBar.tsx b/src/view/shell/bottom-bar/BottomBar.tsx
index f814468b51..4f3e790def 100644
--- a/src/view/shell/bottom-bar/BottomBar.tsx
+++ b/src/view/shell/bottom-bar/BottomBar.tsx
@@ -16,7 +16,6 @@ import {usePalette} from '#/lib/hooks/usePalette'
 import {clamp} from '#/lib/numbers'
 import {getTabState, TabState} from '#/lib/routes/helpers'
 import {useGate} from '#/lib/statsig/statsig'
-import {s} from '#/lib/styles'
 import {emitSoftReset} from '#/state/events'
 import {useHomeBadge} from '#/state/home-badge'
 import {useUnreadMessageCount} from '#/state/queries/messages/list-conversations'
@@ -26,12 +25,12 @@ import {useSession} from '#/state/session'
 import {useLoggedOutViewControls} from '#/state/shell/logged-out'
 import {useShellLayout} from '#/state/shell/shell-layout'
 import {useCloseAllActiveElements} from '#/state/util'
-import {Button} from '#/view/com/util/forms/Button'
 import {Text} from '#/view/com/util/text/Text'
 import {UserAvatar} from '#/view/com/util/UserAvatar'
 import {Logo} from '#/view/icons/Logo'
 import {Logotype} from '#/view/icons/Logotype'
 import {atoms as a} from '#/alf'
+import {Button, ButtonText} from '#/components/Button'
 import {useDialogControl} from '#/components/Dialog'
 import {SwitchAccountDialog} from '#/components/dialogs/SwitchAccount'
 import {
@@ -299,25 +298,26 @@ export function BottomBar({navigation}: BottomTabBarProps) {
                 </View>
               </View>
 
-              <View
-                style={{flexDirection: 'row', alignItems: 'center', gap: 4}}>
+              <View style={[a.flex_row, a.flex_wrap, a.gap_sm]}>
                 <Button
                   onPress={showCreateAccount}
-                  accessibilityHint={_(msg`Sign up`)}
-                  accessibilityLabel={_(msg`Sign up`)}>
-                  <Text type="md" style={[{color: 'white'}, s.bold]}>
-                    <Trans>Sign up</Trans>
-                  </Text>
+                  label={_(msg`Create account`)}
+                  size="small"
+                  variant="solid"
+                  color="primary">
+                  <ButtonText>
+                    <Trans>Create account</Trans>
+                  </ButtonText>
                 </Button>
-
                 <Button
-                  type="default"
                   onPress={showSignIn}
-                  accessibilityHint={_(msg`Sign in`)}
-                  accessibilityLabel={_(msg`Sign in`)}>
-                  <Text type="md" style={[pal.text, s.bold]}>
+                  label={_(msg`Sign in`)}
+                  size="small"
+                  variant="solid"
+                  color="secondary">
+                  <ButtonText>
                     <Trans>Sign in</Trans>
-                  </Text>
+                  </ButtonText>
                 </Button>
               </View>
             </View>
diff --git a/src/view/shell/bottom-bar/BottomBarWeb.tsx b/src/view/shell/bottom-bar/BottomBarWeb.tsx
index 1855969cc4..da935c9fbc 100644
--- a/src/view/shell/bottom-bar/BottomBarWeb.tsx
+++ b/src/view/shell/bottom-bar/BottomBarWeb.tsx
@@ -16,12 +16,11 @@ import {useUnreadNotifications} from '#/state/queries/notifications/unread'
 import {useSession} from '#/state/session'
 import {useLoggedOutViewControls} from '#/state/shell/logged-out'
 import {useCloseAllActiveElements} from '#/state/util'
-import {Button} from '#/view/com/util/forms/Button'
 import {Link} from '#/view/com/util/Link'
-import {Text} from '#/view/com/util/text/Text'
 import {Logo} from '#/view/icons/Logo'
 import {Logotype} from '#/view/icons/Logotype'
 import {atoms as a, useTheme} from '#/alf'
+import {Button, ButtonText} from '#/components/Button'
 import {
   Bell_Filled_Corner0_Rounded as BellFilled,
   Bell_Stroke2_Corner0_Rounded as Bell,
@@ -40,6 +39,7 @@ import {
   UserCircle_Filled_Corner0_Rounded as UserCircleFilled,
   UserCircle_Stroke2_Corner0_Rounded as UserCircle,
 } from '#/components/icons/UserCircle'
+import {Text} from '#/components/Typography'
 import {styles} from './BottomBarStyles'
 
 export function BottomBarWeb() {
@@ -196,24 +196,26 @@ export function BottomBarWeb() {
               </View>
             </View>
 
-            <View style={{flexDirection: 'row', alignItems: 'center', gap: 8}}>
+            <View style={[a.flex_row, a.flex_wrap, a.gap_sm]}>
               <Button
                 onPress={showCreateAccount}
-                accessibilityHint={_(msg`Sign up`)}
-                accessibilityLabel={_(msg`Sign up`)}>
-                <Text type="md" style={[{color: 'white'}, a.font_bold]}>
-                  <Trans>Sign up</Trans>
-                </Text>
+                label={_(msg`Create account`)}
+                size="small"
+                variant="solid"
+                color="primary">
+                <ButtonText>
+                  <Trans>Create account</Trans>
+                </ButtonText>
               </Button>
-
               <Button
-                type="default"
                 onPress={showSignIn}
-                accessibilityHint={_(msg`Sign in`)}
-                accessibilityLabel={_(msg`Sign in`)}>
-                <Text type="md" style={[t.atoms.text, a.font_bold]}>
+                label={_(msg`Sign in`)}
+                size="small"
+                variant="solid"
+                color="secondary">
+                <ButtonText>
                   <Trans>Sign in</Trans>
-                </Text>
+                </ButtonText>
               </Button>
             </View>
           </View>