diff --git a/Chronos/App/Onboarding/RestoreBackupView.swift b/Chronos/App/Onboarding/RestoreBackupView.swift
index 5fc8699..97e1141 100644
--- a/Chronos/App/Onboarding/RestoreBackupView.swift
+++ b/Chronos/App/Onboarding/RestoreBackupView.swift
@@ -22,7 +22,7 @@ struct RestoreBackupView: View {
                 .font(.system(size: 44))
                 .padding(.bottom, 16)
 
-            Text("Re-enter the master key used to setup Chronos previously")
+            Text("Re-enter the master password used to setup Chronos previously")
                 .fixedSize(horizontal: false, vertical: true)
                 .multilineTextAlignment(.center)
                 .font(.subheadline)
diff --git a/Chronos/App/Onboarding/WelcomeView.swift b/Chronos/App/Onboarding/WelcomeView.swift
index 4b2ed33..650e9db 100644
--- a/Chronos/App/Onboarding/WelcomeView.swift
+++ b/Chronos/App/Onboarding/WelcomeView.swift
@@ -16,8 +16,13 @@ struct WelcomeView: View {
     var body: some View {
         NavigationStack {
             VStack {
+                Image("Logo")
+                    .resizable()
+                    .frame(width: 128, height: 128)
+                    .padding(.bottom, 8)
+
                 Button {
-                    getStartedPressed.toggle()
+                    getStartedPressed = true
                 } label: {
                     Text("Get started")
                         .bold()
@@ -27,20 +32,21 @@ struct WelcomeView: View {
                 .buttonStyle(.bordered)
 
                 Button {
-                    restorePressed.toggle()
+                    restorePressed = true
                 } label: {
                     Text("Restore")
                         .bold()
                         .frame(minWidth: 0, maxWidth: .infinity)
                         .frame(height: 32)
                 }
+                .padding(.top, 4)
                 .disabled(chronosCryptos.isEmpty)
                 .buttonStyle(.borderless)
+                .padding(.bottom, 32)
             }
             .padding([.horizontal], 24)
             .frame(minWidth: 0, maxWidth: .infinity, minHeight: 0, maxHeight: .infinity)
             .background(Color(red: 0.04, green: 0, blue: 0.11))
-            .navigationTitle("Welcome")
             .navigationBarTitleDisplayMode(.inline)
             .navigationDestination(isPresented: $getStartedPressed) {
                 StorageSetupView()
@@ -54,3 +60,7 @@ struct WelcomeView: View {
         })
     }
 }
+
+#Preview {
+    WelcomeView()
+}
diff --git a/Chronos/App/Privacy/PrivacyView.swift b/Chronos/App/Privacy/PrivacyView.swift
index 495c698..b40a31b 100644
--- a/Chronos/App/Privacy/PrivacyView.swift
+++ b/Chronos/App/Privacy/PrivacyView.swift
@@ -17,3 +17,7 @@ struct PrivacyView: View {
         .background(Color(red: 0.04, green: 0, blue: 0.11))
     }
 }
+
+#Preview {
+    PrivacyView()
+}
diff --git a/Chronos/App/Tabs/Tokens/AddToken/AddManualTokenView.swift b/Chronos/App/Tabs/Tokens/AddToken/AddManualTokenView.swift
index 4cdf3d8..2c43307 100644
--- a/Chronos/App/Tabs/Tokens/AddToken/AddManualTokenView.swift
+++ b/Chronos/App/Tabs/Tokens/AddToken/AddManualTokenView.swift
@@ -45,14 +45,14 @@ struct AddManualTokenView: View {
                 LabeledContent("Account") {
                     TextField("Account", text: $account)
                         .disableAutocorrection(true)
-                        .autocapitalization(/*@START_MENU_TOKEN@*/.none/*@END_MENU_TOKEN@*/)
+                        .autocapitalization(/*@START_MENU_TOKEN@*/ .none/*@END_MENU_TOKEN@*/)
                 }
                 LabeledContent("Secret") {
                     Group {
                         if showSecret {
                             TextField("Secret", text: $secret)
                                 .disableAutocorrection(true)
-                                .autocapitalization(/*@START_MENU_TOKEN@*/.none/*@END_MENU_TOKEN@*/)
+                                .autocapitalization(/*@START_MENU_TOKEN@*/ .none/*@END_MENU_TOKEN@*/)
                         } else {
                             SecureField("Secret", text: $secret)
                         }
diff --git a/Chronos/App/Tabs/Tokens/Row/UpdateTokenView.swift b/Chronos/App/Tabs/Tokens/Row/UpdateTokenView.swift
index 56a4470..996f8ac 100644
--- a/Chronos/App/Tabs/Tokens/Row/UpdateTokenView.swift
+++ b/Chronos/App/Tabs/Tokens/Row/UpdateTokenView.swift
@@ -48,14 +48,14 @@ struct UpdateTokenView: View {
                 LabeledContent("Account") {
                     TextField("Account", text: $account)
                         .disableAutocorrection(true)
-                        .autocapitalization(/*@START_MENU_TOKEN@*/.none/*@END_MENU_TOKEN@*/)
+                        .autocapitalization(/*@START_MENU_TOKEN@*/ .none/*@END_MENU_TOKEN@*/)
                 }
                 LabeledContent("Secret") {
                     Group {
                         if showSecret {
                             TextField("Secret", text: $secret)
                                 .disableAutocorrection(true)
-                                .autocapitalization(/*@START_MENU_TOKEN@*/.none/*@END_MENU_TOKEN@*/)
+                                .autocapitalization(/*@START_MENU_TOKEN@*/ .none/*@END_MENU_TOKEN@*/)
                         } else {
                             SecureField("Secret", text: $secret)
                                 .disabled(true)