diff --git a/BookPlayer/AudiobookShelf/Connection Screen/AudiobookShelfConnectionView.swift b/BookPlayer/AudiobookShelf/Connection Screen/AudiobookShelfConnectionView.swift
index 0840ec940..81d25370c 100644
--- a/BookPlayer/AudiobookShelf/Connection Screen/AudiobookShelfConnectionView.swift	
+++ b/BookPlayer/AudiobookShelf/Connection Screen/AudiobookShelfConnectionView.swift	
@@ -53,7 +53,7 @@ struct AudiobookShelfConnectionView: View {
       }
     }
     .scrollContentBackground(.hidden)
-    .background(theme.systemGroupedBackgroundColor)
+    .background(theme.systemBackgroundColor)
     .errorAlert(error: $error)
     .overlay {
       Group {
diff --git a/BookPlayer/AudiobookShelf/Connection Screen/AudiobookShelfDisconnectedView.swift b/BookPlayer/AudiobookShelf/Connection Screen/AudiobookShelfDisconnectedView.swift
index 6d12a882c..230071ed2 100644
--- a/BookPlayer/AudiobookShelf/Connection Screen/AudiobookShelfDisconnectedView.swift	
+++ b/BookPlayer/AudiobookShelf/Connection Screen/AudiobookShelfDisconnectedView.swift	
@@ -48,6 +48,7 @@ struct AudiobookShelfDisconnectedView: View {
       )
       .foregroundStyle(theme.secondaryColor)
     }
+    .listRowBackground(theme.tertiarySystemBackgroundColor)
     .onAppear {
       DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
         focusedField = .serverUrl
diff --git a/BookPlayer/Hardcover/Settings Page/HardcoverSettingsView.swift b/BookPlayer/Hardcover/Settings Page/HardcoverSettingsView.swift
index 582f953af..60eb75f38 100644
--- a/BookPlayer/Hardcover/Settings Page/HardcoverSettingsView.swift	
+++ b/BookPlayer/Hardcover/Settings Page/HardcoverSettingsView.swift	
@@ -45,6 +45,7 @@ struct HardcoverSettingsView: View {
             .foregroundStyle(theme.secondaryColor)
         }
       }
+      .listRowBackground(theme.tertiarySystemBackgroundColor)
 
       Section {
         Toggle("hardcover_auto_match_books".localized, isOn: $viewModel.autoMatch)
@@ -59,6 +60,7 @@ struct HardcoverSettingsView: View {
         Text("hardcover_automation_description".localized)
           .foregroundStyle(theme.secondaryColor)
       }
+      .listRowBackground(theme.tertiarySystemBackgroundColor)
 
       Section {
         VStack(alignment: .leading, spacing: 8) {
@@ -86,6 +88,7 @@ struct HardcoverSettingsView: View {
         Text("hardcover_progress_tracking_footer".localized)
           .foregroundStyle(theme.secondaryColor)
       }
+      .listRowBackground(theme.tertiarySystemBackgroundColor)
       .navigationBarTitleDisplayMode(.inline)
 
       if viewModel.showUnlinkButton {
@@ -100,7 +103,7 @@ struct HardcoverSettingsView: View {
       }
     }
     .scrollContentBackground(.hidden)
-    .background(theme.systemGroupedBackgroundColor)
+    .background(theme.systemBackgroundColor)
     .toolbar {
       navigationBar
     }
diff --git a/BookPlayer/Jellyfin/Connection Screen/JellyfinConnectionView.swift b/BookPlayer/Jellyfin/Connection Screen/JellyfinConnectionView.swift
index 0159fd1d4..3bc95f412 100644
--- a/BookPlayer/Jellyfin/Connection Screen/JellyfinConnectionView.swift	
+++ b/BookPlayer/Jellyfin/Connection Screen/JellyfinConnectionView.swift	
@@ -53,7 +53,7 @@ struct JellyfinConnectionView: View {
       }
     }
     .scrollContentBackground(.hidden)
-    .background(theme.systemGroupedBackgroundColor)
+    .background(theme.systemBackgroundColor)
     .errorAlert(error: $error)
     .overlay {
       Group {
diff --git a/BookPlayer/Jellyfin/Connection Screen/JellyfinDisconnectedView.swift b/BookPlayer/Jellyfin/Connection Screen/JellyfinDisconnectedView.swift
index 865c7c3cb..0d9203b33 100644
--- a/BookPlayer/Jellyfin/Connection Screen/JellyfinDisconnectedView.swift	
+++ b/BookPlayer/Jellyfin/Connection Screen/JellyfinDisconnectedView.swift	
@@ -48,6 +48,7 @@ struct JellyfinDisconnectedView: View {
       )
       .foregroundStyle(theme.secondaryColor)
     }
+    .listRowBackground(theme.tertiarySystemBackgroundColor)
     .onAppear {
       DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
         focusedField = .serverUrl
diff --git a/BookPlayer/Profile/Account/AccountDeleteSectionView.swift b/BookPlayer/Profile/Account/AccountDeleteSectionView.swift
index 2bf601473..30f547435 100644
--- a/BookPlayer/Profile/Account/AccountDeleteSectionView.swift
+++ b/BookPlayer/Profile/Account/AccountDeleteSectionView.swift
@@ -29,5 +29,6 @@ struct AccountDeleteSectionView: View {
         }
       }
     }
+    .listRowBackground(theme.tertiarySystemBackgroundColor)
   }
 }
diff --git a/BookPlayer/Profile/Account/AccountLogoutSectionView.swift b/BookPlayer/Profile/Account/AccountLogoutSectionView.swift
index 90a5fe448..362be03aa 100644
--- a/BookPlayer/Profile/Account/AccountLogoutSectionView.swift
+++ b/BookPlayer/Profile/Account/AccountLogoutSectionView.swift
@@ -36,6 +36,7 @@ struct AccountLogoutSectionView: View {
         }
       }
     }
