diff --git a/src/Android/Renderers/CipherViewCellRenderer.cs b/src/Android/Renderers/CipherViewCellRenderer.cs
index 7ed6f9f91..93d9a507f 100644
--- a/src/Android/Renderers/CipherViewCellRenderer.cs
+++ b/src/Android/Renderers/CipherViewCellRenderer.cs
@@ -117,6 +117,16 @@ namespace Bit.Droid.Renderers
             AttachmentsIcon.Typeface = _faTypeface;
             MoreButton.Typeface = _miTypeface;
 
+            var small = (float)Device.GetNamedSize(NamedSize.Small, typeof(Label));
+            Icon.SetTextSize(ComplexUnitType.Sp, 22.0952380952381F);
+            Name.SetTextSize(ComplexUnitType.Sp, (float)Device.GetNamedSize(NamedSize.Medium, typeof(Label)));
+            SubTitle.SetTextSize(ComplexUnitType.Sp, small);
+            SharedIcon.SetTextSize(ComplexUnitType.Sp, small);
+            AttachmentsIcon.SetTextSize(ComplexUnitType.Sp, small);
+            MoreButton.SetTextSize(ComplexUnitType.Sp, 25);
+            MoreButton.SetPadding(0, 0, 0, 0);
+            MoreButton.SetBackgroundColor(Xamarin.Forms.Color.Black.ToAndroid());
+
             AddView(view);
         }
 
@@ -144,7 +154,7 @@ namespace Bit.Droid.Renderers
             }
             else
             {
-                SubTitle.Visibility = ViewStates.Gone;
+                SubTitle.Visibility = ViewStates.Invisible;
             }
             SharedIcon.Visibility = cipher.Shared ? ViewStates.Visible : ViewStates.Gone;
             AttachmentsIcon.Visibility = cipher.HasAttachments ? ViewStates.Visible : ViewStates.Gone;
diff --git a/src/Android/Resources/layout/CipherViewCell.axml b/src/Android/Resources/layout/CipherViewCell.axml
index 2304eb9db..f387217ae 100644
--- a/src/Android/Resources/layout/CipherViewCell.axml
+++ b/src/Android/Resources/layout/CipherViewCell.axml
@@ -15,8 +15,8 @@
             android:layout_gravity="center_vertical" />
         <TextView
             android:id="@+id/CipherCellIcon"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
+            android:layout_width="26dp"
+            android:layout_height="26dp"
             android:layout_gravity="center_vertical"
             android:gravity="center"
             android:text="[X]" />
@@ -62,7 +62,7 @@
         </LinearLayout>
         <Button
             android:id="@+id/CipherCellButton"
-            android:layout_width="wrap_content"
+            android:layout_width="40dp"
             android:layout_height="match_parent"
             android:text="&#xe5d4;"
             android:gravity="center"/>
diff --git a/src/App/Styles/Base.xaml b/src/App/Styles/Base.xaml
index 3598c8f94..ef8846d2b 100644
--- a/src/App/Styles/Base.xaml
+++ b/src/App/Styles/Base.xaml
@@ -224,7 +224,7 @@
         <Setter Property="VerticalTextAlignment"
                 Value="Center" />
         <Setter Property="FontSize"
-                Value="Large" />
+                Value="22.0952380952381" />
         <Setter Property="TextColor"
                 Value="{StaticResource MutedColor}" />
     </Style>
@@ -346,6 +346,8 @@
                 Value="Medium" />
         <Setter Property="TextColor"
                 Value="{StaticResource TextColor}" />
+        <Setter Property="VerticalOptions"
+                Value="Center" />
     </Style>
     <Style TargetType="Label"
            ApplyToDerivedTypes="True"