diff --git a/example/lib/pages/assetsContent.dart b/example/lib/pages/assetsContent.dart
index 008dcaeaa..cb2669c51 100644
--- a/example/lib/pages/assetsContent.dart
+++ b/example/lib/pages/assetsContent.dart
@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
-import 'package:polkawallet_ui/components/borderedTitle.dart';
-import 'package:polkawallet_ui/components/roundedCard.dart';
 import 'package:polkawallet_sdk/plugin/index.dart';
 import 'package:polkawallet_sdk/plugin/store/balances.dart';
 import 'package:polkawallet_sdk/storage/keyring.dart';
+import 'package:polkawallet_ui/components/borderedTitle.dart';
+import 'package:polkawallet_ui/components/roundedCard.dart';
 import 'package:polkawallet_ui/components/textTag.dart';
 import 'package:polkawallet_ui/utils/consts.dart';
 import 'package:polkawallet_ui/utils/format.dart';
@@ -65,7 +65,6 @@ class _AssetsContentState extends State<AssetsContent> {
                           'TestToken',
                           fontSize: 16,
                           color: PluginColorsDark.primary,
-                          textColor: PluginColorsDark.headline1,
                           margin: EdgeInsets.only(left: 12),
                           padding: EdgeInsets.fromLTRB(8, 4, 8, 4),
                         ))
diff --git a/lib/pages/staking/actions/setPayeePage.dart b/lib/pages/staking/actions/setPayeePage.dart
index 883d9e034..f335821e9 100644
--- a/lib/pages/staking/actions/setPayeePage.dart
+++ b/lib/pages/staking/actions/setPayeePage.dart
@@ -9,9 +9,9 @@ import 'package:polkawallet_sdk/storage/keyring.dart';
 import 'package:polkawallet_sdk/storage/types/keyPairData.dart';
 import 'package:polkawallet_sdk/utils/i18n.dart';
 import 'package:polkawallet_ui/components/textTag.dart';
+import 'package:polkawallet_ui/components/v3/addressTextFormField.dart';
 import 'package:polkawallet_ui/components/v3/dialog.dart';
 import 'package:polkawallet_ui/components/v3/plugin/pluginAddressFormItem.dart';
-import 'package:polkawallet_ui/components/v3/plugin/pluginAddressTextFormField.dart';
 import 'package:polkawallet_ui/components/v3/plugin/pluginInputItem.dart';
 import 'package:polkawallet_ui/components/v3/plugin/pluginScaffold.dart';
 import 'package:polkawallet_ui/components/v3/plugin/pluginTxButton.dart';
@@ -253,7 +253,7 @@ class _PayeeSelectorState extends State<PayeeSelector> {
             visible: (_rewardTo ?? widget.initialValue!.destinationId) == 3,
             child: Container(
               margin: EdgeInsets.only(top: 12),
-              child: PluginAddressTextFormField(
+              child: AddressTextFormField(
                 widget.plugin.sdk.api,
                 widget.keyring.allWithContacts,
                 initialValue: _rewardAccount ?? defaultAcc,
@@ -264,6 +264,7 @@ class _PayeeSelectorState extends State<PayeeSelector> {
                   widget.onChange!(_rewardTo, acc.address);
                 },
                 key: ValueKey<KeyPairData?>(_rewardAccount),
+                isHubTheme: true,
               ),
             ),
           ),