diff --git a/CHANGELOG.md b/CHANGELOG.md
index 198f5c735..e07fc7f85 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -55,6 +55,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Bug fixes
 
+- [#365](https://github.com/alleslabs/celatone-frontend/pull/365) Fix pool page UI including helper text gap, icon alignment in pool asset table, empty state border, add message type, input selection icon, and accordion alignment
 - [#362](https://github.com/alleslabs/celatone-frontend/pull/362) Fix missed out hard-coded osmosis testnet 4 in code
 - [#361](https://github.com/alleslabs/celatone-frontend/pull/361) Fix incorrect assigned message index for each pool message in pool tx tables
 - [#360](https://github.com/alleslabs/celatone-frontend/pull/360) Fix supported pool list cannot be searched with token ID and should not show pagination when data is less than 10
diff --git a/src/lib/components/Tooltip.tsx b/src/lib/components/Tooltip.tsx
index f99f41fb6..64f984d58 100644
--- a/src/lib/components/Tooltip.tsx
+++ b/src/lib/components/Tooltip.tsx
@@ -1,5 +1,5 @@
 import type { TooltipProps } from "@chakra-ui/react";
-import { Tooltip as ChakraTooltip } from "@chakra-ui/react";
+import { Flex, Tooltip as ChakraTooltip } from "@chakra-ui/react";
 
 import { CustomIcon } from "./icon";
 
@@ -24,13 +24,13 @@ export const TooltipInfo = ({
   ...tooltipProps
 }: TooltipInfoProps) => (
   <Tooltip {...tooltipProps}>
-    <div style={{ cursor: "pointer" }}>
+    <Flex cursor="pointer">
       <CustomIcon
         color="pebble.600"
         name={iconVariant === "solid" ? "info-circle-solid" : "info-circle"}
         boxSize={3}
         m={0}
       />
-    </div>
+    </Flex>
   </Tooltip>
 );
diff --git a/src/lib/components/forms/SelectInput.tsx b/src/lib/components/forms/SelectInput.tsx
index aec2f0052..1316f0cac 100644
--- a/src/lib/components/forms/SelectInput.tsx
+++ b/src/lib/components/forms/SelectInput.tsx
@@ -117,9 +117,13 @@ export const SelectInput = <T extends string>({
           }}
         >
           <div className="form-label">{formLabel}</div>
-          {selectedOption?.icon && (
-            <InputLeftElement pointerEvents="none" h="full" ml="1">
+          {selectedOption?.image && (
+            <InputLeftElement pointerEvents="none" h="full" ml={1}>
               <Image boxSize={6} src={selectedOption.image} />
+            </InputLeftElement>
+          )}
+          {selectedOption?.icon && (
+            <InputLeftElement pointerEvents="none" h="full" ml={1}>
               <CustomIcon
                 name={selectedOption.icon}
                 color={selectedOption.iconColor}
@@ -134,7 +138,7 @@ export const SelectInput = <T extends string>({
             value={selected || placeholder}
             fontSize="14px"
             color={selected ? "text.main" : "text.dark"}
-            pl={selectedOption?.icon ? 9 : 4}
+            pl={selectedOption?.icon || selectedOption?.image ? 10 : 4}
           />
           <InputRightElement pointerEvents="none" h="full">
             <CustomIcon name="chevron-down" color="pebble.600" />
diff --git a/src/lib/components/state/EmptyState.tsx b/src/lib/components/state/EmptyState.tsx
index 1db577db9..9709082a6 100644
--- a/src/lib/components/state/EmptyState.tsx
+++ b/src/lib/components/state/EmptyState.tsx
@@ -18,8 +18,7 @@ export const EmptyState = ({
   withBorder = false,
 }: EmptyStateProps) => (
   <Flex
-    py={8}
-    my={12}
+    py={12}
     direction="column"
     borderY={withBorder ? "1px solid" : undefined}
     borderColor="pebble.700"
diff --git a/src/lib/components/table/codes/MySavedCodesTable.tsx b/src/lib/components/table/codes/MySavedCodesTable.tsx
index 4d4d11a4a..3987a66e6 100644
--- a/src/lib/components/table/codes/MySavedCodesTable.tsx
+++ b/src/lib/components/table/codes/MySavedCodesTable.tsx
@@ -27,6 +27,7 @@ export const MySavedCodesTable = ({
       <EmptyState
         imageVariant={isSearching ? "not-found" : "empty"}
         message={isSearching ? "No matched codes found" : emptyMessage}
+        withBorder
       />
     }
     onRowSelect={onRowSelect}
diff --git a/src/lib/pages/contract-details/components/tables/RelatedProposalsTable.tsx b/src/lib/pages/contract-details/components/tables/RelatedProposalsTable.tsx
index e0e79d3f6..346ca1593 100644
--- a/src/lib/pages/contract-details/components/tables/RelatedProposalsTable.tsx
+++ b/src/lib/pages/contract-details/components/tables/RelatedProposalsTable.tsx
@@ -64,6 +64,7 @@ export const RelatedProposalsTable = ({
           <EmptyState
             imageVariant="empty"
             message="This contract does not have related proposals yet."
+            withBorder
           />
         }
       />
diff --git a/src/lib/pages/contract-details/components/tables/TxsTable.tsx b/src/lib/pages/contract-details/components/tables/TxsTable.tsx
index 59165c9a3..085b40a0b 100644
--- a/src/lib/pages/contract-details/components/tables/TxsTable.tsx
+++ b/src/lib/pages/contract-details/components/tables/TxsTable.tsx
@@ -68,6 +68,7 @@ export const TxsTable = ({
           <EmptyState
             imageVariant="empty"
             message="This contract does not have any transactions"
+            withBorder
           />
         }
         showRelations={false}
diff --git a/src/lib/pages/contract-details/components/tables/migration/index.tsx b/src/lib/pages/contract-details/components/tables/migration/index.tsx
index c96e85353..cee6f7b62 100644
--- a/src/lib/pages/contract-details/components/tables/migration/index.tsx
+++ b/src/lib/pages/contract-details/components/tables/migration/index.tsx
@@ -62,6 +62,7 @@ export const MigrationTable = ({
       <EmptyState
         imageVariant="empty"
         message="This contract does not have any migration history yet."
+        withBorder
       />
     );
 
diff --git a/src/lib/pages/past-txs/index.tsx b/src/lib/pages/past-txs/index.tsx
index 27120cac3..0ae1e0dcb 100644
--- a/src/lib/pages/past-txs/index.tsx
+++ b/src/lib/pages/past-txs/index.tsx
@@ -144,7 +144,7 @@ const PastTxs = () => {
             placeholder="Search with transaction hash or contract address"
             h="full"
           />
-          <InputRightElement pointerEvents="none" h="full" mr="1">
+          <InputRightElement pointerEvents="none" h="full" mr={1}>
             <CustomIcon name="search" color="pebble.600" />
           </InputRightElement>
         </InputGroup>
@@ -171,17 +171,14 @@ const PastTxs = () => {
           !pastTxsState.search.trim().length || !filterSelected.length ? (
             <EmptyState
               imageVariant="not-found"
-              message={`
-      No past transaction matches found with your input.
-      You can search with transaction hash, and contract address.
-      `}
+              message="No past transaction matches found with your input. You can search with transaction hash, and contract address."
+              withBorder
             />
           ) : (
             <EmptyState
               imageVariant="empty"
-              message={`
-    Past transactions will display here.
-    `}
+              message="Past transactions will display here."
+              withBorder
             />
           )
         }
diff --git a/src/lib/pages/pools/components/pool-details/PoolAssets.tsx b/src/lib/pages/pools/components/pool-details/PoolAssets.tsx
index 204ca2a15..675f0dd2d 100644
--- a/src/lib/pages/pools/components/pool-details/PoolAssets.tsx
+++ b/src/lib/pages/pools/components/pool-details/PoolAssets.tsx
@@ -40,7 +40,7 @@ export const PoolAssets = ({ pool }: PoolAssetsProps) => {
         )}
       </Flex>
       <PoolAssetsTable pool={pool} totalLiquidity={totalLiquidity} />
-      <Flex gap="2" alignItems="center">
+      <Flex gap={2} alignItems="center" mt={4}>
         <Text variant="body2" color="text.dark">
           What is asset weight and allocation?
         </Text>
@@ -58,7 +58,7 @@ export const PoolAssets = ({ pool }: PoolAssetsProps) => {
             <Text color="lilac.main" variant="body2">
               Read more
             </Text>
-            <CustomIcon name="launch" color="lilac.main" boxSize="3" />
+            <CustomIcon name="launch" color="lilac.main" boxSize={3} />
           </Flex>
         </Link>
       </Flex>
diff --git a/src/lib/pages/pools/components/pool-details/tables/pool-txs/PoolTxsMsg.tsx b/src/lib/pages/pools/components/pool-details/tables/pool-txs/PoolTxsMsg.tsx
index c29d945a0..4acac33c9 100644
--- a/src/lib/pages/pools/components/pool-details/tables/pool-txs/PoolTxsMsg.tsx
+++ b/src/lib/pages/pools/components/pool-details/tables/pool-txs/PoolTxsMsg.tsx
@@ -36,7 +36,7 @@ export const PoolTxsMsg = ({
   const { isOpen, onToggle } = useDisclosure();
   const msgDetailTemplateColumns = templateColumns
     .split(" ")
-    .slice(0, 2)
+    .slice(0, 3)
     .concat("1fr")
     .join(" ");
   return (
@@ -146,6 +146,7 @@ export const PoolTxsMsg = ({
           hidden={!isOpen}
           templateColumns={msgDetailTemplateColumns}
         >
+          <TableNoBorderRow py={0} />
           <TableNoBorderRow py={0} />
           <TableNoBorderRow py={0} />
           <TableNoBorderRow py={0}>
diff --git a/src/lib/pages/pools/components/pool-details/tables/pool-txs/index.tsx b/src/lib/pages/pools/components/pool-details/tables/pool-txs/index.tsx
index 30971a8b9..28647da41 100644
--- a/src/lib/pages/pools/components/pool-details/tables/pool-txs/index.tsx
+++ b/src/lib/pages/pools/components/pool-details/tables/pool-txs/index.tsx
@@ -59,9 +59,9 @@ export const PoolRelatedTxsTable = ({
   if (error)
     return (
       <EmptyState
-        withBorder
         imageVariant="not-found"
         message="There is an error during fetching transactions."
+        withBorder
       />
     );
   return (
@@ -73,9 +73,9 @@ export const PoolRelatedTxsTable = ({
         isLoading={isLoadingAssetInfos || isLoading}
         emptyState={
           <EmptyState
-            withBorder
             imageVariant="empty"
             message="There are no transactions in this network."
+            withBorder
           />
         }
       />
diff --git a/src/lib/pages/pools/components/pool-details/tables/pool-txs/messages/components/PoolInfoText.tsx b/src/lib/pages/pools/components/pool-details/tables/pool-txs/messages/components/PoolInfoText.tsx
new file mode 100644
index 000000000..710d732b7
--- /dev/null
+++ b/src/lib/pages/pools/components/pool-details/tables/pool-txs/messages/components/PoolInfoText.tsx
@@ -0,0 +1,20 @@
+import { Flex, Text } from "@chakra-ui/react";
+import type { ReactNode } from "react";
+
+interface PoolInfoTextProps {
+  title: string;
+  children: ReactNode;
+}
+
+export const PoolInfoText = ({ title, children }: PoolInfoTextProps) => (
+  <Flex direction="column" gap={1} minW="90px">
+    <Text variant="body2" textColor="pebble.500" fontWeight={500}>
+      {title}
+    </Text>
+    {typeof children === "string" ? (
+      <Text variant="body2">{children}</Text>
+    ) : (
+      children
+    )}
+  </Flex>
+);
diff --git a/src/lib/pages/pools/components/pool-details/tables/pool-txs/messages/lockup/MsgLockTokensDetail.tsx b/src/lib/pages/pools/components/pool-details/tables/pool-txs/messages/lockup/MsgLockTokensDetail.tsx
index 5954039e5..609c74c75 100644
--- a/src/lib/pages/pools/components/pool-details/tables/pool-txs/messages/lockup/MsgLockTokensDetail.tsx
+++ b/src/lib/pages/pools/components/pool-details/tables/pool-txs/messages/lockup/MsgLockTokensDetail.tsx
@@ -1,6 +1,7 @@
-import { Box, Flex, Text } from "@chakra-ui/react";
+import { Box, Flex } from "@chakra-ui/react";
 
 import { PoolAssetCard } from "../components";
+import { PoolInfoText } from "../components/PoolInfoText";
 import { getPoolDenom } from "../utils";
 import { MsgToken } from "lib/components/action-msg/MsgToken";
 import { ExplorerLink } from "lib/components/ExplorerLink";
@@ -8,6 +9,7 @@ import { Loading } from "lib/components/Loading";
 import type { AssetInfosOpt } from "lib/services/assetService";
 import { useTxData } from "lib/services/txService";
 import type { PoolDetail } from "lib/types";
+import { extractMsgType } from "lib/utils";
 import type { MsgLockTokensDetails } from "lib/utils/tx/types";
 
 interface MsgLockTokensDetailProps {
@@ -51,29 +53,18 @@ export const MsgLockTokensDetail = ({
     ?.attributes.at(0)?.value;
 
   return (
-    <Flex w="full" direction="column" gap={4}>
+    <Flex w="full" direction="column" gap={6}>
       <Flex gap={12}>
-        <Flex direction="column" gap={1}>
-          <Text variant="body2" textColor="pebble.500" fontWeight={500}>
-            Block height
-          </Text>
+        <PoolInfoText title="Block height">
           <ExplorerLink
             value={blockHeight.toString()}
             type="block_height"
             showCopyOnHover
             ampCopierSection={ampCopierSection}
           />
-        </Flex>
-        <Flex direction="column" gap={1}>
-          <Text variant="body2" textColor="pebble.500" fontWeight={500}>
-            LockID
-          </Text>
-          <Text variant="body2">{lockId}</Text>
-        </Flex>
-        <Flex direction="column" gap={1}>
-          <Text variant="body2" textColor="pebble.500" fontWeight={500}>
-            Bonded LP
-          </Text>
+        </PoolInfoText>
+        <PoolInfoText title="LockID">{lockId}</PoolInfoText>
+        <PoolInfoText title="Bonded LP">
           <MsgToken
             coin={poolAsset}
             symbol={poolAssetInfo?.symbol}
@@ -81,7 +72,9 @@ export const MsgLockTokensDetail = ({
             fontWeight={700}
             ampCopierSection={ampCopierSection}
           />
-        </Flex>
+        </PoolInfoText>
+
+        <PoolInfoText title="Message">{extractMsgType(msg.type)}</PoolInfoText>
       </Flex>
       <Box w="full">
         <PoolAssetCard
diff --git a/src/lib/pages/pools/components/pool-details/tables/pool-txs/messages/lp/MsgExitPoolDetail.tsx b/src/lib/pages/pools/components/pool-details/tables/pool-txs/messages/lp/MsgExitPoolDetail.tsx
index 1de9944d0..48ff34f31 100644
--- a/src/lib/pages/pools/components/pool-details/tables/pool-txs/messages/lp/MsgExitPoolDetail.tsx
+++ b/src/lib/pages/pools/components/pool-details/tables/pool-txs/messages/lp/MsgExitPoolDetail.tsx
@@ -1,7 +1,9 @@
-import { Box, Flex, Text } from "@chakra-ui/react";
+import { Box, Flex } from "@chakra-ui/react";
 
+import { PoolInfoText } from "../components/PoolInfoText";
 import { ExplorerLink } from "lib/components/ExplorerLink";
 import type { AssetInfosOpt } from "lib/services/assetService";
+import { extractMsgType } from "lib/utils";
 import type { MsgExitPoolDetails } from "lib/utils/tx/types";
 
 import { PoolLPCard, LiquidityDivider, PoolAssetsGrid } from "./components";
@@ -25,17 +27,17 @@ export const MsgExitPoolDetail = ({
   isOpened,
   ampCopierSection,
 }: MsgExitPoolDetailProps) => (
-  <Flex w="full" alignItems="start" gap={12}>
-    <Flex direction="column" gap={1}>
-      <Text variant="body2" textColor="pebble.500" fontWeight={500}>
-        Block height
-      </Text>
-      <ExplorerLink
-        value={blockHeight.toString()}
-        type="block_height"
-        showCopyOnHover
-        ampCopierSection={ampCopierSection}
-      />
+  <Flex w="full" direction="column" alignItems="start" gap={6}>
+    <Flex gap={12}>
+      <PoolInfoText title="Block height">
+        <ExplorerLink
+          value={blockHeight.toString()}
+          type="block_height"
+          showCopyOnHover
+          ampCopierSection={ampCopierSection}
+        />
+      </PoolInfoText>
+      <PoolInfoText title="Message">{extractMsgType(msg.type)}</PoolInfoText>
     </Flex>
     <Box w="full">
       <PoolLPCard
diff --git a/src/lib/pages/pools/components/pool-details/tables/pool-txs/messages/lp/MsgExitSwapExternAmountOutDetail.tsx b/src/lib/pages/pools/components/pool-details/tables/pool-txs/messages/lp/MsgExitSwapExternAmountOutDetail.tsx
index f8a083ead..5b6e659c5 100644
--- a/src/lib/pages/pools/components/pool-details/tables/pool-txs/messages/lp/MsgExitSwapExternAmountOutDetail.tsx
+++ b/src/lib/pages/pools/components/pool-details/tables/pool-txs/messages/lp/MsgExitSwapExternAmountOutDetail.tsx
@@ -1,7 +1,9 @@
-import { Box, Flex, Text } from "@chakra-ui/react";
+import { Box, Flex } from "@chakra-ui/react";
 
+import { PoolInfoText } from "../components/PoolInfoText";
 import { ExplorerLink } from "lib/components/ExplorerLink";
 import type { AssetInfosOpt } from "lib/services/assetService";
+import { extractMsgType } from "lib/utils";
 import type { MsgExitSwapExternAmountOutDetails } from "lib/utils/tx/types";
 
 import { PoolLPCard, LiquidityDivider, PoolAssetsGrid } from "./components";
@@ -25,17 +27,17 @@ export const MsgExitSwapExternAmountOutDetail = ({
   isOpened,
   ampCopierSection,
 }: MsgExitSwapExternAmountOutDetailProps) => (
-  <Flex w="full" alignItems="start" gap={12}>
-    <Flex direction="column" gap={1}>
-      <Text variant="body2" textColor="pebble.500" fontWeight={500}>
-        Block height
-      </Text>
-      <ExplorerLink
-        value={blockHeight.toString()}
-        type="block_height"
-        showCopyOnHover
-        ampCopierSection={ampCopierSection}
-      />
+  <Flex w="full" direction="column" alignItems="start" gap={12}>
+    <Flex gap={12}>
+      <PoolInfoText title="Block height">
+        <ExplorerLink
+          value={blockHeight.toString()}
+          type="block_height"
+          showCopyOnHover
+          ampCopierSection={ampCopierSection}
+        />
+      </PoolInfoText>
+      <PoolInfoText title="Message">{extractMsgType(msg.type)}</PoolInfoText>
     </Flex>
     <Box w="full">
       <PoolLPCard
diff --git a/src/lib/pages/pools/components/pool-details/tables/pool-txs/messages/lp/MsgExitSwapShareAmountInDetail.tsx b/src/lib/pages/pools/components/pool-details/tables/pool-txs/messages/lp/MsgExitSwapShareAmountInDetail.tsx
index 62bd53fd6..18d1b9aaf 100644
--- a/src/lib/pages/pools/components/pool-details/tables/pool-txs/messages/lp/MsgExitSwapShareAmountInDetail.tsx
+++ b/src/lib/pages/pools/components/pool-details/tables/pool-txs/messages/lp/MsgExitSwapShareAmountInDetail.tsx
@@ -1,7 +1,9 @@
-import { Box, Flex, Text } from "@chakra-ui/react";
+import { Box, Flex } from "@chakra-ui/react";
 
+import { PoolInfoText } from "../components/PoolInfoText";
 import { ExplorerLink } from "lib/components/ExplorerLink";
 import type { AssetInfosOpt } from "lib/services/assetService";
+import { extractMsgType } from "lib/utils";
 import type { MsgExitSwapShareAmountInDetails } from "lib/utils/tx/types";
 
 import { PoolLPCard, LiquidityDivider, PoolAssetsGrid } from "./components";
@@ -25,17 +27,17 @@ export const MsgExitSwapShareAmountInDetail = ({
   isOpened,
   ampCopierSection,
 }: MsgExitSwapShareAmountInDetailProps) => (
-  <Flex minW="full" alignItems="start" gap={12}>
-    <Flex direction="column" gap={1}>
-      <Text variant="body2" textColor="pebble.500" fontWeight={500}>
-        Block height
-      </Text>
-      <ExplorerLink
-        value={blockHeight.toString()}
-        type="block_height"
-        showCopyOnHover
-        ampCopierSection={ampCopierSection}
-      />
+  <Flex minW="full" direction="column" alignItems="start" gap={6}>
+    <Flex gap={12}>
+      <PoolInfoText title="Block height">
+        <ExplorerLink
+          value={blockHeight.toString()}
+          type="block_height"
+          showCopyOnHover
+          ampCopierSection={ampCopierSection}
+        />
+      </PoolInfoText>
+      <PoolInfoText title="Message">{extractMsgType(msg.type)}</PoolInfoText>
     </Flex>
     <Box w="full">
       <PoolLPCard
diff --git a/src/lib/pages/pools/components/pool-details/tables/pool-txs/messages/lp/MsgJoinPoolDetail.tsx b/src/lib/pages/pools/components/pool-details/tables/pool-txs/messages/lp/MsgJoinPoolDetail.tsx
index f9b49a4d9..136449a1a 100644
--- a/src/lib/pages/pools/components/pool-details/tables/pool-txs/messages/lp/MsgJoinPoolDetail.tsx
+++ b/src/lib/pages/pools/components/pool-details/tables/pool-txs/messages/lp/MsgJoinPoolDetail.tsx
@@ -1,7 +1,9 @@
-import { Box, Flex, Text } from "@chakra-ui/react";
+import { Box, Flex } from "@chakra-ui/react";
 
+import { PoolInfoText } from "../components/PoolInfoText";
 import { ExplorerLink } from "lib/components/ExplorerLink";
 import type { AssetInfosOpt } from "lib/services/assetService";
+import { extractMsgType } from "lib/utils";
 import type { MsgJoinPoolDetails } from "lib/utils/tx/types";
 
 import { PoolLPCard, LiquidityDivider, PoolAssetsGrid } from "./components";
@@ -25,17 +27,17 @@ export const MsgJoinPoolDetail = ({
   isOpened,
   ampCopierSection,
 }: MsgJoinPoolDetailProps) => (
-  <Flex w="full" alignItems="start" gap={12}>
-    <Flex direction="column" gap={1}>
-      <Text variant="body2" textColor="pebble.500" fontWeight={500}>
-        Block height
-      </Text>
-      <ExplorerLink
-        value={blockHeight.toString()}
-        type="block_height"
-        showCopyOnHover
-        ampCopierSection={ampCopierSection}
-      />
+  <Flex w="full" direction="column" alignItems="start" gap={6}>
+    <Flex gap={12}>
+      <PoolInfoText title="Block height">
+        <ExplorerLink
+          value={blockHeight.toString()}
+          type="block_height"
+          showCopyOnHover
+          ampCopierSection={ampCopierSection}
+        />
+      </PoolInfoText>
+      <PoolInfoText title="Message">{extractMsgType(msg.type)}</PoolInfoText>
     </Flex>
     <Box w="full">
       <PoolAssetsGrid
diff --git a/src/lib/pages/pools/components/pool-details/tables/pool-txs/messages/lp/MsgJoinSwapExternAmountInDetail.tsx b/src/lib/pages/pools/components/pool-details/tables/pool-txs/messages/lp/MsgJoinSwapExternAmountInDetail.tsx
index e7b00c3f4..9fe6458e0 100644
--- a/src/lib/pages/pools/components/pool-details/tables/pool-txs/messages/lp/MsgJoinSwapExternAmountInDetail.tsx
+++ b/src/lib/pages/pools/components/pool-details/tables/pool-txs/messages/lp/MsgJoinSwapExternAmountInDetail.tsx
@@ -1,7 +1,9 @@
-import { Box, Flex, Text } from "@chakra-ui/react";
+import { Box, Flex } from "@chakra-ui/react";
 
+import { PoolInfoText } from "../components/PoolInfoText";
 import { ExplorerLink } from "lib/components/ExplorerLink";
 import type { AssetInfosOpt } from "lib/services/assetService";
+import { extractMsgType } from "lib/utils";
 import type { MsgJoinSwapExternAmountInDetails } from "lib/utils/tx/types";
 
 import { LiquidityDivider, PoolLPCard, PoolAssetsGrid } from "./components";
@@ -25,17 +27,17 @@ export const MsgJoinSwapExternAmountInDetail = ({
   isOpened,
   ampCopierSection,
 }: MsgJoinSwapExternAmountInDetailProps) => (
-  <Flex w="full" alignItems="start" gap={12}>
-    <Flex direction="column" gap={1}>
-      <Text variant="body2" textColor="pebble.500" fontWeight={500}>
-        Block height
-      </Text>
-      <ExplorerLink
-        value={blockHeight.toString()}
-        type="block_height"
-        showCopyOnHover
-        ampCopierSection={ampCopierSection}
-      />
+  <Flex w="full" direction="column" alignItems="start" gap={6}>
+    <Flex gap={12}>
+      <PoolInfoText title="Block height">
+        <ExplorerLink
+          value={blockHeight.toString()}
+          type="block_height"
+          showCopyOnHover
+          ampCopierSection={ampCopierSection}
+        />
+      </PoolInfoText>
+      <PoolInfoText title="Message">{extractMsgType(msg.type)}</PoolInfoText>
     </Flex>
     <Box w="full">
       <PoolAssetsGrid
diff --git a/src/lib/pages/pools/components/pool-details/tables/pool-txs/messages/lp/MsgJoinSwapShareAmountOutDetail.tsx b/src/lib/pages/pools/components/pool-details/tables/pool-txs/messages/lp/MsgJoinSwapShareAmountOutDetail.tsx
index 5efc1769b..d2d48b23f 100644
--- a/src/lib/pages/pools/components/pool-details/tables/pool-txs/messages/lp/MsgJoinSwapShareAmountOutDetail.tsx
+++ b/src/lib/pages/pools/components/pool-details/tables/pool-txs/messages/lp/MsgJoinSwapShareAmountOutDetail.tsx
@@ -1,7 +1,9 @@
-import { Box, Flex, Text } from "@chakra-ui/react";
+import { Box, Flex } from "@chakra-ui/react";
 
+import { PoolInfoText } from "../components/PoolInfoText";
 import { ExplorerLink } from "lib/components/ExplorerLink";
 import type { AssetInfosOpt } from "lib/services/assetService";
+import { extractMsgType } from "lib/utils";
 import type { MsgJoinSwapShareAmountOutDetails } from "lib/utils/tx/types";
 
 import { LiquidityDivider, PoolLPCard, PoolAssetsGrid } from "./components";
@@ -25,17 +27,17 @@ export const MsgJoinSwapShareAmountOutDetail = ({
   isOpened,
   ampCopierSection,
 }: MsgJoinSwapShareAmountOutDetailProps) => (
-  <Flex w="full" alignItems="start" gap={12}>
-    <Flex direction="column" gap={1}>
-      <Text variant="body2" textColor="pebble.500" fontWeight={500}>
-        Block height
-      </Text>
-      <ExplorerLink
-        value={blockHeight.toString()}
-        type="block_height"
-        showCopyOnHover
-        ampCopierSection={ampCopierSection}
-      />
+  <Flex w="full" direction="column" alignItems="start" gap={6}>
+    <Flex gap={12}>
+      <PoolInfoText title="Block height">
+        <ExplorerLink
+          value={blockHeight.toString()}
+          type="block_height"
+          showCopyOnHover
+          ampCopierSection={ampCopierSection}
+        />
+      </PoolInfoText>
+      <PoolInfoText title="Message">{extractMsgType(msg.type)}</PoolInfoText>
     </Flex>
     <Box w="full">
       <PoolAssetsGrid
diff --git a/src/lib/pages/pools/components/pool-details/tables/pool-txs/messages/superfluid/MsgLockAndSuperfluidDelegateDetail.tsx b/src/lib/pages/pools/components/pool-details/tables/pool-txs/messages/superfluid/MsgLockAndSuperfluidDelegateDetail.tsx
index c1aad8960..6fed0b391 100644
--- a/src/lib/pages/pools/components/pool-details/tables/pool-txs/messages/superfluid/MsgLockAndSuperfluidDelegateDetail.tsx
+++ b/src/lib/pages/pools/components/pool-details/tables/pool-txs/messages/superfluid/MsgLockAndSuperfluidDelegateDetail.tsx
@@ -1,6 +1,7 @@
-import { Flex, Text } from "@chakra-ui/react";
+import { Box, Flex } from "@chakra-ui/react";
 
 import { PoolAssetCard } from "../components";
+import { PoolInfoText } from "../components/PoolInfoText";
 import { getPoolDenom } from "../utils";
 import { ExplorerLink } from "lib/components/ExplorerLink";
 import { Loading } from "lib/components/Loading";
@@ -9,6 +10,7 @@ import type { AssetInfosOpt } from "lib/services/assetService";
 import { useTxData } from "lib/services/txService";
 import { useValidator } from "lib/services/validatorService";
 import type { PoolDetail } from "lib/types";
+import { extractMsgType } from "lib/utils";
 import type { MsgLockAndSuperfluidDelegateDetails } from "lib/utils/tx/types";
 
 interface MsgLockAndSuperfluidDelegateDetailProps {
@@ -61,29 +63,18 @@ export const MsgLockAndSuperfluidDelegateDetail = ({
     ?.attributes.at(0)?.value;
 
   return (
-    <Flex w="full" direction="column" gap={4}>
+    <Flex w="full" direction="column" gap={6}>
       <Flex gap={12}>
-        <Flex direction="column" gap={1}>
-          <Text variant="body2" textColor="pebble.500" fontWeight={500}>
-            Block height
-          </Text>
+        <PoolInfoText title="Block height">
           <ExplorerLink
             value={blockHeight.toString()}
             type="block_height"
             showCopyOnHover
             ampCopierSection={ampCopierSection}
           />
-        </Flex>
-        <Flex direction="column" gap={1}>
-          <Text variant="body2" textColor="pebble.500" fontWeight={500}>
-            LockID
-          </Text>
-          <Text variant="body2">{lockId}</Text>
-        </Flex>
-        <Flex direction="column" gap={1}>
-          <Text variant="body2" textColor="pebble.500" fontWeight={500}>
-            To Validator
-          </Text>
+        </PoolInfoText>
+        <PoolInfoText title="LockID">{lockId}</PoolInfoText>
+        <PoolInfoText title="To Validator">
           <ValidatorBadge
             validator={{
               validatorAddress: msg.val_addr,
@@ -92,9 +83,10 @@ export const MsgLockAndSuperfluidDelegateDetail = ({
             badgeSize={6}
             ampCopierSection={ampCopierSection}
           />
-        </Flex>
+        </PoolInfoText>
+        <PoolInfoText title="Message">{extractMsgType(msg.type)}</PoolInfoText>
       </Flex>
-      <Flex direction="column" w="full" gap={2}>
+      <Box w="full">
         <PoolAssetCard
           poolId={pool.id}
           description="Bonded to"
@@ -104,7 +96,7 @@ export const MsgLockAndSuperfluidDelegateDetail = ({
           isOpened={isOpened}
           ampCopierSection={ampCopierSection}
         />
-      </Flex>
+      </Box>
     </Flex>
   );
 };
diff --git a/src/lib/pages/pools/components/pool-details/tables/pool-txs/messages/swap/MsgSwapExactAmountInDetail.tsx b/src/lib/pages/pools/components/pool-details/tables/pool-txs/messages/swap/MsgSwapExactAmountInDetail.tsx
index bfe113da2..26bcf50a5 100644
--- a/src/lib/pages/pools/components/pool-details/tables/pool-txs/messages/swap/MsgSwapExactAmountInDetail.tsx
+++ b/src/lib/pages/pools/components/pool-details/tables/pool-txs/messages/swap/MsgSwapExactAmountInDetail.tsx
@@ -1,7 +1,9 @@
-import { Box, Flex, Text } from "@chakra-ui/react";
+import { Box, Flex } from "@chakra-ui/react";
 
+import { PoolInfoText } from "../components/PoolInfoText";
 import { ExplorerLink } from "lib/components/ExplorerLink";
 import type { AssetInfosOpt } from "lib/services/assetService";
+import { extractMsgType } from "lib/utils";
 import type { MsgSwapExactAmountInDetails } from "lib/utils/tx/types";
 
 import { PoolRoute, PoolSwap } from "./components";
@@ -25,17 +27,17 @@ export const MsgSwapExactAmountInDetail = ({
   isOpened,
   ampCopierSection,
 }: MsgSwapExactAmountInDetailProps) => (
-  <Flex w="full" alignItems="start" gap={12}>
-    <Flex direction="column" gap={1}>
-      <Text variant="body2" textColor="pebble.500" fontWeight={500}>
-        Block height
-      </Text>
-      <ExplorerLink
-        value={blockHeight.toString()}
-        type="block_height"
-        showCopyOnHover
-        ampCopierSection={ampCopierSection}
-      />
+  <Flex w="full" direction="column" alignItems="start" gap={6}>
+    <Flex gap={12}>
+      <PoolInfoText title="Block height">
+        <ExplorerLink
+          value={blockHeight.toString()}
+          type="block_height"
+          showCopyOnHover
+          ampCopierSection={ampCopierSection}
+        />
+      </PoolInfoText>
+      <PoolInfoText title="Message">{extractMsgType(msg.type)}</PoolInfoText>
     </Flex>
     <Box w="full">
       <PoolSwap
diff --git a/src/lib/pages/pools/components/pool-details/tables/pool-txs/messages/swap/MsgSwapExactAmountOutDetail.tsx b/src/lib/pages/pools/components/pool-details/tables/pool-txs/messages/swap/MsgSwapExactAmountOutDetail.tsx
index 8bd5dd9d9..c4f147e33 100644
--- a/src/lib/pages/pools/components/pool-details/tables/pool-txs/messages/swap/MsgSwapExactAmountOutDetail.tsx
+++ b/src/lib/pages/pools/components/pool-details/tables/pool-txs/messages/swap/MsgSwapExactAmountOutDetail.tsx
@@ -1,7 +1,9 @@
-import { Box, Flex, Text } from "@chakra-ui/react";
+import { Box, Flex } from "@chakra-ui/react";
 
+import { PoolInfoText } from "../components/PoolInfoText";
 import { ExplorerLink } from "lib/components/ExplorerLink";
 import type { AssetInfosOpt } from "lib/services/assetService";
+import { extractMsgType } from "lib/utils";
 import type { MsgSwapExactAmountOutDetails } from "lib/utils/tx/types";
 
 import { PoolRoute, PoolSwap } from "./components";
@@ -34,17 +36,17 @@ export const MsgSwapExactAmountOutDetail = ({
   }));
 
   return (
-    <Flex w="full" alignItems="start" gap={12}>
-      <Flex direction="column" gap={1}>
-        <Text variant="body2" textColor="pebble.500" fontWeight={500}>
-          Block height
-        </Text>
-        <ExplorerLink
-          value={blockHeight.toString()}
-          type="block_height"
-          showCopyOnHover
-          ampCopierSection={ampCopierSection}
-        />
+    <Flex w="full" direction="column" alignItems="start" gap={6}>
+      <Flex gap={12}>
+        <PoolInfoText title="Block height">
+          <ExplorerLink
+            value={blockHeight.toString()}
+            type="block_height"
+            showCopyOnHover
+            ampCopierSection={ampCopierSection}
+          />
+        </PoolInfoText>
+        <PoolInfoText title="Message">{extractMsgType(msg.type)}</PoolInfoText>
       </Flex>
       <Box w="full">
         <PoolSwap