diff --git a/app/src/main/java/com/alphawallet/app/C.java b/app/src/main/java/com/alphawallet/app/C.java
index d53390d0f8..8a0ee85704 100644
--- a/app/src/main/java/com/alphawallet/app/C.java
+++ b/app/src/main/java/com/alphawallet/app/C.java
@@ -40,8 +40,8 @@ public abstract class C {
     public static final String ARBITRUM_ONE_NETWORK = "Arbitrum One";
     public static final String PALM_NAME = "PALM";
     public static final String PALM_TEST_NAME = "PALM (Test)";
-    public static final String KLAYTN_NAME = "Klaytn Cypress";
-    public static final String KLAYTN_BAOBAB_NAME = "Klaytn Baobab (Test)";
+    public static final String KLAYTN_NAME = "Kaia Mainnet";
+    public static final String KLAYTN_BAOBAB_NAME = "Kaia Kairos (Test)";
     public static final String IOTEX_NAME = "IoTeX";
     public static final String IOTEX_TESTNET_NAME = "IoTeX (Test)";
     public static final String AURORA_MAINNET_NAME = "Aurora";
@@ -89,7 +89,7 @@ public abstract class C {
     public static final String CRONOS_TEST_SYMBOL = "tCRO";
     public static final String ARBITRUM_SYMBOL = "AETH";
     public static final String PALM_SYMBOL = "PALM";
-    public static final String KLAYTN_SYMBOL = "KLAY";
+    public static final String KLAYTN_SYMBOL = "KAIA";
     public static final String IOTEX_SYMBOL = "IOTX";
     public static final String MILKOMEDA_SYMBOL = "milkADA";
     public static final String MILKOMEDA_TEST_SYMBOL = "milktADA";
diff --git a/app/src/main/java/com/alphawallet/app/entity/Transaction.java b/app/src/main/java/com/alphawallet/app/entity/Transaction.java
index 7e21c8cdd6..8c534abe83 100644
--- a/app/src/main/java/com/alphawallet/app/entity/Transaction.java
+++ b/app/src/main/java/com/alphawallet/app/entity/Transaction.java
@@ -224,8 +224,8 @@ else if (ethTx.getTo() == null && ethTx.getInput() != null && ethTx.getInput().s
         this.gasPrice = ethTx.getGasPrice().toString();
         this.gasUsed = ethTx.getGas().toString();
         this.chainId = chainId;
-        this.maxFeePerGas = ethTx.getMaxFeePerGas().toString();
-        this.maxPriorityFee = ethTx.getMaxPriorityFeePerGas().toString();
+        this.maxFeePerGas = ethTx.getMaxFeePerGasRaw() != null ? ethTx.getMaxFeePerGas().toString() : "";
+        this.maxPriorityFee = ethTx.getMaxPriorityFeePerGasRaw() != null ? ethTx.getMaxPriorityFeePerGas().toString() : "";
         this.functionName = "";
     }
 
diff --git a/app/src/main/java/com/alphawallet/app/repository/EthereumNetworkBase.java b/app/src/main/java/com/alphawallet/app/repository/EthereumNetworkBase.java
index f6616a94c3..805c4f36f0 100644
--- a/app/src/main/java/com/alphawallet/app/repository/EthereumNetworkBase.java
+++ b/app/src/main/java/com/alphawallet/app/repository/EthereumNetworkBase.java
@@ -173,10 +173,9 @@ public abstract class EthereumNetworkBase implements EthereumNetworkRepositoryTy
 
 
 
-    public static final String USE_KLAYTN_RPC = !TextUtils.isEmpty(keyProvider.getBlockPiCypressKey()) ? "https://klaytn.blockpi.network/v1/rpc/" + keyProvider.getBlockPiCypressKey()
-            : KLAYTN_RPC;
-    public static final String USE_KLAYTN_BAOBAB_RPC = !TextUtils.isEmpty(keyProvider.getBlockPiBaobabKey()) ? "https://klaytn-baobab.blockpi.network/v1/rpc/" + keyProvider.getBlockPiBaobabKey()
-            : KLAYTN_BAOBAB_RPC;
+    public static final String USE_KLAYTN_RPC = "https://public-en.node.kaia.io";//!TextUtils.isEmpty(keyProvider.getBlockPiCypressKey()) ? "https://klaytn.blockpi.network/v1/rpc/" + keyProvider.getBlockPiCypressKey()
+    public static final String USE_KLAYTN_BAOBAB_RPC = "https://rpc.ankr.com/klaytn_testnet";
+
     public static final String CRONOS_MAIN_RPC_URL = "https://evm.cronos.org";
 
     public static final String MINT_MAINNET_FALLBACK = "https://asia.rpc.mintchain.io";
@@ -329,11 +328,11 @@ public static boolean isOKX(NetworkInfo networkInfo)
                     "https://explorer.palm-uat.xyz/api?"));
             put(KLAYTN_ID, new NetworkInfo(C.KLAYTN_NAME, C.KLAYTN_SYMBOL,
                 USE_KLAYTN_RPC,
-                "https://scope.klaytn.com/tx/", KLAYTN_ID, KLAYTN_RPC,
+                "https://kaiascan.io/tx/", KLAYTN_ID, USE_KLAYTN_RPC,
                 ""));
             put(KLAYTN_BAOBAB_ID, new NetworkInfo(C.KLAYTN_BAOBAB_NAME, C.KLAYTN_SYMBOL,
                 USE_KLAYTN_BAOBAB_RPC,
-                "https://baobab.scope.klaytn.com/tx/", KLAYTN_BAOBAB_ID, KLAYTN_BAOBAB_RPC,
+                "https://kairos.kaiascan.io/tx/", KLAYTN_BAOBAB_ID, USE_KLAYTN_BAOBAB_RPC,
                 ""));
             put(IOTEX_MAINNET_ID, new NetworkInfo(C.IOTEX_NAME, C.IOTEX_SYMBOL,
                     IOTEX_MAINNET_RPC_URL,
@@ -452,8 +451,8 @@ public static boolean isOKX(NetworkInfo networkInfo)
             put(ARBITRUM_MAIN_ID, R.drawable.ic_icons_arbitrum);
             put(PALM_ID, R.drawable.ic_icons_network_palm);
             put(PALM_TEST_ID, R.drawable.palm_logo_test);
-            put(KLAYTN_ID, R.drawable.ic_klaytn_network_logo);
-            put(KLAYTN_BAOBAB_ID, R.drawable.ic_klaytn_test);
+            put(KLAYTN_ID, R.drawable.ic_icons_kaia);
+            put(KLAYTN_BAOBAB_ID, R.drawable.ic_icons_kaia_test);
             put(IOTEX_MAINNET_ID, R.drawable.ic_iotex);
             put(IOTEX_TESTNET_ID, R.drawable.ic_iotex_test);
             put(AURORA_MAINNET_ID, R.drawable.ic_aurora);
@@ -502,8 +501,8 @@ public static boolean isOKX(NetworkInfo networkInfo)
             put(ARBITRUM_MAIN_ID, R.drawable.ic_icons_network_arbitrum);
             put(PALM_ID, R.drawable.ic_icons_network_palm);
             put(PALM_TEST_ID, R.drawable.palm_logo_test);
-            put(KLAYTN_ID, R.drawable.ic_klaytn_network_logo);
-            put(KLAYTN_BAOBAB_ID, R.drawable.ic_klaytn_test);
+            put(KLAYTN_ID, R.drawable.ic_icons_kaia);
+            put(KLAYTN_BAOBAB_ID, R.drawable.ic_icons_kaia_test);
             put(IOTEX_MAINNET_ID, R.drawable.ic_iotex);
             put(IOTEX_TESTNET_ID, R.drawable.ic_iotex_test);
             put(AURORA_MAINNET_ID, R.drawable.ic_aurora);
diff --git a/app/src/main/res/drawable/ic_icons_kaia.xml b/app/src/main/res/drawable/ic_icons_kaia.xml
new file mode 100644
index 0000000000..61d357c03a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_icons_kaia.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="30dp"
+        android:height="30dp"
+        android:viewportWidth="30"
+        android:viewportHeight="30">
+    <path
+            android:pathData="M0,15C0,6.72 6.72,0 15,0s15,6.72 15,15 -6.72,15 -15,15S0,23.28 0,15"
+            android:fillColor="#BFF009"/>
+
+    <path android:fillColor="#000000" android:fillType="nonZero" android:pathData="M14.138,9.308c0,-0.925 0.754,-1.68 1.68,-1.68l3.005,0L18.822,3.54l-3.005,0a5.767,5.767 135,0 0,-5.27 8.104c-2.473,1.046 -4.113,3.269 -4.495,6.081c-0.448,3.088 0.788,6.418 3.481,8.026c2.402,1.516 6.159,1.414 8.185,-0.686l0,1.394l4.183,0l0,-15.471L15.817,10.988a1.682,1.682 135,0 1,-1.68 -1.68m3.674,5.772l0,3.884a3.884,3.884 0,0 1,-3.878 3.881a3.883,3.883 0,0 1,0 -7.765z" android:strokeColor="#00000000" android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="1.66"/>
+
+</vector>
diff --git a/app/src/main/res/drawable/ic_icons_kaia_test.xml b/app/src/main/res/drawable/ic_icons_kaia_test.xml
new file mode 100644
index 0000000000..8e6b5a3523
--- /dev/null
+++ b/app/src/main/res/drawable/ic_icons_kaia_test.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="30dp"
+        android:height="30dp"
+        android:viewportWidth="30"
+        android:viewportHeight="30">
+    <path
+            android:pathData="M0,15C0,6.72 6.72,0 15,0s15,6.72 15,15 -6.72,15 -15,15S0,23.28 0,15"
+            android:fillColor="#B2C6D8"/>
+    <path android:fillColor="#000000" android:fillType="nonZero" android:pathData="M14.138,9.308c0,-0.925 0.754,-1.68 1.68,-1.68l3.005,0L18.822,3.54l-3.005,0a5.767,5.767 135,0 0,-5.27 8.104c-2.473,1.046 -4.113,3.269 -4.495,6.081c-0.448,3.088 0.788,6.418 3.481,8.026c2.402,1.516 6.159,1.414 8.185,-0.686l0,1.394l4.183,0l0,-15.471L15.817,10.988a1.682,1.682 135,0 1,-1.68 -1.68m3.674,5.772l0,3.884a3.884,3.884 0,0 1,-3.878 3.881a3.883,3.883 0,0 1,0 -7.765z" android:strokeColor="#00000000" android:strokeLineCap="butt" android:strokeLineJoin="miter" android:strokeWidth="1.66"/>
+
+</vector>
diff --git a/lib/src/main/java/com/alphawallet/ethereum/EthereumNetworkBase.java b/lib/src/main/java/com/alphawallet/ethereum/EthereumNetworkBase.java
index f5c365aa56..ce8621851c 100644
--- a/lib/src/main/java/com/alphawallet/ethereum/EthereumNetworkBase.java
+++ b/lib/src/main/java/com/alphawallet/ethereum/EthereumNetworkBase.java
@@ -60,7 +60,7 @@ public abstract class EthereumNetworkBase
     public static final String GOERLI_RPC_URL = "https://goerli.infura.io/v3/da3717f25f824cc1baa32d812386d93f";
     public static final String BINANCE_TEST_RPC_URL = "https://data-seed-prebsc-1-s3.binance.org:8545";
     public static final String BINANCE_MAIN_RPC_URL = "https://bsc-dataseed.binance.org";
-    public static final String HECO_RPC_URL = "https://http-mainnet-node.huobichain.com";
+    public static final String HECO_RPC_URL = "https://http-mainnet.hecochain.com";
     public static final String AVALANCHE_RPC_URL = "https://api.avax.network/ext/bc/C/rpc";
     public static final String FUJI_TEST_RPC_URL = "https://api.avax-test.network/ext/bc/C/rpc";
     public static final String FANTOM_RPC_URL = "https://rpcapi.fantom.network";
@@ -147,9 +147,9 @@ public abstract class EthereumNetworkBase
                     PALM_ID, false));
             put(PALM_TEST_ID, new NetworkInfo("PALM (Test)", "PALM", PALM_TEST_RPC_URL, "https://explorer.palm-uat.xyz/tx/",
                     PALM_TEST_ID, false));
-            put(KLAYTN_ID, new NetworkInfo("Klaytn Cypress", "KLAY", KLAYTN_RPC, "https://scope.klaytn.com/tx/",
+            put(KLAYTN_ID, new NetworkInfo("Kaia Mainnet", "KAIA", KLAYTN_RPC, "https://scope.klaytn.com/tx/",
                     KLAYTN_ID, false));
-            put(KLAYTN_BAOBAB_ID, new NetworkInfo("Klaytn Baobab (Test)", "KLAY", KLAYTN_BAOBAB_RPC, "https://baobab.scope.klaytn.com/tx/",
+            put(KLAYTN_BAOBAB_ID, new NetworkInfo("Kaia Kairos (Test)", "KAIA", KLAYTN_BAOBAB_RPC, "https://baobab.scope.klaytn.com/tx/",
                     KLAYTN_BAOBAB_ID, false));
             put(AURORA_MAINNET_ID, new NetworkInfo("Aurora", "ETH", AURORA_MAINNET_RPC_URL, "https://aurorascan.dev/tx/",
                     AURORA_MAINNET_ID, false));