diff --git a/src/App/Pages/Settings/OptionsPageViewModel.cs b/src/App/Pages/Settings/OptionsPageViewModel.cs
index 39871df69..4047b68d1 100644
--- a/src/App/Pages/Settings/OptionsPageViewModel.cs
+++ b/src/App/Pages/Settings/OptionsPageViewModel.cs
@@ -62,12 +62,9 @@ namespace Bit.App.Pages
                 new KeyValuePair<string, string>(null, AppResources.Default),
                 new KeyValuePair<string, string>("light", AppResources.Light),
                 new KeyValuePair<string, string>("dark", AppResources.Dark),
+                new KeyValuePair<string, string>("black", AppResources.Black),
+                new KeyValuePair<string, string>("nord", "Nord"),
             };
-            if(Device.RuntimePlatform == Device.Android)
-            {
-                ThemeOptions.Add(new KeyValuePair<string, string>("black", AppResources.Black));
-            }
-            ThemeOptions.Add(new KeyValuePair<string, string>("nord", "Nord"));
             UriMatchOptions = new List<KeyValuePair<UriMatchType?, string>>
             {
                 new KeyValuePair<UriMatchType?, string>(UriMatchType.Domain, AppResources.BaseDomain),
diff --git a/src/App/Styles/Black.xaml b/src/App/Styles/Black.xaml
index aade46508..bf5e183db 100644
--- a/src/App/Styles/Black.xaml
+++ b/src/App/Styles/Black.xaml
@@ -27,6 +27,7 @@
 
     <Color x:Key="ListItemBorderColor">#191919</Color>
     <Color x:Key="ListSectionBorderColor">#282828</Color>
+    <Color x:Key="ListSectionBorderBottomColor">#000000</Color>
     <Color x:Key="ListHeaderTextColor">#52bdfb</Color>
     <Color x:Key="ListHeaderBackgroundColor">#000000</Color>
 
@@ -37,7 +38,7 @@
 
     <Color x:Key="SwitchOnColor">#52bdfb</Color>
 
-    <Color x:Key="ButtonTextColor">#000000</Color>
+    <Color x:Key="ButtonTextColor">#ffffff</Color>
     <Color x:Key="ButtonBackgroundColor">#5A595B</Color>
 
     <Color x:Key="FabColor">#52bdfb</Color>
diff --git a/src/App/Styles/Dark.xaml b/src/App/Styles/Dark.xaml
index 96d41f934..b67b3dd4b 100644
--- a/src/App/Styles/Dark.xaml
+++ b/src/App/Styles/Dark.xaml
@@ -27,6 +27,7 @@
 
     <Color x:Key="ListItemBorderColor">#262626</Color>
     <Color x:Key="ListSectionBorderColor">#191919</Color>
+    <Color x:Key="ListSectionBorderBottomColor">#191919</Color>
     <Color x:Key="ListHeaderTextColor">#52bdfb</Color>
     <Color x:Key="ListHeaderBackgroundColor">#222222</Color>
 
diff --git a/src/App/Styles/Light.xaml b/src/App/Styles/Light.xaml
index 275596e88..a0d34dd27 100644
--- a/src/App/Styles/Light.xaml
+++ b/src/App/Styles/Light.xaml
@@ -27,6 +27,7 @@
 
     <Color x:Key="ListItemBorderColor">#f0f0f0</Color>
     <Color x:Key="ListSectionBorderColor">#dddddd</Color>
+    <Color x:Key="ListSectionBorderBottomColor">#dddddd</Color>
     <Color x:Key="ListHeaderTextColor">#3c8dbc</Color>
     <Color x:Key="ListHeaderBackgroundColor">#efeff4</Color>
 
diff --git a/src/App/Styles/Nord.xaml b/src/App/Styles/Nord.xaml
index 80b04f142..56c3098a4 100644
--- a/src/App/Styles/Nord.xaml
+++ b/src/App/Styles/Nord.xaml
@@ -27,8 +27,9 @@
 
     <Color x:Key="ListItemBorderColor">#2e3440</Color>
     <Color x:Key="ListSectionBorderColor">#2e3440</Color>
+    <Color x:Key="ListSectionBorderBottomColor">#2e3440</Color>
     <Color x:Key="ListHeaderTextColor">#81a1c1</Color>
-    <Color x:Key="ListHeaderBackgroundColor">#3b4252</Color>
+    <Color x:Key="ListHeaderBackgroundColor">#2e3440</Color>
 
     <Color x:Key="SliderThumbColor">#e5e9f0</Color>
     <Color x:Key="SliderThumbBorderColor">#2e3440</Color>
diff --git a/src/App/Styles/iOS.xaml b/src/App/Styles/iOS.xaml
index 48fc9785f..bd34ab898 100644
--- a/src/App/Styles/iOS.xaml
+++ b/src/App/Styles/iOS.xaml
@@ -123,7 +123,7 @@
     <Style TargetType="BoxView"
            Class="list-section-separator-bottom-platform">
         <Setter Property="Color"
-                Value="{StaticResource ListSectionBorderColor}" />
+                Value="{StaticResource ListSectionBorderBottomColor}" />
         <Setter Property="Margin"
                 Value="0, 0, 0, -1" />
     </Style>