+    .listRowBackground(theme.tertiarySystemBackgroundColor)
   }
 }
 
diff --git a/BookPlayer/Profile/Account/AccountManageProSectionView.swift b/BookPlayer/Profile/Account/AccountManageProSectionView.swift
index f061ec849..c08f67f15 100644
--- a/BookPlayer/Profile/Account/AccountManageProSectionView.swift
+++ b/BookPlayer/Profile/Account/AccountManageProSectionView.swift
@@ -38,6 +38,7 @@ struct AccountManageProSectionView: View {
         }
       }
     }
+    .listRowBackground(theme.tertiarySystemBackgroundColor)
   }
 }
 
diff --git a/BookPlayer/Profile/Account/AccountPasskeySectionView.swift b/BookPlayer/Profile/Account/AccountPasskeySectionView.swift
index cd4ace136..fae680d81 100644
--- a/BookPlayer/Profile/Account/AccountPasskeySectionView.swift
+++ b/BookPlayer/Profile/Account/AccountPasskeySectionView.swift
@@ -35,6 +35,7 @@ struct AccountPasskeySectionView: View {
       Text("Passkey")
         .foregroundStyle(theme.secondaryColor)
     }
+    .listRowBackground(theme.tertiarySystemBackgroundColor)
     .onAppear {
       Task {
         await loadPasskey()
diff --git a/BookPlayer/Profile/Account/AccountTermsConditionsSectionView.swift b/BookPlayer/Profile/Account/AccountTermsConditionsSectionView.swift
index 1c71206fb..c03b2fb15 100644
--- a/BookPlayer/Profile/Account/AccountTermsConditionsSectionView.swift
+++ b/BookPlayer/Profile/Account/AccountTermsConditionsSectionView.swift
@@ -43,6 +43,7 @@ struct AccountTermsConditionsSectionView: View {
         }
       }
     }
+    .listRowBackground(theme.tertiarySystemBackgroundColor)
   }
 }
 
