diff --git a/src/App/Pages/Settings/SettingsPage/SettingsPage.xaml b/src/App/Pages/Settings/SettingsPage/SettingsPage.xaml
index ba6808bf3..71cda8c06 100644
--- a/src/App/Pages/Settings/SettingsPage/SettingsPage.xaml
+++ b/src/App/Pages/Settings/SettingsPage/SettingsPage.xaml
@@ -57,7 +57,9 @@
         <ListView.GroupHeaderTemplate>
             <DataTemplate x:DataType="pages:SettingsPageListGroup">
                 <ViewCell>
-                    <StackLayout Padding="0" Spacing="0" VerticalOptions="FillAndExpand">
+                    <StackLayout
+                        Padding="0" Spacing="0" VerticalOptions="FillAndExpand"
+                        StyleClass="list-row-header-container, list-row-header-container-platform">>
                         <BoxView
                           StyleClass="list-section-separator-top, list-section-separator-top-platform"
                           IsVisible="{Binding First, Converter={StaticResource inverseBool}}" />
@@ -66,7 +68,7 @@
                                 Text="{Binding Name}"
                                 StyleClass="list-header, list-header-platform" />
                         </StackLayout>
-                      <BoxView StyleClass="list-section-separator-bottom, list-section-separator-bottom-platform" />
+                        <BoxView StyleClass="list-section-separator-bottom, list-section-separator-bottom-platform" />
                     </StackLayout>
                 </ViewCell>
             </DataTemplate>
diff --git a/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml b/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml
index 302430546..8577c71b0 100644
--- a/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml
+++ b/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml
@@ -111,7 +111,9 @@
                     <ListView.GroupHeaderTemplate>
                         <DataTemplate x:DataType="pages:GroupingsPageListGroup">
                             <ViewCell>
-                                <StackLayout Spacing="0" Padding="0" VerticalOptions="FillAndExpand">
+                                <StackLayout
+                                    Spacing="0" Padding="0" VerticalOptions="FillAndExpand"
+                                    StyleClass="list-row-header-container, list-row-header-container-platform">
                                     <BoxView
                                         StyleClass="list-section-separator-top, list-section-separator-top-platform"
                                         IsVisible="{Binding First, Converter={StaticResource inverseBool}}" />
diff --git a/src/App/Styles/Black.xaml b/src/App/Styles/Black.xaml
index 961f6417f..f2a5cacfd 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="ListHeaderTextColor">#52bdfb</Color>
+    <Color x:Key="ListHeaderBackgroundColor">#000000</Color>
 
     <Color x:Key="SliderThumbColor">#B9B9B9</Color>
     <Color x:Key="SliderThumbBorderColor">#000000</Color>
diff --git a/src/App/Styles/Dark.xaml b/src/App/Styles/Dark.xaml
index f0c2f9271..df830d32d 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="ListHeaderTextColor">#52bdfb</Color>
+    <Color x:Key="ListHeaderBackgroundColor">#efeff4</Color>
 
     <Color x:Key="SliderThumbColor">#B9B9B9</Color>
     <Color x:Key="SliderThumbBorderColor">#000000</Color>
diff --git a/src/App/Styles/Light.xaml b/src/App/Styles/Light.xaml
index 134f1ae47..50827c47e 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="ListHeaderTextColor">#3c8dbc</Color>
+    <Color x:Key="ListHeaderBackgroundColor">#efeff4</Color>
 
     <Color x:Key="SliderThumbColor">#ffffff</Color>
     <Color x:Key="SliderThumbBorderColor">#b5b5b5</Color>
diff --git a/src/App/Styles/Nord.xaml b/src/App/Styles/Nord.xaml
index e3b130a22..e34e37e6f 100644
--- a/src/App/Styles/Nord.xaml
+++ b/src/App/Styles/Nord.xaml
@@ -27,6 +27,7 @@
     <Color x:Key="ListItemBorderColor">#2e3440</Color>
     <Color x:Key="ListSectionBorderColor">#2e3440</Color>
     <Color x:Key="ListHeaderTextColor">#81a1c1</Color>
+    <Color x:Key="ListHeaderBackgroundColor">#3b4252</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 74388117a..cfc08b0ca 100644
--- a/src/App/Styles/iOS.xaml
+++ b/src/App/Styles/iOS.xaml
@@ -21,6 +21,11 @@
         <Setter Property="SeparatorColor"
                 Value="{StaticResource ListItemBorderColor}" />
     </Style>
+    <Style TargetType="StackLayout"
+           Class="list-row-header-container-platform">
+        <Setter Property="BackgroundColor"
+                Value="{StaticResource ListHeaderBackgroundColor}" />
+    </Style>
     <Style TargetType="StackLayout"
            Class="list-row-header-platform">
         <Setter Property="Padding"