diff --git a/src/Android/Android.csproj b/src/Android/Android.csproj
index ee8f1fc0f..2b4256edc 100644
--- a/src/Android/Android.csproj
+++ b/src/Android/Android.csproj
@@ -79,8 +79,9 @@
     <Compile Include="Autofill\FilledItem.cs" />
     <Compile Include="Autofill\Parser.cs" />
     <Compile Include="Autofill\SavedItem.cs" />
-    <Compile Include="Renderers\CustomPickerBarRenderer.cs" />
-    <Compile Include="Renderers\CustomEntryBarRenderer.cs" />
+    <Compile Include="Renderers\CustomEditorRenderer.cs" />
+    <Compile Include="Renderers\CustomPickerRenderer.cs" />
+    <Compile Include="Renderers\CustomEntryRenderer.cs" />
     <Compile Include="Renderers\CustomSearchBarRenderer.cs" />
     <Compile Include="Renderers\ExtendedListViewRenderer.cs" />
     <Compile Include="SplashActivity.cs" />
diff --git a/src/Android/Renderers/CustomEditorRenderer.cs b/src/Android/Renderers/CustomEditorRenderer.cs
new file mode 100644
index 000000000..0f06a016c
--- /dev/null
+++ b/src/Android/Renderers/CustomEditorRenderer.cs
@@ -0,0 +1,25 @@
+using Android.Content;
+using Bit.Droid.Renderers.BoxedView;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Android;
+
+[assembly: ExportRenderer(typeof(Entry), typeof(CustomEditorRenderer))]
+namespace Bit.Droid.Renderers.BoxedView
+{
+    public class CustomEditorRenderer : EditorRenderer
+    {
+        public CustomEditorRenderer(Context context)
+            : base(context)
+        { }
+
+        protected override void OnElementChanged(ElementChangedEventArgs<Editor> e)
+        {
+            base.OnElementChanged(e);
+            if(Control != null && e.NewElement != null)
+            {
+                Control.SetPadding(Control.PaddingLeft, Control.PaddingTop - 10, Control.PaddingRight,
+                    Control.PaddingBottom + 20);
+            }
+        }
+    }
+}
diff --git a/src/Android/Renderers/CustomEntryBarRenderer.cs b/src/Android/Renderers/CustomEntryRenderer.cs
similarity index 76%
rename from src/Android/Renderers/CustomEntryBarRenderer.cs
rename to src/Android/Renderers/CustomEntryRenderer.cs
index d93d53b09..45f6ba51c 100644
--- a/src/Android/Renderers/CustomEntryBarRenderer.cs
+++ b/src/Android/Renderers/CustomEntryRenderer.cs
@@ -3,12 +3,12 @@ using Bit.Droid.Renderers.BoxedView;
 using Xamarin.Forms;
 using Xamarin.Forms.Platform.Android;
 
