diff --git a/Mastodon/Scene/Profile/Header/View/ProfileHeaderView+Configuration.swift b/Mastodon/Scene/Profile/Header/View/ProfileHeaderView+Configuration.swift
index aa5c32ab9..ac33227cc 100644
--- a/Mastodon/Scene/Profile/Header/View/ProfileHeaderView+Configuration.swift
+++ b/Mastodon/Scene/Profile/Header/View/ProfileHeaderView+Configuration.swift
@@ -33,7 +33,7 @@ extension ProfileHeaderView {
             .assign(to: \.name, on: viewModel)
             .store(in: &disposeBag)
         // username
-        viewModel.username = user.username
+        viewModel.acct = user.acctWithDomain
         // bio
         user.publisher(for: \.note)
             .assign(to: \.note, on: viewModel)
diff --git a/Mastodon/Scene/Profile/Header/View/ProfileHeaderView+ViewModel.swift b/Mastodon/Scene/Profile/Header/View/ProfileHeaderView+ViewModel.swift
index f49abd8ec..808e1d7ba 100644
--- a/Mastodon/Scene/Profile/Header/View/ProfileHeaderView+ViewModel.swift
+++ b/Mastodon/Scene/Profile/Header/View/ProfileHeaderView+ViewModel.swift
@@ -33,7 +33,7 @@ extension ProfileHeaderView {
         @Published var name: String?
         @Published var nameEditing: String?
         
-        @Published var username: String?
+        @Published var acct: String?
         
         @Published var note: String?
         @Published var noteEditing: String?
@@ -133,8 +133,8 @@ extension ProfileHeaderView.ViewModel {
         }
         .store(in: &disposeBag)
         // username
-        $username
-            .map { username in username.flatMap { "@" + $0 } ?? " " }
+        $acct
+            .map { acct in acct.flatMap { "@" + $0 } ?? " " }
             .assign(to: \.text, on: view.usernameLabel)
             .store(in: &disposeBag)
         // bio
diff --git a/Mastodon/Scene/Share/View/Content/PollOptionView+Configuration.swift b/Mastodon/Scene/Share/View/Content/PollOptionView+Configuration.swift
index 717c35f82..99b0f3b6b 100644
--- a/Mastodon/Scene/Share/View/Content/PollOptionView+Configuration.swift
+++ b/Mastodon/Scene/Share/View/Content/PollOptionView+Configuration.swift
@@ -101,7 +101,9 @@ extension PollOptionView {
             .receive(on: DispatchQueue.main)
             .sink { [weak self] theme in
                 guard let self = self else { return }
-                self.checkmarkBackgroundView.backgroundColor = theme.tertiarySystemBackgroundColor
+                self.checkmarkBackgroundView.backgroundColor = UIColor(dynamicProvider: { trailtCollection in
+                    return trailtCollection.userInterfaceStyle == .light ? .white : theme.tableViewCellSelectionBackgroundColor
+                })
             }
             .store(in: &disposeBag)
     }