diff --git a/packages/firebase_ui_auth/lib/src/screens/phone_input_screen.dart b/packages/firebase_ui_auth/lib/src/screens/phone_input_screen.dart
index a30c9635..6f8b3173 100644
--- a/packages/firebase_ui_auth/lib/src/screens/phone_input_screen.dart
+++ b/packages/firebase_ui_auth/lib/src/screens/phone_input_screen.dart
@@ -6,10 +6,8 @@ import 'package:firebase_auth/firebase_auth.dart' as fba;
 import 'package:firebase_ui_shared/firebase_ui_shared.dart';
 import 'package:flutter/widgets.dart';
 import 'package:firebase_ui_auth/firebase_ui_auth.dart';
-import 'package:firebase_ui_localizations/firebase_ui_localizations.dart';
 
 import '../widgets/internal/universal_page_route.dart';
-
 import 'internal/responsive_page.dart';
 
 /// A screen displaying a fully styled phone number entry screen, with a country-code
@@ -103,7 +101,6 @@ class PhoneInputScreen extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final flowKey = Object();
-    final l = FirebaseUILocalizations.labelsOf(context);
 
     return FirebaseUIActions(
       actions: actions ?? [SMSCodeRequestedAction(_next)],
@@ -128,14 +125,6 @@ class PhoneInputScreen extends StatelessWidget {
                   multiFactorSession: multiFactorSession,
                   mfaHint: mfaHint,
                 ),
-                const SizedBox(height: 8),
-                UniversalButton(
-                  text: l.goBackButtonLabel,
-                  variant: ButtonVariant.text,
-                  onPressed: () {
-                    Navigator.of(context).pop();
-                  },
-                ),
               ],
             ),
           ),
diff --git a/packages/firebase_ui_auth/lib/src/views/phone_input_view.dart b/packages/firebase_ui_auth/lib/src/views/phone_input_view.dart
index 79f7882a..4935f002 100644
--- a/packages/firebase_ui_auth/lib/src/views/phone_input_view.dart
+++ b/packages/firebase_ui_auth/lib/src/views/phone_input_view.dart
@@ -141,6 +141,14 @@ class _PhoneInputViewState extends State<PhoneInputView> {
               ErrorText(exception: state.exception),
               const SizedBox(height: 8),
             ],
+            const SizedBox(height: 8),
+            UniversalButton(
+              text: l.goBackButtonLabel,
+              variant: ButtonVariant.text,
+              onPressed: () {
+                Navigator.of(context).pop();
+              },
+            ),
             if (widget.footerBuilder != null) widget.footerBuilder!(context),
           ],
         );
diff --git a/tests/integration_test/firebase_ui_auth/phone_verification_test.dart b/tests/integration_test/firebase_ui_auth/phone_verification_test.dart
index 66cc8e8f..baac2f6f 100644
--- a/tests/integration_test/firebase_ui_auth/phone_verification_test.dart
+++ b/tests/integration_test/firebase_ui_auth/phone_verification_test.dart
@@ -201,7 +201,7 @@ void main() {
         await tester.testTextInput.receiveAction(TextInputAction.done);
         await tester.pumpAndSettle();
 
-        final user = await completer.future.timeout(const Duration(seconds: 2));
+        final user = await completer.future.timeout(const Duration(seconds: 5));
 
         expect(user.phoneNumber, '+1234567890');
       },