diff --git a/app/ios/Runner/Info.plist b/app/ios/Runner/Info.plist
index a31e8613..5044071f 100644
--- a/app/ios/Runner/Info.plist
+++ b/app/ios/Runner/Info.plist
@@ -50,7 +50,7 @@
       <dict>
         <key>CFBundleURLSchemes</key>
         <array>
-          <string>com.googleusercontent.apps.159803135906-moi01vqn0m65ld95pg92qv6hol7s78pm</string>
+          <string>com.googleusercontent.apps.406838982484-to095m87ai3cv8nqi86rbjjusdd7sagh</string>
         </array>
       </dict>
     </array>
diff --git a/app/lib/ui/flow/auth/sign_in/phone/sign_in_with_phone_screen.dart b/app/lib/ui/flow/auth/sign_in/phone/sign_in_with_phone_screen.dart
index fdfe86db..c95a47a0 100644
--- a/app/lib/ui/flow/auth/sign_in/phone/sign_in_with_phone_screen.dart
+++ b/app/lib/ui/flow/auth/sign_in/phone/sign_in_with_phone_screen.dart
@@ -95,7 +95,7 @@ class _SignInWithPhoneScreenState extends ConsumerState<SignInWithPhoneScreen> {
                       enabled: enable && !loading,
                       progress: loading,
                       context.l10n.common_next,
-                      onPressed: notifier.verifyPhone,
+                      onPressed: () => notifier.verifyPhone(),
                     ),
                   ],
                 )));
diff --git a/app/lib/ui/flow/onboard/connection_screen.dart b/app/lib/ui/flow/onboard/connection_screen.dart
index d64d7934..d640571e 100644
--- a/app/lib/ui/flow/onboard/connection_screen.dart
+++ b/app/lib/ui/flow/onboard/connection_screen.dart
@@ -30,6 +30,7 @@ class _ConnectionScreenState extends State<ConnectionScreen> {
     return Center(
       child: Stack(children: [
         ListView(
+          padding: const EdgeInsets.symmetric(horizontal: 16),
             children: [
           const SizedBox(height: 40),
           Text(
diff --git a/app/lib/ui/flow/onboard/pick_name_screen.dart b/app/lib/ui/flow/onboard/pick_name_screen.dart
index 812e583d..56a43122 100644
--- a/app/lib/ui/flow/onboard/pick_name_screen.dart
+++ b/app/lib/ui/flow/onboard/pick_name_screen.dart
@@ -5,6 +5,7 @@ import 'package:style/button/bottom_sticky_overlay.dart';
 import 'package:style/button/primary_button.dart';
 import 'package:style/extenstions/context_extenstions.dart';
 import 'package:style/text/app_text_dart.dart';
+import 'package:style/text/app_text_field.dart';
 import 'package:yourspace_flutter/domain/extenstions/context_extenstions.dart';
 import 'package:yourspace_flutter/ui/app_route.dart';
 import 'package:yourspace_flutter/ui/components/app_page.dart';
@@ -79,7 +80,7 @@ class _PickNameScreenState extends ConsumerState<PickNameScreen> {
   Widget _nameTextField(TextEditingController controller) {
     return Padding(
       padding: const EdgeInsets.symmetric(vertical: 16),
-      child: CupertinoTextField(
+      child: AppTextField(
         controller: controller,
         onChanged: (value) => _notifier.enableNextButton(),
         keyboardType: TextInputType.text,
@@ -89,10 +90,7 @@ class _PickNameScreenState extends ConsumerState<PickNameScreen> {
         style: AppTextStyle.subtitle2.copyWith(
           color: context.colorScheme.textPrimary,
         ),
-        decoration: BoxDecoration(
-            border: Border(
-                bottom:
-                    BorderSide(color: context.colorScheme.containerNormal))),
+        borderType: AppTextFieldBorderType.underline,
       ),
     );
   }