diff --git a/src/App/App.cs b/src/App/App.cs
index 3e4ba2335..874fd3f5a 100644
--- a/src/App/App.cs
+++ b/src/App/App.cs
@@ -296,6 +296,13 @@ namespace Bit.App
                 }
             });
 
+            Resources.Add(new Style(typeof(ExtendedButton))
+            {
+                Setters = {
+                    new Setter { Property = Button.TextColorProperty, Value = primaryColor }
+                }
+            });
+
             // List View
 
             Resources.Add(new Style(typeof(ListView))
diff --git a/src/App/Controls/ExtendedButton.cs b/src/App/Controls/ExtendedButton.cs
index 4f5960ae2..d0d3733d0 100644
--- a/src/App/Controls/ExtendedButton.cs
+++ b/src/App/Controls/ExtendedButton.cs
@@ -9,8 +9,8 @@ namespace Bit.App.Controls
         public static readonly BindableProperty PaddingProperty =
             BindableProperty.Create(nameof(Padding), typeof(Thickness), typeof(ExtendedButton), default(Thickness));
         public static readonly BindableProperty UppercaseProperty =
-            BindableProperty.Create(nameof(Padding), typeof(bool), typeof(ExtendedButton),
-                Device.OS == TargetPlatform.Android ? true : false);
+            BindableProperty.Create(nameof(Uppercase), typeof(bool), typeof(ExtendedButton),
+                Device.OnPlatform(iOS: false, Android: true, WinPhone: false));
 
         public Thickness Padding
         {
diff --git a/src/App/Pages/LoginPage.cs b/src/App/Pages/LoginPage.cs
index d8b149997..521950d50 100644
--- a/src/App/Pages/LoginPage.cs
+++ b/src/App/Pages/LoginPage.cs
@@ -103,7 +103,7 @@ namespace Bit.App.Pages
             var layout = new StackLayout
             {
                 Children = { table, forgotPasswordButton },
-                Spacing = 0
+                Spacing = Device.OnPlatform(iOS: 0, Android: 10, WinPhone: 0)
             };
 
             var scrollView = new ScrollView { Content = layout };