diff --git a/BookPlayer/Profile/Account/AccountView.swift b/BookPlayer/Profile/Account/AccountView.swift
index 186d7064d..234ac4c43 100644
--- a/BookPlayer/Profile/Account/AccountView.swift
+++ b/BookPlayer/Profile/Account/AccountView.swift
@@ -37,7 +37,7 @@ struct AccountView: View {
     .navigationTitle(accountService.account.email)
     .navigationBarTitleDisplayMode(.inline)
     .miniPlayerSafeAreaInset()
-    .applyListStyle(with: theme, background: theme.systemGroupedBackgroundColor)
+    .applyListStyle(with: theme, background: theme.systemBackgroundColor)
     .errorAlert(error: $loadingState.error)
     .loadingOverlay(loadingState.show)
     .alert("Delete Account", isPresented: $showDeleteAlert) {
diff --git a/BookPlayer/Profile/Profile/ProfileCardSectionView.swift b/BookPlayer/Profile/Profile/ProfileCardSectionView.swift
index 60091f7df..4e3fc9c6d 100644
--- a/BookPlayer/Profile/Profile/ProfileCardSectionView.swift
+++ b/BookPlayer/Profile/Profile/ProfileCardSectionView.swift
@@ -11,7 +11,8 @@ import SwiftUI
 
 struct ProfileCardSectionView: View {
   @Environment(\.accountService) private var accountService
-
+  @EnvironmentObject private var theme: ThemeViewModel
+  
   var action: () -> Void
 
   var body: some View {
@@ -20,6 +21,7 @@ struct ProfileCardSectionView: View {
         ProfileCardView(email: accountService.account.email)
       }
     }
+    .listRowBackground(theme.tertiarySystemBackgroundColor)
   }
 }
 
diff --git a/BookPlayer/Profile/Profile/ProfileView.swift b/BookPlayer/Profile/Profile/ProfileView.swift
index 83eaf00e3..9a29e2af9 100644
--- a/BookPlayer/Profile/Profile/ProfileView.swift
+++ b/BookPlayer/Profile/Profile/ProfileView.swift
@@ -36,7 +36,7 @@ struct ProfileView: View {
         }
       }
       .miniPlayerSafeAreaInset()
-      .applyListStyle(with: theme, background: theme.systemGroupedBackgroundColor)
+      .applyListStyle(with: theme, background: theme.systemBackgroundColor)
       .navigationTitle("profile_title")
       .navigationBarTitleDisplayMode(.inline)
       .navigationDestination(for: ProfileScreen.self) { destination in
diff --git a/BookPlayer/Profile/Profile/QueuedSyncTasksView.swift b/BookPlayer/Profile/Profile/QueuedSyncTasksView.swift
index dea320f92..863fb2bd8 100644
--- a/BookPlayer/Profile/Profile/QueuedSyncTasksView.swift
+++ b/BookPlayer/Profile/Profile/QueuedSyncTasksView.swift
@@ -49,7 +49,7 @@ struct QueuedSyncTasksView: View {
       }
     }
     .scrollContentBackground(.hidden)
-    .background(theme.systemGroupedBackgroundColor)
+    .background(theme.systemBackgroundColor)
     .toolbarColorScheme(theme.useDarkVariant ? .dark : .light, for: .navigationBar)
     .navigationTitle("tasks_title")
     .navigationBarTitleDisplayMode(.inline)
diff --git a/BookPlayer/Search/SearchView.swift b/BookPlayer/Search/SearchView.swift
index 5aa78b01b..7310ddea0 100644
--- a/BookPlayer/Search/SearchView.swift
+++ b/BookPlayer/Search/SearchView.swift
@@ -31,7 +31,7 @@ struct SearchView: View {
         }
       }
       .miniPlayerSafeAreaInset()
-      .applyListStyle(with: theme, background: theme.systemGroupedBackgroundColor)
+      .applyListStyle(with: theme, background: theme.systemBackgroundColor)
       .navigationTitle("search_title".localized)
       .searchable(
         text: $viewModel.searchText,
diff --git a/BookPlayer/Settings/Autolock/SettingsAutolockView.swift b/BookPlayer/Settings/Autolock/SettingsAutolockView.swift
index b0cb6afe1..70d5ad6ab 100644
--- a/BookPlayer/Settings/Autolock/SettingsAutolockView.swift
+++ b/BookPlayer/Settings/Autolock/SettingsAutolockView.swift
@@ -41,9 +41,10 @@ struct SettingsAutolockView: View {
         Text("settings_autolock_description".localized)
           .foregroundStyle(theme.secondaryColor)
       }
+      .listRowBackground(theme.tertiarySystemBackgroundColor)
     }
     .scrollContentBackground(.hidden)
-    .background(theme.systemGroupedBackgroundColor)
+    .background(theme.systemBackgroundColor)
     .navigationTitle(viewModel.navigationTitle)
     .navigationBarTitleDisplayMode(.inline)
   }
diff --git a/BookPlayer/Settings/Autoplay/SettingsAutoplayView.swift b/BookPlayer/Settings/Autoplay/SettingsAutoplayView.swift
index 872a1bda6..c9aa42e8d 100644
--- a/BookPlayer/Settings/Autoplay/SettingsAutoplayView.swift
+++ b/BookPlayer/Settings/Autoplay/SettingsAutoplayView.swift
@@ -41,9 +41,10 @@ struct SettingsAutoplayView: View {
         Text("settings_autoplay_description".localized)
           .foregroundStyle(theme.secondaryColor)
       }
