diff --git a/src/App/Controls/CipherViewCell/CipherViewCell.xaml b/src/App/Controls/CipherViewCell/CipherViewCell.xaml
index 9c5d7f51d..ae88ed9cc 100644
--- a/src/App/Controls/CipherViewCell/CipherViewCell.xaml
+++ b/src/App/Controls/CipherViewCell/CipherViewCell.xaml
@@ -4,83 +4,103 @@
           x:Class="Bit.App.Controls.CipherViewCell"
           xmlns:controls="clr-namespace:Bit.App.Controls"
           xmlns:ff="clr-namespace:FFImageLoading.Forms;assembly=FFImageLoading.Forms">
-    <Grid x:Name="_grid"
-            StyleClass="list-row, list-row-platform"
-            RowSpacing="0"
-            ColumnSpacing="0"
-            x:DataType="controls:CipherViewCellViewModel">
+
+    <Grid 
+        x:Name="_grid"
+        StyleClass="list-row, list-row-platform"
+        RowSpacing="0"
+        ColumnSpacing="0"
+        x:DataType="controls:CipherViewCellViewModel">
 
         <Grid.BindingContext>
             <controls:CipherViewCellViewModel />
         </Grid.BindingContext>
 
         <Grid.RowDefinitions>
-            <RowDefinition Height="*" />
-            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
+
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="40" />
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="*" />
             <ColumnDefinition Width="60" />
         </Grid.ColumnDefinitions>
 
-        <controls:FaLabel x:Name="_icon"
-                            Grid.Column="0"
-                            Grid.Row="0"
-                            Grid.RowSpan="2"
-                            HorizontalOptions="Center"
-                            VerticalOptions="Center"
-                            StyleClass="list-icon, list-icon-platform" />
-        <ff:CachedImage x:Name="_image"
-                        Grid.Column="0"
-                        Grid.Row="0"
-                        Grid.RowSpan="2"
-                        BitmapOptimizations="True"
-                        ErrorPlaceholder="login.png"
-                        HorizontalOptions="Center"
-                        VerticalOptions="Center"
-                        WidthRequest="22"
-                        HeightRequest="22"
-                        IsVisible="False"/>
-        <Label LineBreakMode="TailTruncation"
-                Grid.Column="1"
+        <controls:FaLabel
+            x:Name="_icon"
+            Grid.Row="0"
+            Grid.Column="0"
+            HorizontalOptions="Center"
+            VerticalOptions="Center"
+            StyleClass="list-icon, list-icon-platform" />
+
+        <ff:CachedImage
+            x:Name="_image"
+            Grid.Row="0"
+            Grid.Column="0"
+            BitmapOptimizations="True"
+            ErrorPlaceholder="login.png"
+            HorizontalOptions="Center"
+            VerticalOptions="Center"
+            WidthRequest="22"
+            HeightRequest="22"
+            IsVisible="False"/>
+
+        <Grid RowSpacing="0" ColumnSpacing="0" Grid.Row="0" Grid.Column="1" VerticalOptions="Center">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+
+            <Label 
+                LineBreakMode="TailTruncation"
+                Grid.Column="0"
                 Grid.Row="0"
                 StyleClass="list-title, list-title-platform"
                 Text="{Binding Cipher.Name, Mode=OneWay}" />
-        <Label LineBreakMode="TailTruncation"
-                Grid.Column="1"
+            <Label
+                LineBreakMode="TailTruncation"
+                Grid.Column="0"
                 Grid.Row="1"
                 Grid.ColumnSpan="3"
                 StyleClass="list-subtitle, list-subtitle-platform"
                 Text="{Binding Cipher.SubTitle, Mode=OneWay}" />
-
-        <controls:FaLabel
-            Grid.Column="2"
-            Grid.Row="0"
-            HorizontalOptions="Start"
-            VerticalOptions="Center"
-            StyleClass="list-title-icon"
-            Margin="5, 0, 0, 0"
-            Text="&#xf1e0;"
-            IsVisible="{Binding Cipher.Shared, Mode=OneWay}" />
-        <controls:FaLabel
-            Grid.Column="3"
-            Grid.Row="0"
-            HorizontalOptions="Start"
-            VerticalOptions="Center"
-            StyleClass="list-title-icon"
-            Margin="5, 0, 0, 0"
-            Text="&#xf0c6;"
-            IsVisible="{Binding Cipher.HasAttachments, Mode=OneWay}" />
+            <controls:FaLabel
+                Grid.Column="1"
+                Grid.Row="0"
+                HorizontalOptions="Start"
+                VerticalOptions="Center"
+                StyleClass="list-title-icon"
+                Margin="5, 0, 0, 0"
+                Text="&#xf1e0;"
+                IsVisible="{Binding Cipher.Shared, Mode=OneWay}" />
+            <controls:FaLabel
+                Grid.Column="2"
+                Grid.Row="0"
+                HorizontalOptions="Start"
+                VerticalOptions="Center"
+                StyleClass="list-title-icon"
+                Margin="5, 0, 0, 0"
+                Text="&#xf0c6;"
+                IsVisible="{Binding Cipher.HasAttachments, Mode=OneWay}" />
+        </Grid>
 
         <controls:MiButton
+            BackgroundColor="Green"
+            Grid.Row="0"
+            Grid.Column="2"
             Text="&#xe5d3;"
             StyleClass="list-row-button, list-row-button-platform, btn-disabled"
-            Clicked="ImageButton_Clicked"
-            Grid.Column="4"
-            Grid.Row="0"
-            Grid.RowSpan="2" />
+            Clicked="MoreButton_Clicked"
+            VerticalOptions="CenterAndExpand"
+            HorizontalOptions="EndAndExpand" />
+
     </Grid>
+
 </ViewCell>
diff --git a/src/App/Controls/CipherViewCell/CipherViewCell.xaml.cs b/src/App/Controls/CipherViewCell/CipherViewCell.xaml.cs
index 8dc186b17..20f8c520e 100644
--- a/src/App/Controls/CipherViewCell/CipherViewCell.xaml.cs
+++ b/src/App/Controls/CipherViewCell/CipherViewCell.xaml.cs
@@ -181,7 +181,7 @@ namespace Bit.App.Controls
             return new Tuple<string, string>(icon, image);
         }
 
-        private void ImageButton_Clicked(object sender, EventArgs e)
+        private void MoreButton_Clicked(object sender, EventArgs e)
         {
             ButtonCommand?.Execute(Cipher);
         }
diff --git a/src/App/Styles/Base.xaml b/src/App/Styles/Base.xaml
index 67ba85dc6..68ba2afdf 100644
--- a/src/App/Styles/Base.xaml
+++ b/src/App/Styles/Base.xaml
@@ -236,10 +236,6 @@
                 Value="0" />
         <Setter Property="TextColor"
                 Value="{StaticResource ButtonColor}" />
-        <Setter Property="HorizontalOptions"
-                Value="End" />
-        <Setter Property="VerticalOptions"
-                Value="CenterAndExpand" />
     </Style>
 
     <!-- Box -->