diff --git a/src/App/Controls/LabeledValueCell.cs b/src/App/Controls/LabeledValueCell.cs
index ca77575e8..aec9fdf9a 100644
--- a/src/App/Controls/LabeledValueCell.cs
+++ b/src/App/Controls/LabeledValueCell.cs
@@ -114,6 +114,19 @@ namespace Bit.App.Controls
 
                 containerStackLayout.AdjustPaddingForDevice();
             }
+            else if(Device.RuntimePlatform == Device.UWP)
+            {
+                buttonStackLayout.Spacing = 0;
+
+                if(Button1 != null)
+                {
+                    Button1.BackgroundColor = Color.Transparent;
+                }
+                if(Button2 != null)
+                {
+                    Button2.BackgroundColor = Color.Transparent;
+                }
+            }
 
             if(Sub != null && Button1 != null)
             {
diff --git a/src/UWP.Images/UWP.Images.projitems b/src/UWP.Images/UWP.Images.projitems
index b7499790a..cadc2367b 100644
--- a/src/UWP.Images/UWP.Images.projitems
+++ b/src/UWP.Images/UWP.Images.projitems
@@ -24,7 +24,6 @@
     <Content Include="$(MSBuildThisFileDirectory)eye_slash.png" />
     <Content Include="$(MSBuildThisFileDirectory)fa_lock.png" />
     <Content Include="$(MSBuildThisFileDirectory)fa_lock_selected.png" />
-    <Content Include="$(MSBuildThisFileDirectory)fingerprint.png" />
     <Content Include="$(MSBuildThisFileDirectory)folder.png" />
     <Content Include="$(MSBuildThisFileDirectory)globe.png" />
     <Content Include="$(MSBuildThisFileDirectory)icon.png" />
diff --git a/src/UWP.Images/clipboard.png b/src/UWP.Images/clipboard.png
index 633580c6e..bc3b024c8 100644
Binary files a/src/UWP.Images/clipboard.png and b/src/UWP.Images/clipboard.png differ
diff --git a/src/UWP.Images/eye.png b/src/UWP.Images/eye.png
index 9c8fd3734..806d15c9a 100644
Binary files a/src/UWP.Images/eye.png and b/src/UWP.Images/eye.png differ
diff --git a/src/UWP.Images/eye_slash.png b/src/UWP.Images/eye_slash.png
index 87e0c2a38..8c9aa1a94 100644
Binary files a/src/UWP.Images/eye_slash.png and b/src/UWP.Images/eye_slash.png differ
diff --git a/src/UWP.Images/fingerprint.png b/src/UWP.Images/fingerprint.png
deleted file mode 100644
index e6878722d..000000000
Binary files a/src/UWP.Images/fingerprint.png and /dev/null differ