+      .listRowBackground(theme.tertiarySystemBackgroundColor)
     }
     .scrollContentBackground(.hidden)
-    .background(theme.systemGroupedBackgroundColor)
+    .background(theme.systemBackgroundColor)
     .navigationTitle(viewModel.navigationTitle)
     .navigationBarTitleDisplayMode(.inline)
   }
diff --git a/BookPlayer/Settings/Icons/SettingsAppIconsView.swift b/BookPlayer/Settings/Icons/SettingsAppIconsView.swift
index b6261fc5c..257ea8cf8 100644
--- a/BookPlayer/Settings/Icons/SettingsAppIconsView.swift
+++ b/BookPlayer/Settings/Icons/SettingsAppIconsView.swift
@@ -26,11 +26,12 @@ struct SettingsAppIconsView: View {
       ForEach(icons) { item in
         AppIconView(icon: item)
       }
+      .listRowBackground(theme.tertiarySystemBackgroundColor)
     }
     .environment(\.loadingState, loadingState)
     .errorAlert(error: $loadingState.error)
     .scrollContentBackground(.hidden)
-    .background(theme.systemGroupedBackgroundColor)
+    .background(theme.systemBackgroundColor)
     .navigationTitle("settings_app_icon_title")
     .navigationBarTitleDisplayMode(.inline)
     .alert("purchases_restored_title", isPresented: $showRestoredAlert) {
diff --git a/BookPlayer/Settings/Sections/PlayerControls/AutoSleepTimerSectionView.swift b/BookPlayer/Settings/Sections/PlayerControls/AutoSleepTimerSectionView.swift
index fb2391a10..000f7f599 100644
--- a/BookPlayer/Settings/Sections/PlayerControls/AutoSleepTimerSectionView.swift
+++ b/BookPlayer/Settings/Sections/PlayerControls/AutoSleepTimerSectionView.swift
@@ -25,6 +25,7 @@ struct AutoSleepTimerSectionView: View {
         .bpFont(.caption)
         .foregroundStyle(theme.secondaryColor)
     }
+    .listRowBackground(theme.tertiarySystemBackgroundColor)
   }
 }
 
diff --git a/BookPlayer/Settings/Sections/PlayerControls/BoostVolumeSectionView.swift b/BookPlayer/Settings/Sections/PlayerControls/BoostVolumeSectionView.swift
index dd45dce5f..0a3a9c760 100644
--- a/BookPlayer/Settings/Sections/PlayerControls/BoostVolumeSectionView.swift
+++ b/BookPlayer/Settings/Sections/PlayerControls/BoostVolumeSectionView.swift
@@ -29,6 +29,7 @@ struct BoostVolumeSectionView: View {
         .bpFont(.caption)
         .foregroundStyle(theme.secondaryColor)
     }
+    .listRowBackground(theme.tertiarySystemBackgroundColor)
   }
 }
 
diff --git a/BookPlayer/Settings/Sections/PlayerControls/GlobalSpeedSectionView.swift b/BookPlayer/Settings/Sections/PlayerControls/GlobalSpeedSectionView.swift
index 311e4a59c..3333893fe 100644
--- a/BookPlayer/Settings/Sections/PlayerControls/GlobalSpeedSectionView.swift
+++ b/BookPlayer/Settings/Sections/PlayerControls/GlobalSpeedSectionView.swift
@@ -73,6 +73,7 @@ struct GlobalSpeedSectionView: View {
         .bpFont(.caption)
         .foregroundStyle(theme.secondaryColor)
     }
+    .listRowBackground(theme.tertiarySystemBackgroundColor)
   }
 }
 
diff --git a/BookPlayer/Settings/Sections/PlayerControls/ListOptionsSectionView.swift b/BookPlayer/Settings/Sections/PlayerControls/ListOptionsSectionView.swift
index 2ca4da875..8fb8573f8 100644
--- a/BookPlayer/Settings/Sections/PlayerControls/ListOptionsSectionView.swift
+++ b/BookPlayer/Settings/Sections/PlayerControls/ListOptionsSectionView.swift
@@ -47,6 +47,7 @@ struct ListOptionsSectionView: View {
         .bpFont(.caption)
         .foregroundStyle(theme.secondaryColor)
     }
+    .listRowBackground(theme.tertiarySystemBackgroundColor)
   }
 }
 
