diff --git a/src/App/Controls/CipherViewCell/CipherViewCell.xaml b/src/App/Controls/CipherViewCell/CipherViewCell.xaml
index 2ed40b071..cda2f01d0 100644
--- a/src/App/Controls/CipherViewCell/CipherViewCell.xaml
+++ b/src/App/Controls/CipherViewCell/CipherViewCell.xaml
@@ -39,15 +39,16 @@
         AutomationProperties.IsInAccessibleTree="False" />
 
     <ff:CachedImage
+        x:Name="_iconImage"
         Grid.Column="0"
         BitmapOptimizations="True"
         ErrorPlaceholder="login.png"
         LoadingPlaceholder="login.png"
-        HorizontalOptions="Fill"
-        VerticalOptions="Fill"
+        HorizontalOptions="CenterAndExpand"
+        VerticalOptions="CenterAndExpand"
         Margin="9"
-        MinimumWidthRequest="22"
-        MinimumHeightRequest="22"
+        WidthRequest="22"
+        HeightRequest="22"
         Aspect="AspectFit"
         IsVisible="{Binding ShowIconImage}"
         Source="{Binding IconImageSource, Mode=OneTime}"
diff --git a/src/App/Controls/CipherViewCell/CipherViewCell.xaml.cs b/src/App/Controls/CipherViewCell/CipherViewCell.xaml.cs
index 98f0805b6..f454f2b55 100644
--- a/src/App/Controls/CipherViewCell/CipherViewCell.xaml.cs
+++ b/src/App/Controls/CipherViewCell/CipherViewCell.xaml.cs
@@ -8,6 +8,9 @@ namespace Bit.App.Controls
 {
     public partial class CipherViewCell : ExtendedGrid
     {
+        private const int ICON_COLUMN_DEFAULT_WIDTH = 40;
+        private const int ICON_IMAGE_DEFAULT_WIDTH = 22;
+
         public static readonly BindableProperty CipherProperty = BindableProperty.Create(
             nameof(Cipher), typeof(CipherView), typeof(CipherViewCell), default(CipherView), BindingMode.OneWay);
 
@@ -21,8 +24,10 @@ namespace Bit.App.Controls
         {
             InitializeComponent();
 
-            var deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
-            _iconColumn.Width = new GridLength(40 * deviceActionService.GetSystemFontSizeScale(), GridUnitType.Absolute);
+            var fontScale = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService").GetSystemFontSizeScale();
+            _iconColumn.Width = new GridLength(ICON_COLUMN_DEFAULT_WIDTH * fontScale, GridUnitType.Absolute);
+            _iconImage.WidthRequest = ICON_IMAGE_DEFAULT_WIDTH * fontScale;
+            _iconImage.HeightRequest = ICON_IMAGE_DEFAULT_WIDTH * fontScale;
         }
 
         public bool? WebsiteIconsEnabled