diff --git a/src/App/Styles/iOS.xaml b/src/App/Styles/iOS.xaml
index fca5a658b..7071247e0 100644
--- a/src/App/Styles/iOS.xaml
+++ b/src/App/Styles/iOS.xaml
@@ -9,6 +9,11 @@
         <Setter Property="Margin"
                 Value="0, 5, 0, 12" />
     </Style>
+    <Style TargetType="Picker"
+           ApplyToDerivedTypes="True">
+        <Setter Property="Margin"
+                Value="0, 5, 0, 12" />
+    </Style>
     <Style TargetType="Editor"
            ApplyToDerivedTypes="True">
         <Setter Property="PlaceholderColor"
diff --git a/src/iOS/Renderers/CustomEditorRenderer.cs b/src/iOS/Renderers/CustomEditorRenderer.cs
index e14820197..ba275cff0 100644
--- a/src/iOS/Renderers/CustomEditorRenderer.cs
+++ b/src/iOS/Renderers/CustomEditorRenderer.cs
@@ -15,6 +15,9 @@ namespace Bit.iOS.Renderers
             {
                 var descriptor = UIFontDescriptor.PreferredBody;
                 Control.Font = UIFont.FromDescriptor(descriptor, descriptor.PointSize);
+                // Remove padding
+                Control.TextContainerInset = new UIEdgeInsets(0, 0, 0, 0);
+                Control.TextContainer.LineFragmentPadding = 0;
             }
         }
     }
diff --git a/src/iOS/Renderers/CustomEntryRenderer.cs b/src/iOS/Renderers/CustomEntryRenderer.cs
index 3c473dad5..88bc15ffc 100644
--- a/src/iOS/Renderers/CustomEntryRenderer.cs
+++ b/src/iOS/Renderers/CustomEntryRenderer.cs
@@ -17,7 +17,7 @@ namespace Bit.iOS.Renderers
             {
                 Control.ClearButtonMode = UITextFieldViewMode.WhileEditing;
                 UpdateFontSize();
-                SetBottomBorder();
+                iOSHelpers.SetBottomBorder(Control);
             }
         }
 
@@ -47,26 +47,5 @@ namespace Bit.iOS.Renderers
                 }
             }
         }
-
-        private void SetBottomBorder()
-        {
-            Control.BorderStyle = UITextBorderStyle.None;
-            var borderLine = new UIView
-            {
-                BackgroundColor = ((Color)Xamarin.Forms.Application.Current.Resources["BoxBorderColor"]).ToUIColor(),
-                TranslatesAutoresizingMaskIntoConstraints = false
-            };
-            Control.AddSubview(borderLine);
-            Control.AddConstraints(new NSLayoutConstraint[]
-            {
-                NSLayoutConstraint.Create(borderLine, NSLayoutAttribute.Height, NSLayoutRelation.Equal, 1, 1f),
-                NSLayoutConstraint.Create(borderLine, NSLayoutAttribute.Leading, NSLayoutRelation.Equal,
-                    Control, NSLayoutAttribute.Leading, 1, 0),
-                NSLayoutConstraint.Create(borderLine, NSLayoutAttribute.Trailing, NSLayoutRelation.Equal,
-                    Control, NSLayoutAttribute.Trailing, 1, 0),
-                NSLayoutConstraint.Create(borderLine, NSLayoutAttribute.Top, NSLayoutRelation.Equal,
-                    Control, NSLayoutAttribute.Bottom, 1, 10f),
-            });
-        }
     }
 }
diff --git a/src/iOS/Renderers/CustomPickerRenderer.cs b/src/iOS/Renderers/CustomPickerRenderer.cs
index 97dd2f7e9..6581bf87c 100644
--- a/src/iOS/Renderers/CustomPickerRenderer.cs
+++ b/src/iOS/Renderers/CustomPickerRenderer.cs
@@ -1,4 +1,5 @@
 using Bit.iOS.Renderers;
+using Bit.iOS.Utilities;
 using UIKit;
 using Xamarin.Forms;
 using Xamarin.Forms.Platform.iOS;
@@ -15,6 +16,7 @@ namespace Bit.iOS.Renderers
             {
                 var descriptor = UIFontDescriptor.PreferredBody;
                 Control.Font = UIFont.FromDescriptor(descriptor, descriptor.PointSize);
+                iOSHelpers.SetBottomBorder(Control);
             }
         }
     }
diff --git a/src/iOS/Utilities/iOSHelpers.cs b/src/iOS/Utilities/iOSHelpers.cs
index 2ea168c23..5bf0a2868 100644
--- a/src/iOS/Utilities/iOSHelpers.cs
+++ b/src/iOS/Utilities/iOSHelpers.cs
@@ -1,5 +1,6 @@
 using UIKit;
 using Xamarin.Forms;
+using Xamarin.Forms.Platform.iOS;
 
 namespace Bit.iOS.Utilities
 {
@@ -27,5 +28,36 @@ namespace Bit.iOS.Utilities
             }
             return pointSize;
         }
+
+        public static void SetBottomBorder(UITextField control)
+        {
+            control.BorderStyle = UITextBorderStyle.None;
+            SetBottomBorder(control as UIView);
+        }
+
+        public static void SetBottomBorder(UITextView control)
+        {
+            SetBottomBorder(control as UIView);
+        }
+
+        private static void SetBottomBorder(UIView control)
+        {
+            var borderLine = new UIView
+            {
+                BackgroundColor = ((Color)Xamarin.Forms.Application.Current.Resources["BoxBorderColor"]).ToUIColor(),
+                TranslatesAutoresizingMaskIntoConstraints = false
+            };
+            control.AddSubview(borderLine);
+            control.AddConstraints(new NSLayoutConstraint[]
+            {
+                NSLayoutConstraint.Create(borderLine, NSLayoutAttribute.Height, NSLayoutRelation.Equal, 1, 1f),
+                NSLayoutConstraint.Create(borderLine, NSLayoutAttribute.Leading, NSLayoutRelation.Equal,
+                    control, NSLayoutAttribute.Leading, 1, 0),
+                NSLayoutConstraint.Create(borderLine, NSLayoutAttribute.Trailing, NSLayoutRelation.Equal,
+                    control, NSLayoutAttribute.Trailing, 1, 0),
+                NSLayoutConstraint.Create(borderLine, NSLayoutAttribute.Top, NSLayoutRelation.Equal,
+                    control, NSLayoutAttribute.Bottom, 1, 10f),
+            });
+        }
     }
 }
\ No newline at end of file