diff --git a/BookPlayer/Settings/Sections/PlayerControls/ProgressLabelsSectionView.swift b/BookPlayer/Settings/Sections/PlayerControls/ProgressLabelsSectionView.swift
index c937d49e0..28c15d4e2 100644
--- a/BookPlayer/Settings/Sections/PlayerControls/ProgressLabelsSectionView.swift
+++ b/BookPlayer/Settings/Sections/PlayerControls/ProgressLabelsSectionView.swift
@@ -40,6 +40,7 @@ struct ProgressLabelsSectionView: View {
         .bpFont(.caption)
         .foregroundStyle(theme.secondaryColor)
     }
+    .listRowBackground(theme.tertiarySystemBackgroundColor)
   }
 
   func handleValueUpdated() {
diff --git a/BookPlayer/Settings/Sections/PlayerControls/ProgressSeekingSectionView.swift b/BookPlayer/Settings/Sections/PlayerControls/ProgressSeekingSectionView.swift
index e22f82982..57cb5fdb9 100644
--- a/BookPlayer/Settings/Sections/PlayerControls/ProgressSeekingSectionView.swift
+++ b/BookPlayer/Settings/Sections/PlayerControls/ProgressSeekingSectionView.swift
@@ -29,6 +29,7 @@ struct ProgressSeekingSectionView: View {
         .bpFont(.caption)
         .foregroundStyle(theme.secondaryColor)
     }
+    .listRowBackground(theme.tertiarySystemBackgroundColor)
   }
 }
 
diff --git a/BookPlayer/Settings/Sections/PlayerControls/SettingsPlayerControlsView.swift b/BookPlayer/Settings/Sections/PlayerControls/SettingsPlayerControlsView.swift
index 3c35860e9..0feb4a33a 100644
--- a/BookPlayer/Settings/Sections/PlayerControls/SettingsPlayerControlsView.swift
+++ b/BookPlayer/Settings/Sections/PlayerControls/SettingsPlayerControlsView.swift
@@ -12,7 +12,7 @@ struct SettingsPlayerControlsView: View {
   @StateObject var theme = ThemeViewModel()
 
   var body: some View {
-    Form {
+    List {
       SkipIntervalsSectionView()
       SmartRewindSectionView()
       AutoSleepTimerSectionView()
@@ -22,10 +22,10 @@ struct SettingsPlayerControlsView: View {
       ListOptionsSectionView()
       ProgressLabelsSectionView()
     }
+    .listRowBackground(theme.tertiarySystemBackgroundColor)
     .environmentObject(theme)
     .scrollContentBackground(.hidden)
     .background(theme.systemBackgroundColor)
-    .listRowBackground(theme.systemGroupedBackgroundColor)
     .navigationTitle("settings_controls_title")
     .navigationBarTitleDisplayMode(.inline)
   }
diff --git a/BookPlayer/Settings/Sections/PlayerControls/SkipIntervalsSectionView.swift b/BookPlayer/Settings/Sections/PlayerControls/SkipIntervalsSectionView.swift
index c65e710e1..5db10e7a2 100644
--- a/BookPlayer/Settings/Sections/PlayerControls/SkipIntervalsSectionView.swift
+++ b/BookPlayer/Settings/Sections/PlayerControls/SkipIntervalsSectionView.swift
@@ -73,6 +73,7 @@ struct SkipIntervalsSectionView: View {
         .bpFont(.caption)
         .foregroundStyle(theme.secondaryColor)
     }
+    .listRowBackground(theme.tertiarySystemBackgroundColor)
   }
 }
 
diff --git a/BookPlayer/Settings/Sections/PlayerControls/SmartRewindSectionView.swift b/BookPlayer/Settings/Sections/PlayerControls/SmartRewindSectionView.swift
index 32c3487f2..990a40c3a 100644
--- a/BookPlayer/Settings/Sections/PlayerControls/SmartRewindSectionView.swift
+++ b/BookPlayer/Settings/Sections/PlayerControls/SmartRewindSectionView.swift
@@ -56,6 +56,7 @@ struct SmartRewindSectionView: View {
         .bpFont(.caption)
         .foregroundStyle(theme.secondaryColor)
     }
+    .listRowBackground(theme.tertiarySystemBackgroundColor)
   }
 }
 
diff --git a/BookPlayer/Settings/Sections/SettingsAppearanceSectionView.swift b/BookPlayer/Settings/Sections/SettingsAppearanceSectionView.swift
index 0fb41099d..59659cae3 100644
--- a/BookPlayer/Settings/Sections/SettingsAppearanceSectionView.swift
+++ b/BookPlayer/Settings/Sections/SettingsAppearanceSectionView.swift
@@ -103,6 +103,7 @@ struct SettingsAppearanceSectionView: View {
         .bpFont(.subheadline)
         .foregroundStyle(theme.secondaryColor)
     }
