diff --git a/AltStore/Components/HeaderContentViewController.swift b/AltStore/Components/HeaderContentViewController.swift
index 76b41a9d..8b3ffe5f 100644
--- a/AltStore/Components/HeaderContentViewController.swift
+++ b/AltStore/Components/HeaderContentViewController.swift
@@ -27,7 +27,7 @@ class HeaderContentViewController<Header: UIView, Content: ScrollableContentView
         didSet {
             guard self.isViewLoaded else { return }
             
-            self.view.tintColor = self.tintColor
+            self.view.tintColor = self.tintColor?.adjustedForDisplay
             self.update()
         }
     }
@@ -233,6 +233,8 @@ class HeaderContentViewController<Header: UIView, Content: ScrollableContentView
         
         // Start with navigation bar hidden.
         self.hideNavigationBar()
+        
+        self.view.tintColor = self.tintColor?.adjustedForDisplay
     }
     
     override func viewWillAppear(_ animated: Bool)
@@ -496,7 +498,22 @@ private extension HeaderContentViewController
         
         barAppearance.titleTextAttributes = [.foregroundColor: UIColor.clear]
         
-        let tintColor = isHidden ? UIColor.clear : self.tintColor ?? .altPrimary
+        let dynamicColor = UIColor { traitCollection in
+            var tintColor = self.tintColor ?? .altPrimary
+            
+            if traitCollection.userInterfaceStyle == .dark && tintColor.isTooDark
+            {
+                tintColor = .white
+            }
+            else
+            {
+                tintColor = tintColor.adjustedForDisplay
+            }
+            
+            return tintColor
+        }
+        
+        let tintColor = isHidden ? UIColor.clear : dynamicColor
         barAppearance.configureWithTintColor(tintColor)
         
         self.navigationItem.standardAppearance = barAppearance
diff --git a/AltStore/Sources/SourceDetailContentViewController.swift b/AltStore/Sources/SourceDetailContentViewController.swift
index 5c52fe5b..2bce3b21 100644
--- a/AltStore/Sources/SourceDetailContentViewController.swift
+++ b/AltStore/Sources/SourceDetailContentViewController.swift
@@ -60,8 +60,6 @@ class SourceDetailContentViewController: UICollectionViewController
     {
         super.viewDidLoad()
         
-        self.view.tintColor = self.source.effectiveTintColor
-        
         let collectionViewLayout = self.makeLayout(source: self.source)
         self.collectionView.collectionViewLayout = collectionViewLayout
         
diff --git a/AltStore/Sources/SourceDetailViewController.swift b/AltStore/Sources/SourceDetailViewController.swift
index 7621487a..a27ab248 100644
--- a/AltStore/Sources/SourceDetailViewController.swift
+++ b/AltStore/Sources/SourceDetailViewController.swift
@@ -195,7 +195,7 @@ class SourceDetailViewController: HeaderContentViewController<SourceHeaderView,
                 
             case false?:
                 title = NSLocalizedString("ADD", comment: "")
-                self.navigationBarButton.tintColor = self.source.effectiveTintColor ?? .altPrimary
+                self.navigationBarButton.tintColor = self.source.effectiveTintColor?.adjustedForDisplay ?? .altPrimary
                 
                 self.addButton.isHidden = false
                 self.navigationBarButton.isHidden = false