diff --git a/lib/entities/generate_name.dart b/lib/entities/generate_name.dart
index 140a60b31..4aa570769 100644
--- a/lib/entities/generate_name.dart
+++ b/lib/entities/generate_name.dart
@@ -20,6 +20,5 @@ Future<String> generateName() async {
   final chosenNoun = nouns[randomThing.nextInt(nouns.length)];
   final returnString =
       chosenAdjective.capitalized() + ' ' + chosenNoun.capitalized();
-    
   return returnString;
 }
diff --git a/lib/src/screens/new_wallet/new_wallet_page.dart b/lib/src/screens/new_wallet/new_wallet_page.dart
index a73e814e8..a4a0b32be 100644
--- a/lib/src/screens/new_wallet/new_wallet_page.dart
+++ b/lib/src/screens/new_wallet/new_wallet_page.dart
@@ -116,9 +116,7 @@ class _WalletNameFormState extends State<WalletNameForm> {
                   decoration: InputDecoration(
                     suffixIcon: IconButton(
                       onPressed: () async {
-                        final String rName = await generateName();
-
-                        print(rName);
+                        final rName = await generateName();
                         setState(() {
                           _controller.text = rName;
                           _walletNewVM.name = rName;
diff --git a/lib/src/screens/restore/wallet_restore_from_keys_form.dart b/lib/src/screens/restore/wallet_restore_from_keys_form.dart
index 4ad9c25bc..36264aa95 100644
--- a/lib/src/screens/restore/wallet_restore_from_keys_form.dart
+++ b/lib/src/screens/restore/wallet_restore_from_keys_form.dart
@@ -7,12 +7,13 @@ import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
 import 'package:cake_wallet/src/widgets/base_text_form_field.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/core/validator.dart';
+import 'package:cake_wallet/entities/generate_name.dart';
 
 class WalletRestoreFromKeysFrom extends StatefulWidget {
   WalletRestoreFromKeysFrom({Key key, this.onHeightOrDateEntered})
       : super(key: key);
 
-  final Function (bool) onHeightOrDateEntered;
+  final Function(bool) onHeightOrDateEntered;
 
   @override
   WalletRestoreFromKeysFromState createState() =>
@@ -56,7 +57,34 @@ class WalletRestoreFromKeysFromState extends State<WalletRestoreFromKeysFrom> {
             BaseTextFormField(
               controller: nameTextEditingController,
               hintText: S.of(context).wallet_name,
-              validator:  WalletNameValidator()),
+              validator: WalletNameValidator(),
+              suffixIcon: Container(
+                width: 12,
+                height: 14,
+                margin: const EdgeInsets.only(bottom: 15, left: 13),
+                child: InkWell(
+                  onTap: () async {
+                    final rName = await generateName();
+                    setState(() {
+                      nameTextEditingController.text = rName;
+                      nameTextEditingController.selection =
+                          TextSelection.fromPosition(TextPosition(
+                              offset: nameTextEditingController.text.length));
+                    });
+                  },
+                  child: Container(
+                      padding: EdgeInsets.all(8),
+                      decoration: BoxDecoration(
+                          color: Theme.of(context).hintColor,
+                          borderRadius: BorderRadius.all(Radius.circular(6))),
+                      child: Image.asset('assets/images/refresh_icon.png',
+                          color: Theme.of(context)
+                              .primaryTextTheme
+                              .display1
+                              .decorationColor)),
+                ),
+              ),
+            ),
             Container(height: 20),
             BaseTextFormField(
                 controller: addressController,
diff --git a/lib/src/screens/restore/wallet_restore_from_seed_form.dart b/lib/src/screens/restore/wallet_restore_from_seed_form.dart
index 9338b3eb1..6e3ab92fe 100644
--- a/lib/src/screens/restore/wallet_restore_from_seed_form.dart
+++ b/lib/src/screens/restore/wallet_restore_from_seed_form.dart
@@ -64,12 +64,10 @@ class WalletRestoreFromSeedFormState extends State<WalletRestoreFromSeedForm> {
             suffixIcon: Container(
               width: 12,
               height: 14,
-              margin: const EdgeInsets.only( bottom: 15, left: 13),
+              margin: const EdgeInsets.only(bottom: 15, left: 13),
               child: InkWell(
                 onTap: () async {
-                  final String rName = await generateName();
-
-                  print(rName);
+                  final rName = await generateName();
                   setState(() {
                     nameTextEditingController.text = rName;
                     nameTextEditingController.selection =