diff --git a/BDKSwiftExampleWallet/Resources/Localizable.xcstrings b/BDKSwiftExampleWallet/Resources/Localizable.xcstrings
index 1759c0df..abc5cac8 100644
--- a/BDKSwiftExampleWallet/Resources/Localizable.xcstrings
+++ b/BDKSwiftExampleWallet/Resources/Localizable.xcstrings
@@ -70,6 +70,9 @@
           }
         }
       }
+    },
+    "(Optional) Import 12 Word Seed Phrase" : {
+
     },
     "/" : {
       "localizations" : {
@@ -180,6 +183,7 @@
       }
     },
     "12 Word Seed Phrase (Optional)" : {
+      "extractionState" : "stale",
       "localizations" : {
         "fr" : {
           "stringUnit" : {
@@ -190,6 +194,7 @@
       }
     },
     "A bitcoin wallet powered by Bitcoin Dev Kit" : {
+      "extractionState" : "stale",
       "localizations" : {
         "fr" : {
           "stringUnit" : {
@@ -240,6 +245,7 @@
       }
     },
     "BDK Wallet" : {
+      "extractionState" : "stale",
       "localizations" : {
         "fr" : {
           "stringUnit" : {
@@ -509,6 +515,9 @@
           }
         }
       }
+    },
+    "powered by Bitcoin Dev Kit" : {
+
     },
     "Receive" : {
       "localizations" : {
diff --git a/BDKSwiftExampleWallet/View/OnboardingView.swift b/BDKSwiftExampleWallet/View/OnboardingView.swift
index e59b4d34..bd8c784c 100644
--- a/BDKSwiftExampleWallet/View/OnboardingView.swift
+++ b/BDKSwiftExampleWallet/View/OnboardingView.swift
@@ -25,65 +25,70 @@ struct OnboardingView: View {
                 Spacer()
 
                 VStack(spacing: 25) {
-                    Image(systemName: "bitcoinsign.circle.fill")
+                    Image(systemName: "bitcoinsign.circle")
                         .resizable()
-                        .foregroundColor(.bitcoinOrange)
+                        .foregroundStyle(
+                            .secondary
+                        )
                         .frame(width: 100, height: 100, alignment: .center)
-                    Text("BDK Wallet")
-                        .textStyle(BitcoinTitle1())
-                        .multilineTextAlignment(.center)
-                        .padding(EdgeInsets(top: 0, leading: 12, bottom: 0, trailing: 12))
-                    Text("A bitcoin wallet powered by Bitcoin Dev Kit")
-                        .textStyle(BitcoinBody5())
+                    Text("powered by Bitcoin Dev Kit")
+                        .foregroundStyle(
+                            LinearGradient(
+                                gradient: Gradient(
+                                    colors: [
+                                        .secondary,
+                                        .primary,
+                                    ]
+                                ),
+                                startPoint: .topLeading,
+                                endPoint: .bottomTrailing
+                            )
+                        )
                         .fontWidth(.expanded)
-                        .foregroundColor(.secondary)
+                        .fontWeight(.medium)
                         .multilineTextAlignment(.center)
+                        .padding()
                 }
 
-                VStack {
-
-                    VStack {
-                        Picker(
-                            "Network",
-                            selection: $viewModel.selectedNetwork
-                        ) {
-                            Text("Signet").tag(Network.signet)
-                            Text("Testnet").tag(Network.testnet)
-                            Text("Regtest").tag(Network.regtest)
-                        }
-                        .pickerStyle(.automatic)
-                        .tint(viewModel.buttonColor)
-
-                        Picker(
-                            "Esplora Server",
-                            selection: $viewModel.selectedURL
-                        ) {
-                            ForEach(viewModel.availableURLs, id: \.self) { url in
-                                Text(
-                                    url.replacingOccurrences(
-                                        of: "https://",
-                                        with: ""
-                                    ).replacingOccurrences(
-                                        of: "http://",
-                                        with: ""
-                                    )
-                                )
-                                .tag(url)
-                            }
-                        }
-                        .pickerStyle(.automatic)
-                        .tint(viewModel.buttonColor)
-
+                Picker(
+                    "Network",
+                    selection: $viewModel.selectedNetwork
+                ) {
+                    Text("Signet").tag(Network.signet)
+                    Text("Testnet").tag(Network.testnet)
+                    Text("Regtest").tag(Network.regtest)
+                }
+                .pickerStyle(.automatic)
+                .tint(.primary)
+
+                Picker(
+                    "Esplora Server",
+                    selection: $viewModel.selectedURL
+                ) {
+                    ForEach(viewModel.availableURLs, id: \.self) { url in
+                        Text(
+                            url.replacingOccurrences(
+                                of: "https://",
+                                with: ""
+                            ).replacingOccurrences(
+                                of: "http://",
+                                with: ""
+                            )
+                        )
+                        .tag(url)
                     }
-
                 }
-                .padding()
+                .pickerStyle(.automatic)
+                .tint(.primary)
 
                 VStack {
-                    TextField("12 Word Seed Phrase (Optional)", text: $viewModel.words)
-                        .submitLabel(.done)
-                        .textFieldStyle(RoundedBorderTextFieldStyle())
-                        .padding(.horizontal, 40)
+                    TextField(
+                        "(Optional) Import 12 Word Seed Phrase",
+                        text: $viewModel.words
+                    )
+                    .submitLabel(.done)
+                    .textFieldStyle(RoundedBorderTextFieldStyle())
+                    .padding(.horizontal, 40)
                     if viewModel.wordArray != [] {
                         SeedPhraseView(
                             words: viewModel.wordArray,
@@ -92,6 +97,7 @@ struct OnboardingView: View {
                             wordsPerPage: 4
                         )
                         .frame(height: 200)
+                    } else {
                     }
                 }
                 .padding(.top, 30)
@@ -101,7 +107,12 @@ struct OnboardingView: View {
                 Button("Create Wallet") {
                     viewModel.createWallet()
                 }
-                .buttonStyle(BitcoinFilled(tintColor: .bitcoinOrange, isCapsule: true))
+                .buttonStyle(
+                    BitcoinFilled(
+                        tintColor: .bitcoinOrange,
+                        isCapsule: true
+                    )
+                )
                 .padding()
 
             }
diff --git a/BDKSwiftExampleWallet/View/Send/FeeView.swift b/BDKSwiftExampleWallet/View/Send/FeeView.swift
index 6ec7f0c7..410f9b1f 100644
--- a/BDKSwiftExampleWallet/View/Send/FeeView.swift
+++ b/BDKSwiftExampleWallet/View/Send/FeeView.swift
@@ -69,7 +69,7 @@ struct FeeView: View {
                         .tag(3)
                     }
                     .pickerStyle(.automatic)
-                    .tint(.bitcoinOrange)
+                    .tint(.primary)
                     Text("sat/vb")
                         .foregroundColor(.secondary)
                         .fontWeight(.thin)
diff --git a/BDKSwiftExampleWallet/View/Settings/SeedView.swift b/BDKSwiftExampleWallet/View/Settings/SeedView.swift
index c9858a57..46dc54f7 100644
--- a/BDKSwiftExampleWallet/View/Settings/SeedView.swift
+++ b/BDKSwiftExampleWallet/View/Settings/SeedView.swift
@@ -23,7 +23,7 @@ struct SeedView: View {
 
                     SeedPhraseView(
                         words: seed.mnemonic.components(separatedBy: " "),
-                        preferredWordsPerRow: 3,
+                        preferredWordsPerRow: 2,
                         usePaging: true,
                         wordsPerPage: 6
                     )
@@ -45,8 +45,14 @@ struct SeedView: View {
                                     .bold()
                             }
                         }
-                        .buttonStyle(.borderedProminent)
-                        .tint(.bitcoinOrange)
+                        .buttonStyle(
+                            BitcoinFilled(
+                                width: 120,
+                                height: 40,
+                                tintColor: .bitcoinOrange,
+                                isCapsule: true
+                            )
+                        )
                         Spacer()
                     }
                     .padding()