+    .listRowBackground(theme.tertiarySystemBackgroundColor)
   }
 }
 
diff --git a/BookPlayer/Settings/Sections/SettingsCreditsSectionView.swift b/BookPlayer/Settings/Sections/SettingsCreditsSectionView.swift
index 4fd3d9d4a..b20784142 100644
--- a/BookPlayer/Settings/Sections/SettingsCreditsSectionView.swift
+++ b/BookPlayer/Settings/Sections/SettingsCreditsSectionView.swift
@@ -15,6 +15,7 @@ struct SettingsCreditsSectionView: View {
     Section {
       NavigationLink("settings_credits_title", value: SettingsScreen.credits)
     }
+    .listRowBackground(theme.tertiarySystemBackgroundColor)
   }
 }
 
diff --git a/BookPlayer/Settings/Sections/SettingsIntegrationsSectionView.swift b/BookPlayer/Settings/Sections/SettingsIntegrationsSectionView.swift
index 335e2bf30..30acf18e7 100644
--- a/BookPlayer/Settings/Sections/SettingsIntegrationsSectionView.swift
+++ b/BookPlayer/Settings/Sections/SettingsIntegrationsSectionView.swift
@@ -31,6 +31,7 @@ struct SettingsIntegrationsSectionView: View {
         .bpFont(.subheadline)
         .foregroundStyle(theme.secondaryColor)
     }
+    .listRowBackground(theme.tertiarySystemBackgroundColor)
   }
 }
 
diff --git a/BookPlayer/Settings/Sections/SettingsPlaybackSectionView.swift b/BookPlayer/Settings/Sections/SettingsPlaybackSectionView.swift
index 2e68edb90..7401ed70f 100644
--- a/BookPlayer/Settings/Sections/SettingsPlaybackSectionView.swift
+++ b/BookPlayer/Settings/Sections/SettingsPlaybackSectionView.swift
@@ -31,6 +31,7 @@ struct SettingsPlaybackSectionView: View {
         .bpFont(.subheadline)
         .foregroundStyle(theme.secondaryColor)
     }
+    .listRowBackground(theme.tertiarySystemBackgroundColor)
   }
 }
 
diff --git a/BookPlayer/Settings/Sections/SettingsPrivacySectionView.swift b/BookPlayer/Settings/Sections/SettingsPrivacySectionView.swift
index 5853004fa..6c5b87689 100644
--- a/BookPlayer/Settings/Sections/SettingsPrivacySectionView.swift
+++ b/BookPlayer/Settings/Sections/SettingsPrivacySectionView.swift
@@ -35,6 +35,7 @@ struct SettingsPrivacySectionView: View {
         .bpFont(.caption)
         .foregroundStyle(theme.secondaryColor)
     }
+    .listRowBackground(theme.tertiarySystemBackgroundColor)
   }
 }
 
diff --git a/BookPlayer/Settings/Sections/SettingsProBannerSectionView.swift b/BookPlayer/Settings/Sections/SettingsProBannerSectionView.swift
index 9d9bd3c12..5199d1a99 100644
--- a/BookPlayer/Settings/Sections/SettingsProBannerSectionView.swift
+++ b/BookPlayer/Settings/Sections/SettingsProBannerSectionView.swift
@@ -41,6 +41,7 @@ struct SettingsProBannerSectionView: View {
         }
       }
     }
+    .listRowBackground(theme.tertiarySystemBackgroundColor)
   }
 }
 
diff --git a/BookPlayer/Settings/Sections/SettingsShortcutsSectionView.swift b/BookPlayer/Settings/Sections/SettingsShortcutsSectionView.swift
index 108e8e505..d012cdf2b 100644
--- a/BookPlayer/Settings/Sections/SettingsShortcutsSectionView.swift
+++ b/BookPlayer/Settings/Sections/SettingsShortcutsSectionView.swift
@@ -22,6 +22,7 @@ struct SettingsShortcutsSectionView: View {
         .bpFont(.subheadline)
         .foregroundStyle(theme.secondaryColor)
     }
+    .listRowBackground(theme.tertiarySystemBackgroundColor)
   }
 }
 
