diff --git a/Mastodon.xcodeproj/project.pbxproj b/Mastodon.xcodeproj/project.pbxproj
index 3f382587c..bd1bae1ed 100644
--- a/Mastodon.xcodeproj/project.pbxproj
+++ b/Mastodon.xcodeproj/project.pbxproj
@@ -4845,7 +4845,7 @@
 			repositoryURL = "https://github.com/TwidereProject/MetaTextView.git";
 			requirement = {
 				kind = exactVersion;
-				version = 1.3.1;
+				version = 1.4.0;
 			};
 		};
 		DB0E2D2C26833FF600865C3C /* XCRemoteSwiftPackageReference "Nuke-FLAnimatedImage-Plugin" */ = {
diff --git a/Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist b/Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist
index 820a7d86c..ecde1bcc5 100644
--- a/Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -12,7 +12,7 @@
 		<key>CoreDataStack.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>26</integer>
+			<integer>20</integer>
 		</dict>
 		<key>Mastodon - ASDK.xcscheme_^#shared#^_</key>
 		<dict>
@@ -37,7 +37,7 @@
 		<key>NotificationService.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>27</integer>
+			<integer>21</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>
diff --git a/Mastodon.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Mastodon.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 5118c78b0..edf6e564d 100644
--- a/Mastodon.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/Mastodon.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -114,8 +114,8 @@
         "repositoryURL": "https://github.com/TwidereProject/MetaTextView.git",
         "state": {
           "branch": null,
-          "revision": "9021b330dd72898583f62ee7f4c98768d72e7654",
-          "version": "1.3.1"
+          "revision": "4c16bc639652a7e1bff4f75e1eba2fcf40213974",
+          "version": "1.4.0"
         }
       },
       {
diff --git a/Mastodon/Scene/Search/SearchViewController.swift b/Mastodon/Scene/Search/SearchViewController.swift
index f3638e58b..89b71f499 100644
--- a/Mastodon/Scene/Search/SearchViewController.swift
+++ b/Mastodon/Scene/Search/SearchViewController.swift
@@ -157,12 +157,6 @@ extension SearchViewController {
         view.bringSubviewToFront(statusBar)
     }
 
-    override func viewWillAppear(_ animated: Bool) {
-        super.viewWillAppear(animated)
-
-        searchBar.tintColor = Asset.Colors.brandBlue.color
-    }
-
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
 
@@ -182,8 +176,8 @@ extension SearchViewController {
         searchBar.translatesAutoresizingMaskIntoConstraints = false
         NSLayoutConstraint.activate([
             searchBar.topAnchor.constraint(equalTo: view.safeAreaLayoutGuide.topAnchor),
-            searchBar.leadingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leadingAnchor),
-            searchBar.trailingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.trailingAnchor),
+            searchBar.leadingAnchor.constraint(equalTo: view.leadingAnchor),
+            searchBar.trailingAnchor.constraint(equalTo: view.trailingAnchor),
         ])
         
         statusBar.translatesAutoresizingMaskIntoConstraints = false
diff --git a/Mastodon/Scene/Settings/SettingsViewController.swift b/Mastodon/Scene/Settings/SettingsViewController.swift
index aa2ff0cf9..fce06caf3 100644
--- a/Mastodon/Scene/Settings/SettingsViewController.swift
+++ b/Mastodon/Scene/Settings/SettingsViewController.swift
@@ -197,7 +197,7 @@ class SettingsViewController: UIViewController, NeedsDependency {
             .sink { [weak self] instance in
                 guard let self = self else { return }
                 let version = instance?.version ?? "-"
-                let link = #"<a href="https://github.com/tootsuite/mastodon">tootsuite/mastodon</a>"#
+                let link = #"<a href="https://github.com/mastodon/mastodon">mastodon/mastodon</a>"#
                 let content = L10n.Scene.Settings.Footer.mastodonDescription(link, version)
                 self.tableFooterActiveLabel.configure(content: content, emojiDict: [:])
             }
@@ -530,7 +530,7 @@ extension SettingsViewController: SettingsToggleCellDelegate {
 extension SettingsViewController: ActiveLabelDelegate {
     func activeLabel(_ activeLabel: ActiveLabel, didSelectActiveEntity entity: ActiveEntity) {
         coordinator.present(
-            scene: .safari(url: URL(string: "https://github.com/tootsuite/mastodon")!),
+            scene: .safari(url: URL(string: "https://github.com/mastodon/mastodon")!),
             from: self,
             transition: .safariPresent(animated: true, completion: nil)
         )
diff --git a/Mastodon/Scene/Share/View/Content/StatusView.swift b/Mastodon/Scene/Share/View/Content/StatusView.swift
index 63bc573c6..86c820bb0 100644
--- a/Mastodon/Scene/Share/View/Content/StatusView.swift
+++ b/Mastodon/Scene/Share/View/Content/StatusView.swift
@@ -225,6 +225,7 @@ final class StatusView: UIView {
         let paragraphStyle: NSMutableParagraphStyle = {
             let style = NSMutableParagraphStyle()
             style.lineSpacing = 5
+            style.paragraphSpacing = 8
             return style
         }()
         metaText.textAttributes = [
diff --git a/Mastodon/Service/ThemeService/ThemeService.swift b/Mastodon/Service/ThemeService/ThemeService.swift
index 8a1b94179..c55000b8a 100644
--- a/Mastodon/Service/ThemeService/ThemeService.swift
+++ b/Mastodon/Service/ThemeService/ThemeService.swift
@@ -62,9 +62,10 @@ final class ThemeService {
         UITableViewCell.appearance().selectionColor = theme.tableViewCellSelectionBackgroundColor
 
         // set search bar appearance
-        UISearchBar.appearance().barTintColor = theme.navigationBarBackgroundColor
         UISearchBar.appearance().tintColor = Asset.Colors.brandBlue.color
-
+        UISearchBar.appearance().barTintColor = theme.navigationBarBackgroundColor
+        let cancelButtonAttributes: [NSAttributedString.Key : Any] = [NSAttributedString.Key.foregroundColor: Asset.Colors.brandBlue.color]
+        UIBarButtonItem.appearance(whenContainedInInstancesOf: [UISearchBar.self]).setTitleTextAttributes(cancelButtonAttributes, for: .normal)
     }
 
 }