diff --git a/_raw/locales/en/messages.json b/_raw/locales/en/messages.json
index 5aadf794767..63a299e4735 100644
--- a/_raw/locales/en/messages.json
+++ b/_raw/locales/en/messages.json
@@ -1116,7 +1116,7 @@
         },
         "TestnetAssetListContainer": {
           "add": "Token",
-          "addTestnet": "Testnet"
+          "addTestnet": "Network"
         },
         "noTestnetAssets": "No Custom Network Assets"
       },
diff --git a/src/ui/component/PillsSwitch/NetSwitchTabs.tsx b/src/ui/component/PillsSwitch/NetSwitchTabs.tsx
index 90c82d43d58..2784f2f7d3a 100644
--- a/src/ui/component/PillsSwitch/NetSwitchTabs.tsx
+++ b/src/ui/component/PillsSwitch/NetSwitchTabs.tsx
@@ -65,7 +65,7 @@ export default function NetSwitchTabs(props: SwitchTabProps) {
   return (
     <PillsSwitch
       {...props}
-      className="flex bg-r-neutral-line w-[260px] mx-[auto] my-[0] h-[28px] p-[2px] mb-[14px]"
+      className="flex bg-r-neutral-line w-[260px] mx-[auto] my-[0] h-[32px] p-[2px] mb-[14px]"
       itemClassname={clsx('w-[128px] text-[12px]')}
       itemClassnameActive="bg-r-neutral-bg-1"
       itemClassnameInActive={clsx(
diff --git a/src/ui/component/PillsSwitch/index.less b/src/ui/component/PillsSwitch/index.less
index 16d663725e5..ff016e90c21 100644
--- a/src/ui/component/PillsSwitch/index.less
+++ b/src/ui/component/PillsSwitch/index.less
@@ -13,7 +13,7 @@
 
 .pills-switch__item {
   color: var(--r-neutral-body);
-  font-size: 13px;
+  font-size: 12px;
   font-style: normal;
   font-weight: 500;
   line-height: normal;
diff --git a/src/ui/views/CommonPopup/AssetList/CustomTestnetAssetList/AddCustomTestnetTokenPopup.tsx b/src/ui/views/CommonPopup/AssetList/CustomTestnetAssetList/AddCustomTestnetTokenPopup.tsx
index 3bba9c4d2e7..6aa8780b2be 100644
--- a/src/ui/views/CommonPopup/AssetList/CustomTestnetAssetList/AddCustomTestnetTokenPopup.tsx
+++ b/src/ui/views/CommonPopup/AssetList/CustomTestnetAssetList/AddCustomTestnetTokenPopup.tsx
@@ -212,7 +212,14 @@ export const AddCustomTestnetTokenPopup = ({
                 }}
               >
                 {!chain ? (
-                  <div className="flex items-center bg-r-neutral-card2 rounded-[6px] px-[16px] py-[12px] min-h-[52px] cursor-pointer">
+                  <div
+                    className={clsx(
+                      'flex items-center bg-r-neutral-card2 rounded-[6px]',
+                      'px-[16px] py-[12px] min-h-[52px] cursor-pointer',
+                      'border-[1px] border-transparent',
+                      'hover:border-rabby-blue-default hover:bg-r-blue-light1'
+                    )}
+                  >
                     <div className="text-r-neutral-title1 text-[15px] leading-[18px]">
                       {t('page.dashboard.assets.AddTestnetToken.selectChain')}
                     </div>
@@ -221,7 +228,14 @@ export const AddCustomTestnetTokenPopup = ({
                     </div>
                   </div>
                 ) : (
-                  <div className="flex items-center bg-r-neutral-card2 rounded-[6px] gap-[8px] px-[16px] py-[12px] min-h-[52px] cursor-pointer">
+                  <div
+                    className={clsx(
+                      'flex items-center bg-r-neutral-card2 rounded-[6px]',
+                      'gap-[8px] px-[16px] py-[12px] min-h-[52px] cursor-pointer',
+                      'border-[1px] border-transparent',
+                      'hover:border-rabby-blue-default hover:bg-r-blue-light1'
+                    )}
+                  >
                     <img
                       src={chain?.logo}
                       alt=""
diff --git a/src/ui/views/CommonPopup/AssetList/CustomTestnetAssetList/CustomTestnetAssetListContainer.tsx b/src/ui/views/CommonPopup/AssetList/CustomTestnetAssetList/CustomTestnetAssetListContainer.tsx
index 874ab20be45..3dd24825761 100644
--- a/src/ui/views/CommonPopup/AssetList/CustomTestnetAssetList/CustomTestnetAssetListContainer.tsx
+++ b/src/ui/views/CommonPopup/AssetList/CustomTestnetAssetList/CustomTestnetAssetListContainer.tsx
@@ -86,7 +86,7 @@ export const CustomTestnetAssetListContainer: React.FC<Props> = ({
   );
 
   if (!isFetched && !search) {
-    return <TokenListViewSkeleton />;
+    return <TokenListViewSkeleton isTestnet />;
   }
 
   const isNoResults = !list?.length;
@@ -117,7 +117,7 @@ export const CustomTestnetAssetListContainer: React.FC<Props> = ({
               <div
                 className={clsx(
                   'text-r-neutral-body text-[13px] leading-[16px] cursor-pointer',
-                  'flex items-center gap-x-[4px]'
+                  'flex items-center gap-x-[4px] justify-center'
                 )}
                 onClick={() => {
                   setIsShowAddTestnetModal(true);
@@ -141,7 +141,7 @@ export const CustomTestnetAssetListContainer: React.FC<Props> = ({
               <div
                 className={clsx(
                   'text-r-neutral-body text-[13px] leading-[16px] cursor-pointer',
-                  'flex items-center gap-x-[4px]'
+                  'flex items-center gap-x-[4px] justify-center'
                 )}
                 onClick={() => {
                   setIsShowAddModal(true);
diff --git a/src/ui/views/CommonPopup/AssetList/TokenListViewSkeleton.tsx b/src/ui/views/CommonPopup/AssetList/TokenListViewSkeleton.tsx
index 163bd78626c..0b83d6c998d 100644
--- a/src/ui/views/CommonPopup/AssetList/TokenListViewSkeleton.tsx
+++ b/src/ui/views/CommonPopup/AssetList/TokenListViewSkeleton.tsx
@@ -46,18 +46,33 @@ export const TokenListSkeleton = () => {
   );
 };
 
-export const TokenListViewSkeleton: React.FC = () => {
+export const TokenListViewSkeleton: React.FC<{
+  isTestnet?: boolean;
+}> = ({ isTestnet }) => {
   return (
     <div className="mt-16">
-      <div className="flex justify-between">
+      <div className="flex">
         <Skeleton.Input
           active
-          className="bg-r-neutral-card-2 rounded-[6px] w-[160px] h-[32px]"
-        />
-        <Skeleton.Input
-          active
-          className="bg-r-neutral-card-2 rounded-[6px] w-[100px] h-[32px]"
+          className="bg-r-neutral-card-2 rounded-[6px] w-[160px] h-[32px] mr-[auto]"
         />
+        {isTestnet ? (
+          <div className="flex gap-[12px] items-center">
+            <Skeleton.Input
+              active
+              className="bg-r-neutral-card-2 rounded-[6px] w-[82px] h-[32px] "
+            />
+            <Skeleton.Input
+              active
+              className="bg-r-neutral-card-2 rounded-[6px] w-[82px] h-[32px] "
+            />
+          </div>
+        ) : (
+          <Skeleton.Input
+            active
+            className="bg-r-neutral-card-2 rounded-[6px] w-[100px] h-[32px] "
+          />
+        )}
       </div>
       <TokenListSkeleton />
     </div>
diff --git a/src/ui/views/NFTView/index.tsx b/src/ui/views/NFTView/index.tsx
index 54725bded69..109f18f318f 100644
--- a/src/ui/views/NFTView/index.tsx
+++ b/src/ui/views/NFTView/index.tsx
@@ -19,11 +19,11 @@ const TabsStyled = styled(Tabs)`
   .ant-tabs-tab {
     border-radius: 4px;
     color: var(--r-neutral-body, #3e495e);
-    font-size: 13px;
+    font-size: 12px;
     transition: all 0.3s ease-in-out;
     margin: 0 !important;
     width: 100px;
-    height: 24px;
+    height: 28px;
     font-weight: 500;
     padding: 0;
     text-align: center;