diff --git a/src/Android/Resources/values/colors.xml b/src/Android/Resources/values/colors.xml
index a3c8c4ce1..9c43a2803 100644
--- a/src/Android/Resources/values/colors.xml
+++ b/src/Android/Resources/values/colors.xml
@@ -14,7 +14,7 @@
   <color name="dark_primary">#52bdfb</color>
   <color name="dark_darkaccent">#222d32</color>
   <color name="dark_accent">#449BCE</color>
-  <color name="dark_border">#545454</color>
+  <color name="dark_border">#191919</color>
 
   <color name="launcher_background">#FFFFFF</color>
   <color name="white">#FFFFFF</color>
diff --git a/src/App/Styles/Base.xaml b/src/App/Styles/Base.xaml
index 5269133a1..9152d5452 100644
--- a/src/App/Styles/Base.xaml
+++ b/src/App/Styles/Base.xaml
@@ -222,7 +222,7 @@
         <Setter Property="Padding"
                 Value="0" />
         <Setter Property="TextColor"
-                Value="{StaticResource PrimaryColor}" />
+                Value="{StaticResource ButtonColor}" />
         <Setter Property="HorizontalOptions"
                 Value="End" />
         <Setter Property="VerticalOptions"
@@ -306,7 +306,7 @@
         <Setter Property="Padding"
                 Value="0" />
         <Setter Property="TextColor"
-                Value="{StaticResource PrimaryColor}" />
+                Value="{StaticResource ButtonColor}" />
         <Setter Property="HorizontalOptions"
                 Value="End" />
         <Setter Property="VerticalOptions"
diff --git a/src/App/Styles/Dark.xaml b/src/App/Styles/Dark.xaml
index 0bb7a208f..ff17f10a4 100644
--- a/src/App/Styles/Dark.xaml
+++ b/src/App/Styles/Dark.xaml
@@ -11,26 +11,27 @@
     <Color x:Key="MutedColor">#a3a3a3</Color>
     <Color x:Key="PasswordNumberColor">#52bdfb</Color>
     <Color x:Key="PasswordSpecialColor">#ff7c70</Color>
+    <Color x:Key="ButtonColor">#e0e0e0</Color>
 
-    <Color x:Key="BorderColor">#111111</Color>
+    <Color x:Key="BorderColor">#191919</Color>
     <Color x:Key="DisabledIconColor">#c7c7cd</Color>
 
-    <Color x:Key="BoxBorderColor">#545454</Color>
+    <Color x:Key="BoxBorderColor">#191919</Color>
     <Color x:Key="BoxHeaderTextColor">#52bdfb</Color>
 
     <Color x:Key="TitleTextColor">#ffffff</Color>
     <Color x:Key="TitleEntryTextColor">#ffffff</Color>
     <Color x:Key="TitleEntryPlaceholderColor">#707070</Color>
 
-    <Color x:Key="ListItemBorderColor">#545454</Color>
+    <Color x:Key="ListItemBorderColor">#191919</Color>
     <Color x:Key="ListHeaderTextColor">#52bdfb</Color>
 
-    <Color x:Key="SliderThumbColor">#ffffff</Color>
+    <Color x:Key="SliderThumbColor">#B9B9B9</Color>
     <Color x:Key="SliderThumbBorderColor">#000000</Color>
     <Color x:Key="SliderTrackColor">#52bdfb</Color>
 
     <Color x:Key="FabColor">#52bdfb</Color>
-    <Color x:Key="FabPressedColor">#449BCE</Color>
+    <Color x:Key="FabPressedColor">#3ea1da</Color>
 
     <Color x:Key="TabBarBackgroundColor">#212121</Color>
     <Color x:Key="TabBarItemColor">#C0C0C0</Color>
diff --git a/src/App/Styles/Light.xaml b/src/App/Styles/Light.xaml
index 282ab75b4..b67d60166 100644
--- a/src/App/Styles/Light.xaml
+++ b/src/App/Styles/Light.xaml
@@ -11,6 +11,7 @@
     <Color x:Key="MutedColor">#777777</Color>
     <Color x:Key="PasswordNumberColor">#007fde</Color>
     <Color x:Key="PasswordSpecialColor">#c40800</Color>
+    <Color x:Key="ButtonColor">#3c8dbc</Color>
 
     <Color x:Key="BorderColor">#dddddd</Color>
     <Color x:Key="DisabledIconColor">#c7c7cd</Color>