diff --git a/BookPlayer/Settings/Sections/SettingsSupportSectionView.swift b/BookPlayer/Settings/Sections/SettingsSupportSectionView.swift
index 6d9a1f8e7..b4c066a86 100644
--- a/BookPlayer/Settings/Sections/SettingsSupportSectionView.swift
+++ b/BookPlayer/Settings/Sections/SettingsSupportSectionView.swift
@@ -83,6 +83,7 @@ struct SettingsSupportSectionView: View {
         .bpFont(.caption)
         .foregroundStyle(theme.secondaryColor)
     }
+    .listRowBackground(theme.tertiarySystemBackgroundColor)
   }
 
   private var appVersion: String {
diff --git a/BookPlayer/Settings/Sections/SettingsTipJarView.swift b/BookPlayer/Settings/Sections/SettingsTipJarView.swift
index 533ced6cd..0b22cbc69 100644
--- a/BookPlayer/Settings/Sections/SettingsTipJarView.swift
+++ b/BookPlayer/Settings/Sections/SettingsTipJarView.swift
@@ -66,7 +66,7 @@ struct SettingsTipJarView: View {
     }
     .errorAlert(error: $loadingState.error)
     .padding(.horizontal, Spacing.M)
-    .background(theme.systemGroupedBackgroundColor)
+    .background(theme.systemBackgroundColor)
     .environment(\.loadingState, loadingState)
     .navigationTitle("settings_tip_jar_title")
     .navigationBarTitleDisplayMode(.inline)
diff --git a/BookPlayer/Settings/Sections/SettingsTipOptionsView.swift b/BookPlayer/Settings/Sections/SettingsTipOptionsView.swift
index e0b68397b..4cc5eb898 100644
--- a/BookPlayer/Settings/Sections/SettingsTipOptionsView.swift
+++ b/BookPlayer/Settings/Sections/SettingsTipOptionsView.swift
@@ -11,15 +11,19 @@ import SwiftUI
 
 struct SettingsTipOptionsView: View {
   let purchaseCompleted: () -> Void
-
+  @EnvironmentObject var theme: ThemeViewModel
+  
   var body: some View {
     HStack(spacing: 21) {
       SettingsTipView(tipOption: .kind, purchaseCompleted: purchaseCompleted)
         .frame(width: 100)
+        .background(theme.tertiarySystemBackgroundColor)
       SettingsTipView(tipOption: .excellent, purchaseCompleted: purchaseCompleted)
         .frame(width: 100)
+        .background(theme.tertiarySystemBackgroundColor)
       SettingsTipView(tipOption: .incredible, purchaseCompleted: purchaseCompleted)
         .frame(width: 100)
+        .background(theme.tertiarySystemBackgroundColor)
     }
   }
 }
diff --git a/BookPlayer/Settings/Sections/SettingsiCloudSectionView.swift b/BookPlayer/Settings/Sections/SettingsiCloudSectionView.swift
index 233570891..dd323ec90 100644
--- a/BookPlayer/Settings/Sections/SettingsiCloudSectionView.swift
+++ b/BookPlayer/Settings/Sections/SettingsiCloudSectionView.swift
@@ -34,6 +34,7 @@ struct SettingsiCloudSectionView: View {
         .bpFont(.subheadline)
         .foregroundStyle(theme.secondaryColor)
     }
+    .listRowBackground(theme.tertiarySystemBackgroundColor)
   }
 
   func handleUpdate(_ flag: Bool) -> Bool {
diff --git a/BookPlayer/Settings/SettingsView.swift b/BookPlayer/Settings/SettingsView.swift
index 1699c6b1f..edc7dae35 100644
--- a/BookPlayer/Settings/SettingsView.swift
+++ b/BookPlayer/Settings/SettingsView.swift
@@ -60,7 +60,7 @@ struct SettingsView: View {
       .environment(\.loadingState, loadingState)
       .navigationTitle("settings_title")
       .navigationBarTitleDisplayMode(.inline)
-      .applyListStyle(with: theme, background: theme.systemGroupedBackgroundColor)
+      .applyListStyle(with: theme, background: theme.systemBackgroundColor)
       .miniPlayerSafeAreaInset()
       .sheet(isPresented: $showMailModal) {
         SettingsMailView(
diff --git a/BookPlayer/Settings/Storage/SettingsDataUsageSectionView.swift b/BookPlayer/Settings/Storage/SettingsDataUsageSectionView.swift
index e33fc6a7f..28d9907a4 100644
--- a/BookPlayer/Settings/Storage/SettingsDataUsageSectionView.swift
+++ b/BookPlayer/Settings/Storage/SettingsDataUsageSectionView.swift
@@ -25,6 +25,7 @@ struct SettingsDataUsageSectionView: View {
         .bpFont(.subheadline)
         .foregroundStyle(theme.secondaryColor)
     }
+    .listRowBackground(theme.tertiarySystemBackgroundColor)
   }
 }
 
diff --git a/BookPlayer/Settings/Storage/SettingsStorageSectionView.swift b/BookPlayer/Settings/Storage/SettingsStorageSectionView.swift
index 9ab8f69d3..ef2090c2f 100644
--- a/BookPlayer/Settings/Storage/SettingsStorageSectionView.swift
+++ b/BookPlayer/Settings/Storage/SettingsStorageSectionView.swift
@@ -30,6 +30,7 @@ struct SettingsStorageSectionView: View {
         .bpFont(.subheadline)
         .foregroundStyle(theme.secondaryColor)
     }
+    .listRowBackground(theme.tertiarySystemBackgroundColor)
   }
 }
 
