diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d5cc130c..d1bbccdc5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -48,6 +48,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Improvements
 
+- [#371](https://github.com/alleslabs/celatone-frontend/pull/371) Refactor assign me component and fix color in redelegation page
 - [#342](https://github.com/alleslabs/celatone-frontend/pull/342) Add fallback n/a token on asset icon on asset box
 - [#331](https://github.com/alleslabs/celatone-frontend/pull/331) Add validation check for builder in proposal to store code page
 - [#324](https://github.com/alleslabs/celatone-frontend/pull/324) Add deposit/voting period from gov params and add minimum required alert for proposal to store code
diff --git a/src/lib/components/AssignMe.tsx b/src/lib/components/AssignMe.tsx
index c2739439a..2a5b43643 100644
--- a/src/lib/components/AssignMe.tsx
+++ b/src/lib/components/AssignMe.tsx
@@ -1,18 +1,25 @@
 import { Text } from "@chakra-ui/react";
+import type { TextProps } from "@chakra-ui/react";
 import { useWallet } from "@cosmos-kit/react";
 import type { MouseEventHandler } from "react";
 
 interface AssginMeProps {
   onClick?: MouseEventHandler<HTMLParagraphElement>;
   isDisable?: boolean;
+  textAlign?: TextProps["textAlign"];
 }
 
-export const AssignMe = ({ onClick, isDisable = false }: AssginMeProps) => {
+export const AssignMe = ({
+  onClick,
+  isDisable = false,
+  textAlign = "right",
+}: AssginMeProps) => {
   const { address: walletAddress } = useWallet();
   const enabled = Boolean(!isDisable && walletAddress);
+
   return (
     <Text
-      textAlign="right"
+      textAlign={textAlign}
       mr={3}
       color={enabled ? "accent.main" : "text.disabled"}
       fontWeight={700}
diff --git a/src/lib/pages/account-details/components/tables/nonRedelegatable/NonRedelegatableTableRow.tsx b/src/lib/pages/account-details/components/tables/nonRedelegatable/NonRedelegatableTableRow.tsx
index d4b589e1b..d3a440f16 100644
--- a/src/lib/pages/account-details/components/tables/nonRedelegatable/NonRedelegatableTableRow.tsx
+++ b/src/lib/pages/account-details/components/tables/nonRedelegatable/NonRedelegatableTableRow.tsx
@@ -25,7 +25,7 @@ export const NonRedelegatableTableRow = ({
 
     <TableRow>
       <Flex direction="column" gap={1} color="text.dark">
-        <Text variant="body2">
+        <Text variant="body2" color="text.dark">
           {formatUTC(nonRedelegatable.completionTime)}
         </Text>
         <Text variant="body3" color="text.disabled">
diff --git a/src/lib/pages/faucet/index.tsx b/src/lib/pages/faucet/index.tsx
index 898b9c23f..0f85fc3b0 100644
--- a/src/lib/pages/faucet/index.tsx
+++ b/src/lib/pages/faucet/index.tsx
@@ -17,6 +17,7 @@ import {
   useInternalNavigate,
   useValidateAddress,
 } from "lib/app-provider";
+import { AssignMe } from "lib/components/AssignMe";
 import type { FormStatus } from "lib/components/forms";
 import { TextInput } from "lib/components/forms";
 import { CustomIcon } from "lib/components/icon";
@@ -158,19 +159,14 @@ const Faucet = () => {
         status={status}
         label="Receiving Address"
         helperAction={
-          <Text
-            color="accent.main"
-            fontWeight={700}
-            variant="body3"
-            cursor="pointer"
-            alignSelf="flex-start"
+          <AssignMe
             onClick={() => {
               AmpTrack(AmpEvent.USE_ASSIGN_ME);
               setAddress(walletAddress);
             }}
-          >
-            Assign me
-          </Text>
+            isDisable={address === walletAddress}
+            textAlign="left"
+          />
         }
       />
       <Button
diff --git a/src/lib/pages/instantiate/instantiate.tsx b/src/lib/pages/instantiate/instantiate.tsx
index 96e7f59ab..5b7683ccd 100644
--- a/src/lib/pages/instantiate/instantiate.tsx
+++ b/src/lib/pages/instantiate/instantiate.tsx
@@ -15,6 +15,7 @@ import {
   useLCDEndpoint,
   useValidateAddress,
 } from "lib/app-provider";
+import { AssignMe } from "lib/components/AssignMe";
 import { ConnectWalletAlert } from "lib/components/ConnectWalletAlert";
 import type { FormStatus } from "lib/components/forms";
 import { ControllerInput } from "lib/components/forms";
@@ -319,18 +320,13 @@ const Instantiate = ({ onComplete }: InstantiatePageProps) => {
             variant="floating"
             error={validateAdmin(watchAdminAddress)}
             helperAction={
-              <Text
-                color="accent.main"
-                fontWeight={700}
-                variant="body3"
-                cursor="pointer"
+              <AssignMe
                 onClick={() => {
                   AmpTrack(AmpEvent.USE_ASSIGN_ME);
                   setValue("adminAddress", address);
                 }}
-              >
-                Assign me
-              </Text>
+                isDisable={watchAdminAddress === address}
+              />
             }
           />
           <Heading variant="h6" as="h6" my={8} alignSelf="flex-start">