diff --git a/src/App/Pages/Vault/VaultViewSitePage.cs b/src/App/Pages/Vault/VaultViewSitePage.cs
index 71f022cc6..08dd23c3f 100644
--- a/src/App/Pages/Vault/VaultViewSitePage.cs
+++ b/src/App/Pages/Vault/VaultViewSitePage.cs
@@ -109,8 +109,8 @@ namespace Bit.App.Pages
             {
                 // NOTE: This is going to cause problems with i18n strings since various languages have difference string sizes
                 PasswordCell.Button1.WidthRequest = 40;
-                PasswordCell.Button2.WidthRequest = 55;
-                UsernameCell.Button1.WidthRequest = 55;
+                PasswordCell.Button2.WidthRequest = 59;
+                UsernameCell.Button1.WidthRequest = 59;
                 UriCell.Button1.WidthRequest = 75;
             }
 
diff --git a/src/App/Utilities/Extentions.cs b/src/App/Utilities/Extentions.cs
index 071ed2228..f1ef02f85 100644
--- a/src/App/Utilities/Extentions.cs
+++ b/src/App/Utilities/Extentions.cs
@@ -49,26 +49,12 @@ namespace Bit.App
 
         public static async Task PushForDeviceAsync(this INavigation navigation, Page page)
         {
-            if(Device.OS == TargetPlatform.iOS)
-            {
-                await navigation.PushModalAsync(new ExtendedNavigationPage(page), true);
-            }
-            else
-            {
-                await navigation.PushAsync(page, true);
-            }
+            await navigation.PushModalAsync(new ExtendedNavigationPage(page), true);
         }
 
         public static async Task PopForDeviceAsync(this INavigation navigation)
         {
-            if(Device.OS == TargetPlatform.iOS)
-            {
-                await navigation.PopModalAsync(true);
-            }
-            else
-            {
-                await navigation.PopAsync(true);
-            }
+            await navigation.PopModalAsync(true);
         }
 
         public static void AdjustMarginsForDevice(this View view)