diff --git a/Mastodon.xcodeproj/xcshareddata/xcschemes/Mastodon.xcscheme b/Mastodon.xcodeproj/xcshareddata/xcschemes/Mastodon.xcscheme
index b99adf881..de059787b 100644
--- a/Mastodon.xcodeproj/xcshareddata/xcschemes/Mastodon.xcscheme
+++ b/Mastodon.xcodeproj/xcshareddata/xcschemes/Mastodon.xcscheme
@@ -86,13 +86,6 @@
             ReferencedContainer = "container:Mastodon.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-         <AdditionalOption
-            key = "NSZombieEnabled"
-            value = "YES"
-            isEnabled = "YES">
-         </AdditionalOption>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Mastodon/Scene/Profile/Header/ProfileHeaderViewController.swift b/Mastodon/Scene/Profile/Header/ProfileHeaderViewController.swift
index 20cedc497..9c9597224 100644
--- a/Mastodon/Scene/Profile/Header/ProfileHeaderViewController.swift
+++ b/Mastodon/Scene/Profile/Header/ProfileHeaderViewController.swift
@@ -46,17 +46,31 @@ final class ProfileHeaderViewController: UIViewController {
     
     let buttonBar: TMBar.ButtonBar = {
         let buttonBar = TMBar.ButtonBar()
-        buttonBar.buttons.customize { button in
-            button.selectedTintColor = Asset.Colors.Label.primary.color
-            button.tintColor = Asset.Colors.Label.secondary.color
-            button.backgroundColor = .clear
-        }
         buttonBar.indicator.backgroundColor = Asset.Colors.Label.primary.color
         buttonBar.backgroundView.style = .clear
         buttonBar.layout.contentInset = .zero
         return buttonBar
     }()
 
+    func customizeButtonBarAppearance() {
+        // The implmention use CATextlayer. Adapt for Dark Mode without dynamic colors
+        // Needs trigger update when `userInterfaceStyle` chagnes
+        let userInterfaceStyle = traitCollection.userInterfaceStyle
+        buttonBar.buttons.customize { button in
+            switch userInterfaceStyle {
+            case .dark:
+                // Asset.Colors.Label.primary.color
+                button.selectedTintColor = UIColor(red: 238.0/255.0, green: 238.0/255.0, blue: 238.0/255.0, alpha: 1.0)
+            default:
+                // Asset.Colors.Label.primary.color
+                button.selectedTintColor = UIColor(red: 40.0/255.0, green: 44.0/255.0, blue: 55.0/255.0, alpha: 1.0)
+            }
+            
+            button.tintColor = .secondaryLabel // UIColor(red: 60.0/255.0, green: 60.0/255.0, blue: 67.0/255.0, alpha: 1.0)
+            button.backgroundColor = .clear
+        }
+    }
+
     private var isBannerPinned = false
     private var bottomShadowAlpha: CGFloat = 0.0
 
@@ -95,6 +109,8 @@ extension ProfileHeaderViewController {
     
     override func viewDidLoad() {
         super.viewDidLoad()
+        
+        customizeButtonBarAppearance()
 
         view.backgroundColor = ThemeService.shared.currentTheme.value.systemBackgroundColor
         ThemeService.shared.currentTheme
@@ -247,6 +263,12 @@ extension ProfileHeaderViewController {
         setupBottomShadow()
     }
     
+    override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+        super.traitCollectionDidChange(previousTraitCollection)
+
+        customizeButtonBarAppearance()
+    }
+    
 }
 
 extension ProfileHeaderViewController {