diff --git a/mobile/apps/photos/lib/ui/components/text_input_widget_v2.dart b/mobile/apps/photos/lib/ui/components/text_input_widget_v2.dart
index 217cf44e73b..1541778cc8b 100644
--- a/mobile/apps/photos/lib/ui/components/text_input_widget_v2.dart
+++ b/mobile/apps/photos/lib/ui/components/text_input_widget_v2.dart
@@ -109,7 +109,7 @@ class TextInputWidgetV2 extends StatefulWidget {
 
 class _TextInputWidgetV2State extends State<TextInputWidgetV2>
     with SingleTickerProviderStateMixin {
-  static const _kHeight = 58.0;
+  static const _kHeight = 52.0;
   static const _kRadius = 16.0;
   static const _kHorizontalPadding = 16.0;
   static const _kIconContainerSize = 24.0;
@@ -267,7 +267,8 @@ class _TextInputWidgetV2State extends State<TextInputWidgetV2>
 
   bool get _isMultiline =>
       !widget.isPasswordInput &&
-      (widget.maxLines == null || (widget.maxLines ?? 1) > 1);
+      ((widget.maxLines != null && widget.maxLines! > 1) ||
+          (widget.minLines != null && widget.minLines! > 1));
 
   @override
   Widget build(BuildContext context) {
@@ -314,7 +315,7 @@ class _TextInputWidgetV2State extends State<TextInputWidgetV2>
               ],
             ],
           ),
-          const SizedBox(height: 8),
+          const SizedBox(height: 9),
         ],
         GestureDetector(
           onTap: widget.isDisabled ? null : _focusNode.requestFocus,
@@ -336,7 +337,7 @@ class _TextInputWidgetV2State extends State<TextInputWidgetV2>
               children: [
                 if (leading != null) ...[
                   leading,
-                  const SizedBox(width: 12),
+                  const SizedBox(width: 8),
                 ],
                 Expanded(
                   child: TextField(
@@ -347,7 +348,9 @@ class _TextInputWidgetV2State extends State<TextInputWidgetV2>
                     textCapitalization: widget.textCapitalization!,
                     autofocus: widget.autoFocus ?? false,
                     autocorrect: widget.autoCorrect,
-                    maxLines: widget.isPasswordInput ? 1 : widget.maxLines,
+                    maxLines: widget.isPasswordInput
+                        ? 1
+                        : widget.maxLines ?? (_isMultiline ? null : 1),
                     minLines: widget.isPasswordInput ? null : widget.minLines,
                     autofillHints: widget.autofillHints ??
                         (widget.isPasswordInput
@@ -376,7 +379,7 @@ class _TextInputWidgetV2State extends State<TextInputWidgetV2>
                   ),
                 ),
                 if (trailing != null) ...[
-                  const SizedBox(width: 12),
+                  const SizedBox(width: 8),
                   trailing,
                 ],
               ],
diff --git a/mobile/apps/photos/lib/ui/settings/lock_screen/lock_screen_options.dart b/mobile/apps/photos/lib/ui/settings/lock_screen/lock_screen_options.dart
index 30f4773912b..8a27a78e077 100644
--- a/mobile/apps/photos/lib/ui/settings/lock_screen/lock_screen_options.dart
+++ b/mobile/apps/photos/lib/ui/settings/lock_screen/lock_screen_options.dart
@@ -167,7 +167,7 @@ class _LockScreenOptionsState extends State<LockScreenOptions> {
       backgroundColor: pageBackgroundColor,
       body: SafeArea(
         child: Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 24),
+          padding: const EdgeInsets.symmetric(horizontal: 16),
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [