diff --git a/lib/screens/common_elements.dart b/lib/screens/common_elements.dart
index 0b88edb..71a8278 100644
--- a/lib/screens/common_elements.dart
+++ b/lib/screens/common_elements.dart
@@ -65,7 +65,8 @@ class CommonElements {
       child: ElevatedButton(
         key: keyGoNext,
         style: ElevatedButton.styleFrom(
-          foregroundColor: Colors.white, backgroundColor: orangeC, elevation: 4, // foreground
+          foregroundColor: Colors.white, backgroundColor: orangeC,
+          elevation: 4, // foreground
         ),
         onPressed: () {
           Navigator.push(
diff --git a/lib/screens/home.dart b/lib/screens/home.dart
index cc51af0..221e19e 100644
--- a/lib/screens/home.dart
+++ b/lib/screens/home.dart
@@ -538,9 +538,11 @@ Widget welcomeHome(context) {
                 SizedBox(
                   width: 410,
                   height: 70,
-                  child: ElevatedButton(key: keyOnboardingNewChest,
+                  child: ElevatedButton(
+                    key: keyOnboardingNewChest,
                     style: ElevatedButton.styleFrom(
-                      foregroundColor: Colors.white, elevation: 4, backgroundColor: orangeC, // foreground
+                      foregroundColor: Colors.white, elevation: 4,
+                      backgroundColor: orangeC, // foreground
                     ),
                     onPressed: () {
                       Navigator.push(
diff --git a/lib/screens/myWallets/choose_chest.dart b/lib/screens/myWallets/choose_chest.dart
index ee99910..e91676d 100644
--- a/lib/screens/myWallets/choose_chest.dart
+++ b/lib/screens/myWallets/choose_chest.dart
@@ -111,7 +111,8 @@ class _ChooseChestState extends State<ChooseChest> {
               height: 70,
               child: ElevatedButton(
                 style: ElevatedButton.styleFrom(
-                  foregroundColor: Colors.black, backgroundColor: orangeC, // foreground
+                  foregroundColor: Colors.black,
+                  backgroundColor: orangeC, // foreground
                 ),
                 onPressed: () async {
                   await configBox.put('currentChest', currentChest);
diff --git a/lib/screens/myWallets/choose_wallet.dart b/lib/screens/myWallets/choose_wallet.dart
index a5772de..50c4eab 100644
--- a/lib/screens/myWallets/choose_wallet.dart
+++ b/lib/screens/myWallets/choose_wallet.dart
@@ -48,7 +48,8 @@ class ChooseWalletScreen extends StatelessWidget {
                   child: ElevatedButton(
                     key: keyConfirm,
                     style: ElevatedButton.styleFrom(
-                      foregroundColor: Colors.white, elevation: 4, backgroundColor: orangeC, // foreground
+                      foregroundColor: Colors.white, elevation: 4,
+                      backgroundColor: orangeC, // foreground
                     ),
                     onPressed: () async {
                       await sub.setCurrentWallet(selectedWallet!);
diff --git a/lib/screens/myWallets/custom_derivations.dart b/lib/screens/myWallets/custom_derivations.dart
index 43d3493..be97443 100644
--- a/lib/screens/myWallets/custom_derivations.dart
+++ b/lib/screens/myWallets/custom_derivations.dart
@@ -107,7 +107,8 @@ class _CustomDerivationState extends State<CustomDerivation> {
               height: 70,
               child: ElevatedButton(
                 style: ElevatedButton.styleFrom(
-                  foregroundColor: Colors.white, elevation: 4, backgroundColor: orangeC, // foreground
+                  foregroundColor: Colors.white, elevation: 4,
+                  backgroundColor: orangeC, // foreground
                 ),
                 onPressed: () async {
                   WalletData? defaultWallet =
diff --git a/lib/screens/myWallets/import_g1_v1.dart b/lib/screens/myWallets/import_g1_v1.dart
index 0e40a35..052754c 100644
--- a/lib/screens/myWallets/import_g1_v1.dart
+++ b/lib/screens/myWallets/import_g1_v1.dart
@@ -239,7 +239,8 @@ class ImportG1v1 extends StatelessWidget {
                       child: ElevatedButton(
                         key: keyConfirm,
                         style: ElevatedButton.styleFrom(
-                          foregroundColor: Colors.white, elevation: 4, backgroundColor: orangeC, // foreground
+                          foregroundColor: Colors.white, elevation: 4,
+                          backgroundColor: orangeC, // foreground
                         ),
                         onPressed: canValidate
                             ? () async {
diff --git a/lib/screens/myWallets/migrate_identity.dart b/lib/screens/myWallets/migrate_identity.dart
index 12137e9..535f6d3 100644
--- a/lib/screens/myWallets/migrate_identity.dart
+++ b/lib/screens/myWallets/migrate_identity.dart
@@ -188,7 +188,8 @@ class MigrateIdentityScreen extends StatelessWidget {
                     height: 60 * ratio,
                     child: ElevatedButton(
                       style: ElevatedButton.styleFrom(
-                        foregroundColor: Colors.white, elevation: 4, backgroundColor: orangeC, // foreground
+                        foregroundColor: Colors.white, elevation: 4,
+                        backgroundColor: orangeC, // foreground
                       ),
                       onPressed: canValidate
                           ? () async {
diff --git a/lib/screens/myWallets/restore_chest.dart b/lib/screens/myWallets/restore_chest.dart
index 6f98b45..92e5440 100644
--- a/lib/screens/myWallets/restore_chest.dart
+++ b/lib/screens/myWallets/restore_chest.dart
@@ -94,7 +94,8 @@ class RestoreChest extends StatelessWidget {
                     child: ElevatedButton(
                       key: keyGoNext,
                       style: ElevatedButton.styleFrom(
-                        foregroundColor: Colors.white, elevation: 4, backgroundColor: orangeC, // foreground
+                        foregroundColor: Colors.white, elevation: 4,
+                        backgroundColor: orangeC, // foreground
                       ),
                       onPressed: () async {
                         if (await sub
@@ -132,7 +133,8 @@ class RestoreChest extends StatelessWidget {
                     child: ElevatedButton(
                         key: keyPastMnemonic,
                         style: ElevatedButton.styleFrom(
-                          foregroundColor: Colors.black, elevation: 4, backgroundColor: yellowC, // foreground
+                          foregroundColor: Colors.black, elevation: 4,
+                          backgroundColor: yellowC, // foreground
                         ),
                         onPressed: () {
                           genW.pasteMnemonic(context);
diff --git a/lib/screens/myWallets/show_seed.dart b/lib/screens/myWallets/show_seed.dart
index 92a454b..1bd1433 100644
--- a/lib/screens/myWallets/show_seed.dart
+++ b/lib/screens/myWallets/show_seed.dart
@@ -73,9 +73,11 @@ class ShowSeed extends StatelessWidget {
                             height: 40,
                             child: ElevatedButton(
                               style: ElevatedButton.styleFrom(
-                                foregroundColor: Colors.black, shape: RoundedRectangleBorder(
+                                foregroundColor: Colors.black,
+                                shape: RoundedRectangleBorder(
                                   borderRadius: BorderRadius.circular(8),
-                                ), backgroundColor: orangeC,
+                                ),
+                                backgroundColor: orangeC,
                                 elevation: 1, // foreground
                               ),
                               onPressed: () {
@@ -121,7 +123,8 @@ class ShowSeed extends StatelessWidget {
               height: 60 * ratio,
               child: ElevatedButton(
                 style: ElevatedButton.styleFrom(
-                  foregroundColor: Colors.white, elevation: 4, backgroundColor: orangeC, // foreground
+                  foregroundColor: Colors.white, elevation: 4,
+                  backgroundColor: orangeC, // foreground
                 ),
                 onPressed: () {
                   Navigator.pop(context);
diff --git a/lib/screens/myWallets/wallet_options.dart b/lib/screens/myWallets/wallet_options.dart
index bdb3799..bcbd873 100644
--- a/lib/screens/myWallets/wallet_options.dart
+++ b/lib/screens/myWallets/wallet_options.dart
@@ -299,7 +299,8 @@ class WalletOptions extends StatelessWidget {
                   child: ElevatedButton(
                     key: keyConfirmIdentity,
                     style: ElevatedButton.styleFrom(
-                      foregroundColor: Colors.white, elevation: 4, backgroundColor: orangeC, // foreground
+                      foregroundColor: Colors.white, elevation: 4,
+                      backgroundColor: orangeC, // foreground
                     ),
                     onPressed: () {
                       walletProvider.confirmIdentityPopup(context);
@@ -363,9 +364,11 @@ class WalletOptions extends StatelessWidget {
             height: 40,
             child: ElevatedButton(
               style: ElevatedButton.styleFrom(
-                foregroundColor: Colors.black, shape: RoundedRectangleBorder(
+                foregroundColor: Colors.black,
+                shape: RoundedRectangleBorder(
                   borderRadius: BorderRadius.circular(8),
-                ), backgroundColor: orangeC,
+                ),
+                backgroundColor: orangeC,
                 elevation: 1, // foreground
               ),
               onPressed: () {
diff --git a/lib/screens/myWallets/wallets_home.dart b/lib/screens/myWallets/wallets_home.dart
index ef355d2..2cb0d0a 100644
--- a/lib/screens/myWallets/wallets_home.dart
+++ b/lib/screens/myWallets/wallets_home.dart
@@ -36,7 +36,6 @@ class WalletsHome extends StatelessWidget {
     myWalletProvider.listWallets =
         myWalletProvider.readAllWallets(currentChestNumber);
 
-
     return WillPopScope(
       onWillPop: () {
         // myWalletProvider.pinCode = myWalletProvider.mnemonic = '';
@@ -88,7 +87,8 @@ class WalletsHome extends StatelessWidget {
               height: 60,
             ),
             style: ElevatedButton.styleFrom(
-              foregroundColor: Colors.black, elevation: 2, backgroundColor: floattingYellow, // foreground
+              foregroundColor: Colors.black, elevation: 2,
+              backgroundColor: floattingYellow, // foreground
             ),
             onPressed: () => Navigator.push(
               context,
diff --git a/lib/screens/onBoarding/5.dart b/lib/screens/onBoarding/5.dart
index f82c2e9..5609e67 100644
--- a/lib/screens/onBoarding/5.dart
+++ b/lib/screens/onBoarding/5.dart
@@ -83,7 +83,8 @@ class _ChooseChestState extends State<OnboardingStepFive> {
                   child: ElevatedButton(
                       key: keyGenerateMnemonic,
                       style: ElevatedButton.styleFrom(
-                        foregroundColor: Colors.black, elevation: 4, backgroundColor: const Color(0xffFFD58D), // foreground
+                        foregroundColor: Colors.black, elevation: 4,
+                        backgroundColor: const Color(0xffFFD58D), // foreground
                       ),
                       onPressed: () {
                         // _generateWalletProvider.reloadBuild();
@@ -231,7 +232,8 @@ Widget nextButton(
     child: ElevatedButton(
       key: keyGoNext,
       style: ElevatedButton.styleFrom(
-        foregroundColor: Colors.white, elevation: 4, backgroundColor: orangeC, // foreground
+        foregroundColor: Colors.white, elevation: 4,
+        backgroundColor: orangeC, // foreground
       ),
       onPressed: () {
         generateWalletProvider.nbrWord = generateWalletProvider.getRandomInt();
diff --git a/lib/screens/onBoarding/9.dart b/lib/screens/onBoarding/9.dart
index 6958157..7b54b60 100644
--- a/lib/screens/onBoarding/9.dart
+++ b/lib/screens/onBoarding/9.dart
@@ -81,7 +81,10 @@ class OnboardingStepNine extends StatelessWidget {
                         child: ElevatedButton(
                             key: keyChangePin,
                             style: ElevatedButton.styleFrom(
-                              foregroundColor: Colors.black, elevation: 4, backgroundColor: const Color(0xffFFD58D), // foreground
+                              foregroundColor: Colors.black,
+                              elevation: 4,
+                              backgroundColor:
+                                  const Color(0xffFFD58D), // foreground
                             ),
                             onPressed: () {
                               generateWalletProvider.changePinCode(
diff --git a/lib/screens/search.dart b/lib/screens/search.dart
index a28a7dc..ece009b 100644
--- a/lib/screens/search.dart
+++ b/lib/screens/search.dart
@@ -95,7 +95,8 @@ class SearchScreen extends StatelessWidget {
                 child: ElevatedButton(
                   key: keyConfirmSearch,
                   style: ElevatedButton.styleFrom(
-                    foregroundColor: Colors.white, elevation: 4, backgroundColor: orangeC, // foreground
+                    foregroundColor: Colors.white, elevation: 4,
+                    backgroundColor: orangeC, // foreground
                   ),
                   onPressed: searchProvider.searchController.text.length >= 2
                       ? () {
diff --git a/lib/screens/transaction_in_progress.dart b/lib/screens/transaction_in_progress.dart
index 6bd77e4..88d10e2 100644
--- a/lib/screens/transaction_in_progress.dart
+++ b/lib/screens/transaction_in_progress.dart
@@ -267,7 +267,8 @@ class TransactionInProgress extends StatelessWidget {
                         child: ElevatedButton(
                           key: keyCloseTransactionScreen,
                           style: ElevatedButton.styleFrom(
-                            foregroundColor: Colors.white, elevation: 4, backgroundColor: orangeC, // foreground
+                            foregroundColor: Colors.white, elevation: 4,
+                            backgroundColor: orangeC, // foreground
                           ),
                           onPressed: () {
                             Navigator.pop(context);
diff --git a/lib/screens/wallet_view.dart b/lib/screens/wallet_view.dart
index 27f971b..172bade 100644
--- a/lib/screens/wallet_view.dart
+++ b/lib/screens/wallet_view.dart
@@ -626,7 +626,8 @@ class WalletViewScreen extends StatelessWidget {
                           child: ElevatedButton(
                             key: keyConfirmPayment,
                             style: ElevatedButton.styleFrom(
-                              foregroundColor: Colors.white, elevation: 4, backgroundColor: orangeC, // foreground
+                              foregroundColor: Colors.white, elevation: 4,
+                              backgroundColor: orangeC, // foreground
                             ),
                             onPressed: canValidate
                                 ? () async {