diff --git a/lib/src/screens/new_wallet/new_wallet_page.dart b/lib/src/screens/new_wallet/new_wallet_page.dart
index 58cc37a52..a73e814e8 100644
--- a/lib/src/screens/new_wallet/new_wallet_page.dart
+++ b/lib/src/screens/new_wallet/new_wallet_page.dart
@@ -127,17 +127,19 @@ class _WalletNameFormState extends State<WalletNameForm> {
                         });
                       },
                       icon: Container(
-                        padding: const EdgeInsets.all(7),
+                        padding: const EdgeInsets.all(8),
                         decoration: BoxDecoration(
                           borderRadius: BorderRadius.circular(6.0),
-                          color: Color.fromRGBO(91, 112, 146, 1),
+                          color: Theme.of(context).hintColor,
                         ),
-                        width: 27.0,
-                        height: 27.0,
+                        width: 34,
+                        height: 34,
                         child: Image.asset(
                           'assets/images/refresh_icon.png',
-                          width: 14,
-                          height: 13,
+                          color: Theme.of(context)
+                              .primaryTextTheme
+                              .display1
+                              .decorationColor,
                         ),
                       ),
                     ),
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 4e83bdb5b..9338b3eb1 100644
--- a/lib/src/screens/restore/wallet_restore_from_seed_form.dart
+++ b/lib/src/screens/restore/wallet_restore_from_seed_form.dart
@@ -61,33 +61,33 @@ class WalletRestoreFromSeedFormState extends State<WalletRestoreFromSeedForm> {
             controller: nameTextEditingController,
             hintText: S.of(context).wallet_name,
             validator: WalletNameValidator(),
-            suffixIcon: IconButton(
-              onPressed: () async {
-                final String rName = await generateName();
+            suffixIcon: Container(
+              width: 12,
+              height: 14,
+              margin: const EdgeInsets.only( bottom: 15, left: 13),
+              child: InkWell(
+                onTap: () async {
+                  final String rName = await generateName();
 
-                print(rName);
-                setState(() {
-                  nameTextEditingController.text = rName;
-                  nameTextEditingController.selection =
-                      TextSelection.fromPosition(TextPosition(
-                          offset: nameTextEditingController.text.length));
-                });
-              },
-              icon:Container(
-                        padding: const EdgeInsets.all(7)
-                        ,
-                        decoration: BoxDecoration(
-                            borderRadius: BorderRadius.circular(6.0),
-                            color: Color.fromRGBO(91, 112, 146, 1),),
-                        width: 27.0,
-                        height: 27.0,
-                        
-                        child: Image.asset(
-                          'assets/images/refresh_icon.png',
-                          width: 14,
-                          height: 13,
-                        ),
-                      ),
+                  print(rName);
+                  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),
diff --git a/lib/src/widgets/seed_widget.dart b/lib/src/widgets/seed_widget.dart
index ef768c0de..289b8076b 100644
--- a/lib/src/widgets/seed_widget.dart
+++ b/lib/src/widgets/seed_widget.dart
@@ -25,8 +25,7 @@ class SeedWidgetState extends State<SeedWidget> {
   SeedWidgetState(String language, this.type)
       : controller = TextEditingController(),
         focusNode = FocusNode(),
-        words = SeedValidator.getWordList(
-            type:type, language: language) {
+        words = SeedValidator.getWordList(type: type, language: language) {
     focusNode.addListener(() {
       setState(() {
         if (!focusNode.hasFocus && controller.text.isEmpty) {
@@ -56,8 +55,7 @@ class SeedWidgetState extends State<SeedWidget> {
 
   void changeSeedLanguage(String language) {
     setState(() {
-      words = SeedValidator.getWordList(
-          type: type, language: language);
+      words = SeedValidator.getWordList(type: type, language: language);
     });
   }