diff --git a/integration_test/utility/tests_utility.dart b/integration_test/utility/tests_utility.dart
index e435fc4..d9357d7 100644
--- a/integration_test/utility/tests_utility.dart
+++ b/integration_test/utility/tests_utility.dart
@@ -78,7 +78,7 @@ Future tapKey(Key buttonKey,
     await tester.pumpAndSettle(Duration(milliseconds: duration));
   }
   final Finder finder = customFinder ?? find.byKey(buttonKey);
-  log.d('INTEGRATION TEST: Tap on ${finder.description}}');
+  log.d('INTEGRATION TEST: Tap on ${finder.describeMatch(Plurality.zero)}}');
   await tester.tap(selectLast ? finder.last : finder);
   humanRead();
 }
diff --git a/lib/main.dart b/lib/main.dart
index 1b70e5e..be1d63a 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -157,6 +157,8 @@ class Gecko extends StatelessWidget {
             foregroundColor: Color(0xFF000000),
           ),
           primaryColor: const Color(0xffFFD58D),
+          scaffoldBackgroundColor: backgroundColor,
+          canvasColor: backgroundColor,
           textTheme: const TextTheme(
             bodyLarge: TextStyle(fontSize: 16),
             bodyMedium: TextStyle(fontSize: 18),
diff --git a/lib/providers/substrate_sdk.dart b/lib/providers/substrate_sdk.dart
index 3d64745..b54e0ab 100644
--- a/lib/providers/substrate_sdk.dart
+++ b/lib/providers/substrate_sdk.dart
@@ -1218,6 +1218,7 @@ void snackNode(BuildContext context, bool isConnected) {
         "${"youAreConnectedToNode".tr()}\n${sub.getConnectedEndpoint()!.split('//')[1]}";
   }
   final snackBar = SnackBar(
+      backgroundColor: Colors.grey[900],
       padding: const EdgeInsets.all(20),
       content: Text(message, style: const TextStyle(fontSize: 16)),
       duration: const Duration(seconds: 4));
diff --git a/lib/providers/wallets_profiles.dart b/lib/providers/wallets_profiles.dart
index 08c87a2..55726f8 100644
--- a/lib/providers/wallets_profiles.dart
+++ b/lib/providers/wallets_profiles.dart
@@ -157,6 +157,7 @@ class WalletsProfilesProvider with ChangeNotifier {
 snackMessage(context,
     {required String message, int duration = 2, double fontSize = 16}) {
   final snackBar = SnackBar(
+      backgroundColor: Colors.grey[900],
       padding: const EdgeInsets.all(20),
       content: Text(message, style: TextStyle(fontSize: fontSize)),
       duration: Duration(seconds: duration));
@@ -165,6 +166,7 @@ snackMessage(context,
 
 snackCopyKey(context) {
   final snackBar = SnackBar(
+      backgroundColor: Colors.grey[900],
       padding: const EdgeInsets.all(20),
       content: Text("thisAddressHasBeenCopiedToClipboard".tr(),
           style: const TextStyle(fontSize: 16)),
@@ -174,6 +176,7 @@ snackCopyKey(context) {
 
 snackCopySeed(context) {
   final snackBar = SnackBar(
+      backgroundColor: Colors.grey[900],
       padding: const EdgeInsets.all(20),
       content: Text("thisMnemonicHasBeenCopiedToClipboard".tr(),
           style: const TextStyle(fontSize: 17)),
diff --git a/lib/screens/activity.dart b/lib/screens/activity.dart
index c570497..9435d87 100644
--- a/lib/screens/activity.dart
+++ b/lib/screens/activity.dart
@@ -35,23 +35,15 @@ class _ActivityScreenState extends State<ActivityScreen> {
   Widget build(BuildContext context) {
     final duniterIndexer = Provider.of<DuniterIndexer>(context, listen: true);
 
-    return WillPopScope(
-      onWillPop: () {
+    return PopScope(
+      onPopInvoked: (_) {
         duniterIndexer.fetchMoreCursor =
             duniterIndexer.pageInfo = duniterIndexer.transBC = null;
-        return Future<bool>.value(true);
       },
       child: Scaffold(
           appBar: AppBar(
             elevation: 0,
             toolbarHeight: 60 * ratio,
-            leading: IconButton(
-                icon: const Icon(Icons.arrow_back, color: Colors.black),
-                onPressed: () {
-                  duniterIndexer.fetchMoreCursor =
-                      duniterIndexer.pageInfo = duniterIndexer.transBC = null;
-                  Navigator.of(context).pop();
-                }),
             title: SizedBox(
               height: 22,
               child: Text('accountActivity'.tr()),
diff --git a/lib/screens/myWallets/change_pin.dart b/lib/screens/myWallets/change_pin.dart
index aa21ba1..c469393 100644
--- a/lib/screens/myWallets/change_pin.dart
+++ b/lib/screens/myWallets/change_pin.dart
@@ -40,22 +40,15 @@ class _ChangePinScreenState extends State<ChangePinScreen> {
     final myWalletProvider =
         Provider.of<MyWalletsProvider>(context, listen: false);
 
-    return WillPopScope(
-      onWillPop: () {
+    return PopScope(
+      onPopInvoked: (_) {
         newPin.text = '';
-        return Future<bool>.value(true);
       },
       child: Scaffold(
         resizeToAvoidBottomInset: false,
         appBar: AppBar(
           elevation: 1,
           toolbarHeight: 60 * ratio,
-          leading: IconButton(
-              icon: const Icon(Icons.arrow_back, color: Colors.black),
-              onPressed: () {
-                newPin.text = '';
-                Navigator.of(context).pop();
-              }),
           title: SizedBox(
             height: 22,
             child: Text(widget.walletName!),
diff --git a/lib/screens/myWallets/import_g1_v1.dart b/lib/screens/myWallets/import_g1_v1.dart
index e90c8df..82f957b 100644
--- a/lib/screens/myWallets/import_g1_v1.dart
+++ b/lib/screens/myWallets/import_g1_v1.dart
@@ -34,22 +34,14 @@ class ImportG1v1 extends StatelessWidget {
 
     log.d(myWalletProvider.listWallets);
 
-    return WillPopScope(
-      onWillPop: () {
+    return PopScope(
+      onPopInvoked: (_) {
         resetScreen(context);
-        return Future<bool>.value(true);
       },
       child: Scaffold(
         backgroundColor: backgroundColor,
         appBar: AppBar(
             toolbarHeight: 60 * ratio,
-            leading: IconButton(
-                icon: const Icon(Icons.arrow_back, color: Colors.black),
-                onPressed: () {
-                  resetScreen(context);
-
-                  Navigator.of(context).pop();
-                }),
             title: SizedBox(
               height: 22,
               child: Text('importOldAccount'.tr()),
@@ -277,6 +269,7 @@ class ImportG1v1 extends StatelessWidget {
                                         pin ?? myWalletProvider.pinCode,
                                     balance: balance,
                                     idtyStatus: idtyStatus);
+                                Navigator.pop(context);
                                 Navigator.push(
                                   context,
                                   MaterialPageRoute(builder: (context) {
diff --git a/lib/screens/myWallets/manage_membership.dart b/lib/screens/myWallets/manage_membership.dart
index d1be7ff..8b7af18 100644
--- a/lib/screens/myWallets/manage_membership.dart
+++ b/lib/screens/myWallets/manage_membership.dart
@@ -47,7 +47,7 @@ class ManageMembership extends StatelessWidget {
                 builder: (BuildContext context, AsyncSnapshot<bool> isSmith) {
                   if (isSmith.data ?? false) {
                     return SizedBox(
-                        height: 70,
+                        height: 75,
                         child: Row(
                           children: <Widget>[
                             const SizedBox(width: 20),
@@ -65,7 +65,7 @@ class ManageMembership extends StatelessWidget {
                                       style: TextStyle(
                                           fontSize: 20,
                                           color: Colors.grey[500])),
-                                  const SizedBox(height: 5),
+                                  const SizedBox(height: 2),
                                   Text("youCannotRevokeThisIdentity".tr(),
                                       style: TextStyle(
                                           fontSize: 14,
diff --git a/lib/screens/myWallets/migrate_identity.dart b/lib/screens/myWallets/migrate_identity.dart
index ad39312..31660b7 100644
--- a/lib/screens/myWallets/migrate_identity.dart
+++ b/lib/screens/myWallets/migrate_identity.dart
@@ -139,7 +139,7 @@ class MigrateIdentityScreen extends StatelessWidget {
                   const SizedBox(height: 20),
 
                   SizedBox(
-                    width: 350,
+                    width: 400,
                     child: MarkdownBody(
                         data: 'areYouSureMigrateIdentity'.tr(args: [
                           duniterIndexer.walletNameIndexer[fromAddress] ??
diff --git a/lib/screens/myWallets/restore_chest.dart b/lib/screens/myWallets/restore_chest.dart
index 7e0c9df..ee4301f 100644
--- a/lib/screens/myWallets/restore_chest.dart
+++ b/lib/screens/myWallets/restore_chest.dart
@@ -30,21 +30,14 @@ class RestoreChest extends StatelessWidget {
           '${genW.cellController0.text} ${genW.cellController1.text} ${genW.cellController2.text} ${genW.cellController3.text} ${genW.cellController4.text} ${genW.cellController5.text} ${genW.cellController6.text} ${genW.cellController7.text} ${genW.cellController8.text} ${genW.cellController9.text} ${genW.cellController10.text} ${genW.cellController11.text}';
     }
 
-    return WillPopScope(
-      onWillPop: () {
+    return PopScope(
+      onPopInvoked: (_) {
         genW.resetImportView();
-        return Future<bool>.value(true);
       },
       child: Scaffold(
         backgroundColor: backgroundColor,
         appBar: AppBar(
             toolbarHeight: 60 * ratio,
-            leading: IconButton(
-                icon: const Icon(Icons.arrow_back, color: Colors.black),
-                onPressed: () {
-                  genW.resetImportView();
-                  Navigator.of(context).pop();
-                }),
             title: SizedBox(
               height: 22,
               child: Text('restoreAChest'.tr()),
diff --git a/lib/screens/myWallets/unlocking_wallet.dart b/lib/screens/myWallets/unlocking_wallet.dart
index 8436368..02b51d5 100644
--- a/lib/screens/myWallets/unlocking_wallet.dart
+++ b/lib/screens/myWallets/unlocking_wallet.dart
@@ -45,11 +45,10 @@ class UnlockingWallet extends StatelessWidget {
 
     // if (enterPin.text == '') myWalletProvider.isPinLoading = true;
 
-    return WillPopScope(
-      onWillPop: () {
+    return PopScope(
+      onPopInvoked: (_) {
         myWalletProvider.isPinValid = false;
         myWalletProvider.isPinLoading = true;
-        return Future<bool>.value(true);
       },
       child: Scaffold(
           backgroundColor: backgroundColor,
diff --git a/lib/screens/myWallets/wallet_options.dart b/lib/screens/myWallets/wallet_options.dart
index 88fba6d..8633669 100644
--- a/lib/screens/myWallets/wallet_options.dart
+++ b/lib/screens/myWallets/wallet_options.dart
@@ -51,13 +51,11 @@ class WalletOptions extends StatelessWidget {
 
     log.d("Wallet options: $currentChest:${wallet.derivation}");
 
-    return WillPopScope(
-      onWillPop: () {
+    return PopScope(
+      onPopInvoked: (_) {
         walletOptions.isEditing = false;
         walletOptions.isBalanceBlur = false;
         myWalletProvider.reload();
-        Navigator.pop(context);
-        return Future<bool>.value(true);
       },
       child: Scaffold(
         backgroundColor: backgroundColor,
@@ -65,14 +63,6 @@ class WalletOptions extends StatelessWidget {
         appBar: AppBar(
           toolbarHeight: 60 * ratio,
           elevation: 0,
-          leading: IconButton(
-              icon: const Icon(Icons.arrow_back, color: Colors.black),
-              onPressed: () {
-                walletOptions.isEditing = false;
-                walletOptions.isBalanceBlur = false;
-                myWalletProvider.reload();
-                Navigator.pop(context);
-              }),
           title: SizedBox(
             height: 22,
             child: Consumer<WalletOptionsProvider>(
@@ -210,7 +200,7 @@ class WalletOptions extends StatelessWidget {
                                         color: orangeC),
                                     Certifications(
                                         address: walletProvider.address.text,
-                                        size: 15)
+                                        size: 20)
                                   ]),
                             ),
                             SizedBox(height: 10 * ratio),
diff --git a/lib/screens/myWallets/wallets_home.dart b/lib/screens/myWallets/wallets_home.dart
index 41bd53b..5f7aa73 100644
--- a/lib/screens/myWallets/wallets_home.dart
+++ b/lib/screens/myWallets/wallets_home.dart
@@ -40,75 +40,57 @@ class _WalletsHomeState extends State<WalletsHome> {
     final currentChestNumber = myWalletProvider.getCurrentChest();
     final ChestData currentChest = chestBox.get(currentChestNumber)!;
 
-    return WillPopScope(
-      onWillPop: () {
-        Navigator.popUntil(
-          context,
-          ModalRoute.withName('/'),
-        );
-        return Future<bool>.value(true);
-      },
-      child: Scaffold(
-        backgroundColor: backgroundColor,
-        appBar: AppBar(
-          elevation: 1,
-          toolbarHeight: 60 * ratio,
-          leading: IconButton(
-              icon: const Icon(Icons.arrow_back, color: Colors.black),
-              onPressed: () {
-                Navigator.popUntil(
-                  context,
-                  ModalRoute.withName('/'),
-                );
-              }),
-          title: Row(
-            children: [
-              Image.asset(
-                'assets/chests/${currentChest.imageName}',
-                height: 32,
-              ),
-              const SizedBox(width: 17),
-              Text(currentChest.name!,
-                  style: TextStyle(color: Colors.grey[850])),
-            ],
-          ),
-          backgroundColor: const Color(0xffFFD58D),
+    return Scaffold(
+      backgroundColor: backgroundColor,
+      appBar: AppBar(
+        elevation: 1,
+        toolbarHeight: 60 * ratio,
+        title: Row(
+          children: [
+            Image.asset(
+              'assets/chests/${currentChest.imageName}',
+              height: 32,
+            ),
+            const SizedBox(width: 17),
+            Text(currentChest.name!, style: TextStyle(color: Colors.grey[850])),
+          ],
         ),
-        bottomNavigationBar:
-            Consumer<MyWalletsProvider>(builder: (context, _, __) {
-          return myWalletProvider.lastFlyBy == null
-              ? const GeckoBottomAppBar(
-                  actualRoute: 'safeHome',
-                )
-              : DragWalletsInfo(
-                  lastFlyBy: myWalletProvider.lastFlyBy!,
-                  dragAddress: myWalletProvider.dragAddress!,
-                );
-        }),
-        body: FutureBuilder(
-            future: myWalletProvider.readAllWallets(currentChestNumber),
-            builder: (context, snapshot) {
-              if (snapshot.connectionState != ConnectionState.done ||
-                  snapshot.hasError) {
-                return const Center(
-                  child: SizedBox(
-                    height: 50,
-                    width: 50,
-                    child: CircularProgressIndicator(
-                      color: orangeC,
-                      strokeWidth: 3,
-                    ),
-                  ),
-                );
-              }
-              return SafeArea(
-                child: Stack(children: [
-                  myWalletsTiles(context, currentChestNumber),
-                  const OfflineInfo(),
-                ]),
-              );
-            }),
+        backgroundColor: const Color(0xffFFD58D),
       ),
+      bottomNavigationBar:
+          Consumer<MyWalletsProvider>(builder: (context, _, __) {
+        return myWalletProvider.lastFlyBy == null
+            ? const GeckoBottomAppBar(
+                actualRoute: 'safeHome',
+              )
+            : DragWalletsInfo(
+                lastFlyBy: myWalletProvider.lastFlyBy!,
+                dragAddress: myWalletProvider.dragAddress!,
+              );
+      }),
+      body: FutureBuilder(
+          future: myWalletProvider.readAllWallets(currentChestNumber),
+          builder: (context, snapshot) {
+            if (snapshot.connectionState != ConnectionState.done ||
+                snapshot.hasError) {
+              return const Center(
+                child: SizedBox(
+                  height: 50,
+                  width: 50,
+                  child: CircularProgressIndicator(
+                    color: orangeC,
+                    strokeWidth: 3,
+                  ),
+                ),
+              );
+            }
+            return SafeArea(
+              child: Stack(children: [
+                myWalletsTiles(context, currentChestNumber),
+                const OfflineInfo(),
+              ]),
+            );
+          }),
     );
   }
 
diff --git a/lib/screens/onBoarding/10.dart b/lib/screens/onBoarding/10.dart
index 6fd3387..29a595c 100644
--- a/lib/screens/onBoarding/10.dart
+++ b/lib/screens/onBoarding/10.dart
@@ -1,10 +1,8 @@
 // ignore_for_file: file_names
 // ignore_for_file: must_be_immutable
 
-import 'dart:async';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/foundation.dart';
-
 import 'package:flutter/material.dart';
 import 'package:gecko/globals.dart';
 import 'package:gecko/models/wallet_data.dart';
@@ -42,11 +40,10 @@ class OnboardingStepTen extends StatelessWidget {
         Provider.of<MyWalletsProvider>(context, listen: false);
     final pinLenght = generateWalletProvider.pin.text.length;
 
-    return WillPopScope(
-      onWillPop: () {
+    return PopScope(
+      onPopInvoked: (_) {
         myWalletProvider.isPinValid = false;
         myWalletProvider.isPinLoading = true;
-        return Future<bool>.value(true);
       },
       child: Scaffold(
           backgroundColor: backgroundColor,
@@ -59,13 +56,6 @@ class OnboardingStepTen extends StatelessWidget {
                 style: const TextStyle(fontWeight: FontWeight.w600),
               ),
             ),
-            leading: IconButton(
-                icon: const Icon(Icons.arrow_back, color: Colors.black),
-                onPressed: () {
-                  myWalletProvider.isPinValid = false;
-                  myWalletProvider.isPinLoading = true;
-                  Navigator.of(context).pop();
-                }),
           ),
           extendBodyBehindAppBar: true,
           body: SafeArea(
diff --git a/lib/screens/onBoarding/11_congratulations.dart b/lib/screens/onBoarding/11_congratulations.dart
index f6193fb..9480295 100644
--- a/lib/screens/onBoarding/11_congratulations.dart
+++ b/lib/screens/onBoarding/11_congratulations.dart
@@ -16,10 +16,8 @@ class OnboardingStepEleven extends StatelessWidget {
     final conffetiController =
         ConfettiController(duration: const Duration(milliseconds: 500));
     conffetiController.play();
-    return WillPopScope(
-      onWillPop: () {
-        return Future<bool>.value(false);
-      },
+    return PopScope(
+      canPop: false,
       child: Scaffold(
           backgroundColor: backgroundColor,
           appBar: AppBar(
diff --git a/lib/screens/onBoarding/6.dart b/lib/screens/onBoarding/6.dart
index 7e786de..55dfa62 100644
--- a/lib/screens/onBoarding/6.dart
+++ b/lib/screens/onBoarding/6.dart
@@ -32,11 +32,10 @@ class OnboardingStepSix extends StatelessWidget {
 
     _mnemonicController.text = generatedMnemonic!;
 
-    return WillPopScope(
-      onWillPop: () {
+    return PopScope(
+      onPopInvoked: (_) {
         generateWalletProvider.isAskedWordValid = false;
         generateWalletProvider.askedWordColor = Colors.black;
-        return Future<bool>.value(true);
       },
       child: Scaffold(
         backgroundColor: backgroundColor,
diff --git a/lib/screens/search.dart b/lib/screens/search.dart
index c5e2f08..3b316fe 100644
--- a/lib/screens/search.dart
+++ b/lib/screens/search.dart
@@ -49,10 +49,9 @@ class _SearchScreenState extends State<SearchScreen> {
     final canValidate = searchProvider.searchController.text.length >= 2;
     // final canPasteAddress = false;
 
-    return WillPopScope(
-      onWillPop: () {
+    return PopScope(
+      onPopInvoked: (_) {
         searchProvider.searchController.text = '';
-        return Future<bool>.value(true);
       },
       child: Scaffold(
         backgroundColor: backgroundColor,
@@ -63,12 +62,6 @@ class _SearchScreenState extends State<SearchScreen> {
             height: 22,
             child: Text('search'.tr()),
           ),
-          leading: IconButton(
-              icon: const Icon(Icons.arrow_back, color: Colors.black),
-              onPressed: () {
-                searchProvider.searchController.text = '';
-                Navigator.of(context).pop();
-              }),
         ),
         body: SafeArea(
           child: Stack(children: [
diff --git a/lib/screens/transaction_in_progress.dart b/lib/screens/transaction_in_progress.dart
index d620415..4ce8005 100644
--- a/lib/screens/transaction_in_progress.dart
+++ b/lib/screens/transaction_in_progress.dart
@@ -85,14 +85,9 @@ class TransactionInProgress extends StatelessWidget {
 
     log.d("$transType :: ${actionMap[transType]} :: $result");
 
-    return WillPopScope(
-      onWillPop: () {
+    return PopScope(
+      onPopInvoked: (_) {
         sub.transactionStatus = '';
-        Navigator.pop(context);
-        if (transType == 'identityMigration') {
-          Navigator.pop(context);
-        }
-        return Future<bool>.value(true);
       },
       child: Scaffold(
         backgroundColor: backgroundColor,
@@ -206,11 +201,8 @@ class TransactionInProgress extends StatelessWidget {
                           backgroundColor: orangeC, // foreground
                         ),
                         onPressed: () {
-                          Navigator.pop(context);
                           sub.transactionStatus = '';
-                          if (transType == 'identityMigration') {
-                            Navigator.pop(context);
-                          }
+                          Navigator.pop(context);
                         },
                         child: Text(
                           'close'.tr(),
diff --git a/lib/screens/wallet_view.dart b/lib/screens/wallet_view.dart
index 573d4bc..51b5ac3 100644
--- a/lib/screens/wallet_view.dart
+++ b/lib/screens/wallet_view.dart
@@ -1,7 +1,8 @@
-// ignore_for_file: use_build_context_synchronously
+//FIXME: flutter upgrades should fix this... one day.
+// ignore_for_file: use_build_context_synchronously, prefer_const_constructors
+
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/services.dart';
-
 import 'package:gecko/globals.dart';
 import 'package:flutter/material.dart';
 import 'package:gecko/models/g1_wallets_list.dart';
diff --git a/lib/widgets/certifications.dart b/lib/widgets/certifications.dart
index 1a8885e..ac7f342 100644
--- a/lib/widgets/certifications.dart
+++ b/lib/widgets/certifications.dart
@@ -27,11 +27,11 @@ class Certifications extends StatelessWidget {
                             color: color, height: 20),
                         const SizedBox(width: 1),
                         Text(certs.data?[0].toString() ?? '0',
-                            style: TextStyle(fontSize: 20, color: color)),
+                            style: TextStyle(fontSize: size, color: color)),
                         const SizedBox(width: 5),
                         Text(
                           "(${certs.data?[1].toString() ?? '0'})",
-                          style: TextStyle(fontSize: 14, color: color),
+                          style: TextStyle(fontSize: size * 0.7, color: color),
                         )
                       ],
                     )
diff --git a/lib/widgets/drag_wallets_info.dart b/lib/widgets/drag_wallets_info.dart
index 293eb20..6428d4a 100644
--- a/lib/widgets/drag_wallets_info.dart
+++ b/lib/widgets/drag_wallets_info.dart
@@ -35,7 +35,7 @@ class DragWalletsInfo extends StatelessWidget {
       child: Center(
           child: Column(
         children: [
-          const SizedBox(height: 5),
+          const SizedBox(height: 2),
           Text('${'executeATransfer'.tr()}:'),
           MarkdownBody(data: '${'from'.tr()} **$fromName**'),
           if (isSameAddress) Text('chooseATargetWallet'.tr()),
diff --git a/lib/widgets/header_profile.dart b/lib/widgets/header_profile.dart
index de9a67a..1337e2d 100644
--- a/lib/widgets/header_profile.dart
+++ b/lib/widgets/header_profile.dart
@@ -37,7 +37,7 @@ class HeaderProfile extends StatelessWidget {
       Consumer<SubstrateSdk>(builder: (context, sub, _) {
         bool isAccountExist = walletOptions.balanceCache[address] != 0;
         return Container(
-            height: 180,
+            height: 185,
             decoration: BoxDecoration(
               gradient: LinearGradient(
                 begin: Alignment.topCenter,
@@ -75,9 +75,9 @@ class HeaderProfile extends StatelessWidget {
                     ),
                   ),
                 ]),
-                const SizedBox(height: 23),
+                const SizedBox(height: 18),
                 Balance(address: address, size: 25),
-                const SizedBox(height: 9),
+                const SizedBox(height: 5),
                 InkWell(
                   onTap: () => sub.certsCounterCache[address] != null
                       ? {
@@ -100,7 +100,7 @@ class HeaderProfile extends StatelessWidget {
                           address: address,
                           isOwner: false,
                           color: Colors.black),
-                      Certifications(address: address, size: 14)
+                      Certifications(address: address, size: 19)
                     ],
                   ),
                 ),
diff --git a/lib/widgets/idty_status.dart b/lib/widgets/idty_status.dart
index 61d3bc7..4e5339d 100644
--- a/lib/widgets/idty_status.dart
+++ b/lib/widgets/idty_status.dart
@@ -42,7 +42,7 @@ class IdentityStatus extends StatelessWidget {
               } else if (resStatus == IdtyStatus.validated) {
                 return NameByAddress(
                     wallet: WalletData(address: address),
-                    size: 24,
+                    size: 22,
                     color: Colors.black,
                     fontWeight: FontWeight.w600,
                     fontStyle: FontStyle.normal);
diff --git a/lib/widgets/payment_popup.dart b/lib/widgets/payment_popup.dart
index 23e39f9..b18fbf0 100644
--- a/lib/widgets/payment_popup.dart
+++ b/lib/widgets/payment_popup.dart
@@ -139,7 +139,7 @@ void paymentPopup(BuildContext context, String toAddress, String? username) {
                               },
                             ),
                           ]),
-                      const SizedBox(height: 20),
+                      const SizedBox(height: 5),
                       Text(
                         'from'.tr(),
                         style: TextStyle(
@@ -147,7 +147,7 @@ void paymentPopup(BuildContext context, String toAddress, String? username) {
                             fontWeight: FontWeight.w500,
                             color: Colors.grey[600]),
                       ),
-                      const SizedBox(height: 10),
+                      const SizedBox(height: 5),
                       Consumer<SubstrateSdk>(builder: (context, sub, _) {
                         return DropdownButton(
                             dropdownColor: const Color(0xffffeed1),
@@ -170,7 +170,7 @@ void paymentPopup(BuildContext context, String toAddress, String? username) {
                                     borderRadius: const BorderRadius.all(
                                         Radius.circular(10.0)),
                                   ),
-                                  padding: const EdgeInsets.all(10),
+                                  padding: const EdgeInsets.all(7),
                                   child: Visibility(
                                     visible:
                                         wallet.address == defaultWallet.address,
@@ -202,7 +202,7 @@ void paymentPopup(BuildContext context, String toAddress, String? username) {
                                   color: const Color(0xffffeed1),
                                   width: 408,
                                   height: 80,
-                                  padding: const EdgeInsets.all(10),
+                                  padding: const EdgeInsets.all(7),
                                   child: Row(children: [
                                     NameByAddress(
                                         wallet: wallet,
@@ -239,7 +239,7 @@ void paymentPopup(BuildContext context, String toAddress, String? username) {
                           ),
                         ],
                       ),
-                      const SizedBox(height: 12),
+                      const SizedBox(height: 7),
                       Row(
                         children: [
                           Text(
@@ -320,10 +320,10 @@ void paymentPopup(BuildContext context, String toAddress, String? username) {
                                   color: Colors.grey[500]!, width: 2),
                               borderRadius: BorderRadius.circular(8),
                             ),
-                            contentPadding: const EdgeInsets.all(20),
+                            contentPadding: const EdgeInsets.all(15),
                           ),
                           style: const TextStyle(
-                            fontSize: 35,
+                            fontSize: 33,
                             color: Colors.black,
                             fontWeight: FontWeight.w600,
                           ),
diff --git a/lib/widgets/wallet_tile_membre.dart b/lib/widgets/wallet_tile_membre.dart
index f668465..aebb95a 100644
--- a/lib/widgets/wallet_tile_membre.dart
+++ b/lib/widgets/wallet_tile_membre.dart
@@ -125,7 +125,7 @@ class WalletTileMembre extends StatelessWidget {
                           color: defaultWallet.address == repository.address
                               ? Colors.white
                               : Colors.black,
-                          size: 15),
+                          size: 18),
                     ),
                   ),
                 ]),
diff --git a/pubspec.lock b/pubspec.lock
index 62d06cb..749b434 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -253,10 +253,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.2"
+    version: "1.18.0"
   confetti:
     dependency: "direct main"
     description:
@@ -803,10 +803,10 @@ packages:
     dependency: transitive
     description:
       name: image_picker_for_web
-      sha256: "869fe8a64771b7afbc99fc433a5f7be2fea4d1cb3d7c11a48b6b579eb9c797f0"
+      sha256: "50bc9ae6a77eea3a8b11af5eb6c661eeb858fdd2f734c2a4fd17086922347ef7"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "3.0.1"
   image_picker_ios:
     dependency: transitive
     description:
@@ -952,10 +952,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.10.0"
   mime:
     dependency: transitive
     description:
@@ -1008,10 +1008,10 @@ packages:
     dependency: "direct main"
     description:
       name: package_info_plus
-      sha256: "7e76fad405b3e4016cd39d08f455a4eb5199723cf594cd1b8916d47140d93017"
+      sha256: "88bc797f44a94814f2213db1c9bd5badebafdfb8290ca9f78d4b9ee2a3db4d79"
       url: "https://pub.dev"
     source: hosted
-    version: "4.2.0"
+    version: "5.0.1"
   package_info_plus_platform_interface:
     dependency: transitive
     description:
@@ -1096,50 +1096,58 @@ packages:
     dependency: "direct main"
     description:
       name: permission_handler
-      sha256: "284a66179cabdf942f838543e10413246f06424d960c92ba95c84439154fcac8"
+      sha256: "860c6b871c94c78e202dc69546d4d8fd84bd59faeb36f8fb9888668a53ff4f78"
       url: "https://pub.dev"
     source: hosted
-    version: "11.0.1"
+    version: "11.1.0"
   permission_handler_android:
     dependency: transitive
     description:
       name: permission_handler_android
-      sha256: f9fddd3b46109bd69ff3f9efa5006d2d309b7aec0f3c1c5637a60a2d5659e76e
+      sha256: "2f1bec180ee2f5665c22faada971a8f024761f632e93ddc23310487df52dcfa6"
       url: "https://pub.dev"
     source: hosted
-    version: "11.1.0"
+    version: "12.0.1"
   permission_handler_apple:
     dependency: transitive
     description:
       name: permission_handler_apple
-      sha256: "99e220bce3f8877c78e4ace901082fb29fa1b4ebde529ad0932d8d664b34f3f5"
+      sha256: "1a816084338ada8d574b1cb48390e6e8b19305d5120fe3a37c98825bacc78306"
       url: "https://pub.dev"
     source: hosted
-    version: "9.1.4"
+    version: "9.2.0"
+  permission_handler_html:
+    dependency: transitive
+    description:
+      name: permission_handler_html
+      sha256: d96ff56a757b7f04fa825c469d296c5aebc55f743e87bd639fef91a466a24da8
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.0+1"
   permission_handler_platform_interface:
     dependency: transitive
     description:
       name: permission_handler_platform_interface
-      sha256: "6760eb5ef34589224771010805bea6054ad28453906936f843a8cc4d3a55c4a4"
+      sha256: d87349312f7eaf6ce0adaf668daf700ac5b06af84338bd8b8574dfbd93ffe1a1
       url: "https://pub.dev"
     source: hosted
-    version: "3.12.0"
+    version: "4.0.2"
   permission_handler_windows:
     dependency: transitive
     description:
       name: permission_handler_windows
-      sha256: cc074aace208760f1eee6aa4fae766b45d947df85bc831cde77009cdb4720098
+      sha256: "1e8640c1e39121128da6b816d236e714d2cf17fac5a105dd6acdd3403a628004"
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.3"
+    version: "0.2.0"
   petitparser:
     dependency: transitive
     description:
       name: petitparser
-      sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750
+      sha256: eeb2d1428ee7f4170e2bd498827296a18d4e7fc462b71727d111c0ac7707cfa6
       url: "https://pub.dev"
     source: hosted
-    version: "5.4.0"
+    version: "6.0.1"
   pin_code_fields:
     dependency: "direct main"
     description:
@@ -1160,10 +1168,10 @@ packages:
     dependency: transitive
     description:
       name: platform
-      sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76"
+      sha256: ae68c7bfcd7383af3629daafb32fb4e8681c7154428da4febcff06200585f102
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.0"
+    version: "3.1.2"
   plugin_platform_interface:
     dependency: transitive
     description:
@@ -1370,10 +1378,10 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_web
-      sha256: d762709c2bbe80626ecc819143013cc820fa49ca5e363620ee20a8b15a3e3daf
+      sha256: "7b15ffb9387ea3e237bb7a66b8a23d2147663d391cafc5c8f37b2e7b4bde5d21"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    version: "2.2.2"
   shared_preferences_windows:
     dependency: transitive
     description:
@@ -1415,18 +1423,18 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.11.1"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   stream_transform:
     dependency: transitive
     description:
@@ -1463,10 +1471,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
+      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.0"
+    version: "0.6.1"
   timing:
     dependency: transitive
     description:
@@ -1567,10 +1575,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_web
-      sha256: "7fd2f55fe86cea2897b963e864dc01a7eb0719ecc65fcef4c1cc3d686d718bb2"
+      sha256: "138bd45b3a456dcfafc46d1a146787424f8d2edfbf2809c9324361e58f851cf7"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.2.1"
   url_launcher_windows:
     dependency: transitive
     description:
@@ -1623,10 +1631,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: c620a6f783fa22436da68e42db7ebbf18b8c44b9a46ab911f666ff09ffd9153f
+      sha256: c538be99af830f478718b51630ec1b6bee5e74e52c8a802d328d9e71d35d2583
       url: "https://pub.dev"
     source: hosted
-    version: "11.7.1"
+    version: "11.10.0"
   wallet:
     dependency: transitive
     description:
@@ -1647,10 +1655,10 @@ packages:
     dependency: transitive
     description:
       name: web
-      sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
+      sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.4-beta"
+    version: "0.3.0"
   web3dart:
     dependency: transitive
     description:
@@ -1711,10 +1719,10 @@ packages:
     dependency: transitive
     description:
       name: win32
-      sha256: "5a751eddf9db89b3e5f9d50c20ab8612296e4e8db69009788d6c8b060a84191c"
+      sha256: "7c99c0e1e2fa190b48d25c81ca5e42036d5cac81430ef249027d97b0935c553f"
       url: "https://pub.dev"
     source: hosted
-    version: "4.1.4"
+    version: "5.1.0"
   xdg_directories:
     dependency: transitive
     description:
@@ -1727,10 +1735,10 @@ packages:
     dependency: transitive
     description:
       name: xml
-      sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84"
+      sha256: af5e77e9b83f2f4adc5d3f0a4ece1c7f45a2467b695c2540381bac793e34e556
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.0"
+    version: "6.4.2"
   yaml:
     dependency: transitive
     description:
@@ -1740,5 +1748,5 @@ packages:
     source: hosted
     version: "3.1.2"
 sdks:
-  dart: ">=3.1.0 <4.0.0"
-  flutter: ">=3.13.0"
+  dart: ">=3.2.0 <4.0.0"
+  flutter: ">=3.16.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index efa4686..493ad22 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -37,7 +37,7 @@ dependencies:
   unorm_dart: ^0.3.0
   dio: ^5.0.1
   durt: ^0.1.6
-  package_info_plus: ^4.2.0
+  package_info_plus: ^5.0.1
   polkawallet_sdk: #^0.5.2
     git:
       # url: https://github.com/polkawallet-io/sdk.git