diff --git a/Mastodon/Scene/PickServer/PickServerViewController.swift b/Mastodon/Scene/PickServer/PickServerViewController.swift
index 1149a9f8d..e9a229a24 100644
--- a/Mastodon/Scene/PickServer/PickServerViewController.swift
+++ b/Mastodon/Scene/PickServer/PickServerViewController.swift
@@ -36,7 +36,7 @@ final class PickServerViewController: UIViewController, NeedsDependency {
     
     let nextStepButton: PrimaryActionButton = {
         let button = PrimaryActionButton(type: .system)
-        button.setTitle(L10n.Button.signUp, for: .normal)
+        button.setTitle(L10n.Common.Controls.Actions.signUp, for: .normal)
         button.translatesAutoresizingMaskIntoConstraints = false
         return button
     }()
diff --git a/Mastodon/Scene/PickServer/TableViewCell/PickServerCell.swift b/Mastodon/Scene/PickServer/TableViewCell/PickServerCell.swift
index 892cf4424..1dae7d990 100644
--- a/Mastodon/Scene/PickServer/TableViewCell/PickServerCell.swift
+++ b/Mastodon/Scene/PickServer/TableViewCell/PickServerCell.swift
@@ -324,7 +324,7 @@ extension PickServerCell {
         descriptionLabel.text = serverInfo.description
         let processor =  RoundCornerImageProcessor(cornerRadius: 3)
         thumbImageView.kf.indicatorType = .activity
-        thumbImageView.kf.setImage(with: URL(string: serverInfo.proxiedThumbnail ?? "")!, placeholder: UIImage.placeholder(color: .yellow), options: [
+        thumbImageView.kf.setImage(with: URL(string: serverInfo.proxiedThumbnail ?? "")!, placeholder: UIImage.placeholder(color: Asset.Colors.lightBackground.color), options: [
             .processor(processor),
             .scaleFactor(UIScreen.main.scale),
             .transition(.fade(1))
diff --git a/Mastodon/Scene/PickServer/TableViewCell/PickServerTitleCell.swift b/Mastodon/Scene/PickServer/TableViewCell/PickServerTitleCell.swift
index 0cee127a2..469667330 100644
--- a/Mastodon/Scene/PickServer/TableViewCell/PickServerTitleCell.swift
+++ b/Mastodon/Scene/PickServer/TableViewCell/PickServerTitleCell.swift
@@ -12,7 +12,7 @@ final class PickServerTitleCell: UITableViewCell {
     let titleLabel: UILabel = {
         let label = UILabel()
         label.font = UIFontMetrics(forTextStyle: .largeTitle).scaledFont(for: UIFont.boldSystemFont(ofSize: 34))
-        label.textColor = Asset.Colors.Label.black.color
+        label.textColor = Asset.Colors.Label.primary.color
         label.text = L10n.Scene.ServerPicker.title
         label.adjustsFontForContentSizeCategory = true
         label.translatesAutoresizingMaskIntoConstraints = false
diff --git a/Mastodon/Scene/PickServer/View/PickServerCategoryView.swift b/Mastodon/Scene/PickServer/View/PickServerCategoryView.swift
index c159f9bf3..62ddefae0 100644
--- a/Mastodon/Scene/PickServer/View/PickServerCategoryView.swift
+++ b/Mastodon/Scene/PickServer/View/PickServerCategoryView.swift
@@ -92,7 +92,7 @@ extension PickServerCategoryView {
             bgView.backgroundColor = Asset.Colors.lightWhite.color
             bgView.applyShadow(color: Asset.Colors.lightBrandBlue.color, alpha: 0, x: 0, y: 0, blur: 0.0)
             if case .All = category {
-                titleLabel.textColor = Asset.Colors.lightBackground.color
+                titleLabel.textColor = Asset.Colors.lightBrandBlue.color
             }
         }
     }
diff --git a/Mastodon/Scene/Welcome/WelcomeViewController.swift b/Mastodon/Scene/Welcome/WelcomeViewController.swift
index 474e21630..cd9ab2e7c 100644
--- a/Mastodon/Scene/Welcome/WelcomeViewController.swift
+++ b/Mastodon/Scene/Welcome/WelcomeViewController.swift
@@ -13,10 +13,6 @@ final class WelcomeViewController: UIViewController, NeedsDependency {
     weak var context: AppContext! { willSet { precondition(!isViewLoaded) } }
     weak var coordinator: SceneCoordinator! { willSet { precondition(!isViewLoaded) } }
     
-    #if DEBUG
-    let authenticationViewController = AuthenticationViewController()
-    #endif
-    
     let logoImageView: UIImageView = {
         let imageView = UIImageView(image: Asset.welcomeLogo.image)
         imageView.translatesAutoresizingMaskIntoConstraints = false
@@ -103,27 +99,6 @@ extension WelcomeViewController {
     
 }
 
-extension WelcomeViewController {
-
-    @objc private func signInButtonPressed(_ sender: UIButton) {
-        os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s", ((#file as NSString).lastPathComponent), #line, #function)
-        
-        #if DEBUG
-        authenticationViewController.context = context
-        authenticationViewController.coordinator = coordinator
-        authenticationViewController.viewModel = AuthenticationViewModel(context: context, coordinator: coordinator, isAuthenticationExist: true)
-        authenticationViewController.viewModel.domain.value = "pawoo.net"
-        let _ = authenticationViewController.view   // trigger view load
-        authenticationViewController.signInButton.sendActions(for: .touchUpInside)
-        #endif
-    }
-    
-    @objc private func signUpButtonPressed(_ sender: UIButton) {
-        os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s", ((#file as NSString).lastPathComponent), #line, #function)
-    }
-    
-}
-
 extension WelcomeViewController {
     @objc
     private func signUpButtonDidClicked(_ sender: UIButton) {