-[assembly: ExportRenderer(typeof(Entry), typeof(CustomEntryBarRenderer))]
+[assembly: ExportRenderer(typeof(Entry), typeof(CustomEntryRenderer))]
 namespace Bit.Droid.Renderers.BoxedView
 {
-    public class CustomEntryBarRenderer : EntryRenderer
+    public class CustomEntryRenderer : EntryRenderer
     {
-        public CustomEntryBarRenderer(Context context)
+        public CustomEntryRenderer(Context context)
             : base(context)
         { }
 
diff --git a/src/Android/Renderers/CustomPickerBarRenderer.cs b/src/Android/Renderers/CustomPickerRenderer.cs
similarity index 75%
rename from src/Android/Renderers/CustomPickerBarRenderer.cs
rename to src/Android/Renderers/CustomPickerRenderer.cs
index eda4c131f..9b48cd986 100644
--- a/src/Android/Renderers/CustomPickerBarRenderer.cs
+++ b/src/Android/Renderers/CustomPickerRenderer.cs
@@ -3,12 +3,12 @@ using Bit.Droid.Renderers.BoxedView;
 using Xamarin.Forms;
 using Xamarin.Forms.Platform.Android;
 
-[assembly: ExportRenderer(typeof(Picker), typeof(CustomPickerBarRenderer))]
+[assembly: ExportRenderer(typeof(Picker), typeof(CustomPickerRenderer))]
 namespace Bit.Droid.Renderers.BoxedView
 {
-    public class CustomPickerBarRenderer : PickerRenderer
+    public class CustomPickerRenderer : PickerRenderer
     {
-        public CustomPickerBarRenderer(Context context)
+        public CustomPickerRenderer(Context context)
             : base(context)
         { }
 
diff --git a/src/App/Pages/Vault/AddEditPage.xaml b/src/App/Pages/Vault/AddEditPage.xaml
index cb6e000c2..8e06387eb 100644
--- a/src/App/Pages/Vault/AddEditPage.xaml
+++ b/src/App/Pages/Vault/AddEditPage.xaml
@@ -226,6 +226,130 @@
                             Text="{Binding Cipher.Identity.LastName}"
                             StyleClass="box-value" />
                     </StackLayout>
+                    <StackLayout StyleClass="box-row, box-row-input">
+                        <Label
+                            Text="{u:I18n Username}"
+                            StyleClass="box-label" />
+                        <Entry
+                            Text="{Binding Cipher.Identity.Username}"
+                            StyleClass="box-value" />
+                    </StackLayout>
+                    <StackLayout StyleClass="box-row, box-row-input">
+                        <Label
+                            Text="{u:I18n Company}"
+                            StyleClass="box-label" />
+                        <Entry
+                            Text="{Binding Cipher.Identity.Company}"
+                            StyleClass="box-value" />
+                    </StackLayout>
+                    <StackLayout StyleClass="box-row, box-row-input">
+                        <Label
+                            Text="{u:I18n SSN}"
+                            StyleClass="box-label" />
+                        <Entry
+                            Text="{Binding Cipher.Identity.SSN}"
+                            StyleClass="box-value" />
+                    </StackLayout>
+                    <StackLayout StyleClass="box-row, box-row-input">
+                        <Label
+                            Text="{u:I18n PassportNumber}"
+                            StyleClass="box-label" />
+                        <Entry
+                            Text="{Binding Cipher.Identity.PassportNumber}"
+                            StyleClass="box-value" />
+                    </StackLayout>
+                    <StackLayout StyleClass="box-row, box-row-input">
+                        <Label
+                            Text="{u:I18n LicenseNumber}"
+                            StyleClass="box-label" />
+                        <Entry
+                            Text="{Binding Cipher.Identity.LicenseNumber}"
+                            StyleClass="box-value" />
+                    </StackLayout>
+                    <StackLayout StyleClass="box-row, box-row-input">
+                        <Label
+                            Text="{u:I18n Email}"
+                            StyleClass="box-label" />
+                        <Entry
+                            Text="{Binding Cipher.Identity.Email}"
+                            StyleClass="box-value" />
+                    </StackLayout>
+                    <StackLayout StyleClass="box-row, box-row-input">
+                        <Label
+                            Text="{u:I18n Phone}"
+                            StyleClass="box-label" />
+                        <Entry
+                            Text="{Binding Cipher.Identity.Phone}"
+                            StyleClass="box-value" />
+                    </StackLayout>
+                    <StackLayout StyleClass="box-row, box-row-input">
+                        <Label
+                            Text="{u:I18n Address1}"
+                            StyleClass="box-label" />
+                        <Entry
+                            Text="{Binding Cipher.Identity.Address1}"
+                            StyleClass="box-value" />
+                    </StackLayout>
+                    <StackLayout StyleClass="box-row, box-row-input">
+                        <Label
+                            Text="{u:I18n Address2}"
+                            StyleClass="box-label" />
+                        <Entry
+                            Text="{Binding Cipher.Identity.Address2}"
+                            StyleClass="box-value" />
+                    </StackLayout>
+                    <StackLayout StyleClass="box-row, box-row-input">
+                        <Label
+                            Text="{u:I18n Address3}"
+                            StyleClass="box-label" />
+                        <Entry
+                            Text="{Binding Cipher.Identity.Address3}"
+                            StyleClass="box-value" />
+                    </StackLayout>
+                    <StackLayout StyleClass="box-row, box-row-input">
+                        <Label
+                            Text="{u:I18n CityTown}"
+                            StyleClass="box-label" />
+                        <Entry
+                            Text="{Binding Cipher.Identity.City}"
+                            StyleClass="box-value" />
+                    </StackLayout>
+                    <StackLayout StyleClass="box-row, box-row-input">
+                        <Label
+                            Text="{u:I18n StateProvince}"
+                            StyleClass="box-label" />
+                        <Entry
+                            Text="{Binding Cipher.Identity.State}"
+                            StyleClass="box-value" />
+                    </StackLayout>
+                    <StackLayout StyleClass="box-row, box-row-input">
+                        <Label
+                            Text="{u:I18n ZipPostalCode}"
+                            StyleClass="box-label" />
+                        <Entry
+                            Text="{Binding Cipher.Identity.PostalCode}"
+                            StyleClass="box-value" />
+                    </StackLayout>
+                    <StackLayout StyleClass="box-row, box-row-input">
+                        <Label
+                            Text="{u:I18n Country}"
+                            StyleClass="box-label" />
+                        <Entry
+                            Text="{Binding Cipher.Identity.Country}"
+                            StyleClass="box-value" />
+                    </StackLayout>
+                </StackLayout>
+            </StackLayout>
+            <StackLayout StyleClass="box">
+                <StackLayout StyleClass="box-row-header">
+                    <Label Text="{u:I18n Notes}"
+                           StyleClass="box-header, box-header-platform" />
+                </StackLayout>
+                <StackLayout StyleClass="box-row">
+                    <Editor
+                        Text="{Binding Cipher.Notes}"
+                        StyleClass="box-value"
+                        HeightRequest="200" />
                 </StackLayout>
             </StackLayout>
         </StackLayout>
diff --git a/src/App/Styles/Android.xaml b/src/App/Styles/Android.xaml
index 07ebc86f9..0410b0174 100644
--- a/src/App/Styles/Android.xaml
+++ b/src/App/Styles/Android.xaml
@@ -12,6 +12,11 @@
         <Setter Property="Margin"
                 Value="-4, 0, -4, -4" />
     </Style>
+    <Style TargetType="Editor"
+           ApplyToDerivedTypes="True">
+        <Setter Property="Margin"
+                Value="-4, 0, -4, -4" />
+    </Style>
     
     <!-- Buttons -->