diff --git a/BookPlayer/Settings/Storage/StorageCloudDeletedView.swift b/BookPlayer/Settings/Storage/StorageCloudDeletedView.swift
index 8ae517cec..181e0f65b 100644
--- a/BookPlayer/Settings/Storage/StorageCloudDeletedView.swift
+++ b/BookPlayer/Settings/Storage/StorageCloudDeletedView.swift
@@ -31,6 +31,7 @@ struct StorageCloudDeletedView<Model: StorageCloudDeletedViewModelProtocol>: Vie
           }
           .accessibilityElement(children: .combine)
         }
+        .listRowBackground(theme.tertiarySystemBackgroundColor)
 
         Section {
           LazyVStack(spacing: 0) {
@@ -71,9 +72,10 @@ struct StorageCloudDeletedView<Model: StorageCloudDeletedViewModelProtocol>: Vie
             }
           }
         }
+        .listRowBackground(theme.tertiarySystemBackgroundColor)
       }
       .scrollContentBackground(.hidden)
-      .background(theme.systemGroupedBackgroundColor)
+      .background(theme.systemBackgroundColor)
       .navigationTitle(viewModel.navigationTitle)
       .navigationBarTitleDisplayMode(.inline)
       .toolbar {
diff --git a/BookPlayer/Settings/Storage/StorageView.swift b/BookPlayer/Settings/Storage/StorageView.swift
index 2153d0522..d1cedc832 100644
--- a/BookPlayer/Settings/Storage/StorageView.swift
+++ b/BookPlayer/Settings/Storage/StorageView.swift
@@ -58,6 +58,7 @@ struct StorageView<Model: StorageViewModelProtocol>: View {
           }
           .accessibilityElement(children: .combine)
         }
+        .listRowBackground(theme.tertiarySystemBackgroundColor)
 
         Section {
           List {
@@ -96,9 +97,10 @@ struct StorageView<Model: StorageViewModelProtocol>: View {
             }
           }
         }
+        .listRowBackground(theme.tertiarySystemBackgroundColor)
       }
       .scrollContentBackground(.hidden)
-      .background(theme.systemGroupedBackgroundColor)
+      .background(theme.systemBackgroundColor)
       .navigationTitle(viewModel.navigationTitle)
       .navigationBarTitleDisplayMode(.inline)
       .toolbar {
diff --git a/BookPlayer/Settings/Themes/SettingsThemesView.swift b/BookPlayer/Settings/Themes/SettingsThemesView.swift
index e9d1aea7f..036574be6 100644
--- a/BookPlayer/Settings/Themes/SettingsThemesView.swift
+++ b/BookPlayer/Settings/Themes/SettingsThemesView.swift
@@ -86,6 +86,7 @@ struct SettingsThemesView: View {
             .foregroundStyle(theme.secondaryColor)
         }
       }
+      .listRowBackground(theme.tertiarySystemBackgroundColor)
 
       Section {
         ForEach(themes) { item in
@@ -96,11 +97,12 @@ struct SettingsThemesView: View {
           .bpFont(.subheadline)
           .foregroundStyle(theme.secondaryColor)
       }
+      .listRowBackground(theme.tertiarySystemBackgroundColor)
     }
     .environment(\.loadingState, loadingState)
     .errorAlert(error: $loadingState.error)
     .scrollContentBackground(.hidden)
-    .background(theme.systemGroupedBackgroundColor)
+    .background(theme.systemBackgroundColor)
     .navigationTitle("themes_title")
     .navigationBarTitleDisplayMode(.inline)
     .alert("purchases_restored_title", isPresented: $showRestoredAlert) {