diff --git a/src/app/screens/createInscription/CompleteScreen.tsx b/src/app/screens/createInscription/CompleteScreen.tsx
index 8a080bd34..381963b20 100644
--- a/src/app/screens/createInscription/CompleteScreen.tsx
+++ b/src/app/screens/createInscription/CompleteScreen.tsx
@@ -6,16 +6,16 @@ import Success from '@assets/img/send/check_circle.svg';
 
 import ActionButton from '@components/button';
 import CopyButton from '@components/copyButton';
-import type { SettingsNetwork } from '@secretkeylabs/xverse-core/types';
+import type { SettingsNetwork } from '@secretkeylabs/xverse-core';
 import { getBtcTxStatusUrl } from '@utils/helper';
 
-const TxStatusContainer = styled.div({
-  background: 'rgba(25, 25, 48, 0.74)',
+const TxStatusContainer = styled.div((props) => ({
+  background: props.theme.colors.elevation0,
   display: 'flex',
   flexDirection: 'column',
   height: '100%',
   backdropFilter: 'blur(16px)',
-});
+}));
 
 const Container = styled.div({
   display: 'flex',
@@ -71,27 +71,21 @@ const CopyButtonContainer = styled.div({
   padding: 2,
 });
 
-const InfoMessageContainer = styled.div({
-  marginLeft: 8,
-  marginRight: 8,
-  marginTop: 20,
-});
-
 const Image = styled.img({
   alignSelf: 'center',
   transform: 'all',
 });
 
 const HeadingText = styled.h1((props) => ({
-  ...props.theme.headline_s,
-  color: props.theme.colors.white['0'],
+  ...props.theme.typography.headline_s,
+  color: props.theme.colors.white_0,
   textAlign: 'center',
   marginTop: props.theme.spacing(8),
 }));
 
-const BodyText = styled.h1((props) => ({
-  ...props.theme.body_m,
-  color: props.theme.colors.white['400'],
+const BodyText = styled.p((props) => ({
+  ...props.theme.typography.body_m,
+  color: props.theme.colors.white_400,
   marginTop: props.theme.spacing(8),
   textAlign: 'center',
   overflowWrap: 'break-word',
@@ -101,29 +95,29 @@ const BodyText = styled.h1((props) => ({
   marginRight: props.theme.spacing(5),
 }));
 
-const TxIDText = styled.h1((props) => ({
+const TxIDText = styled.p((props) => ({
   ...props.theme.headline_category_s,
-  color: props.theme.colors.white['400'],
+  color: props.theme.colors.white_400,
   marginTop: props.theme.spacing(8),
   textTransform: 'uppercase',
 }));
 
-const BeforeButtonText = styled.h1((props) => ({
-  ...props.theme.body_m,
-  color: props.theme.colors.white['400'],
+const BeforeButtonText = styled.p((props) => ({
+  ...props.theme.typography.body_m,
+  color: props.theme.colors.white_400,
 }));
 
-const IDText = styled.h1((props) => ({
-  ...props.theme.body_m,
-  color: props.theme.colors.white['0'],
+const IDText = styled.p((props) => ({
+  ...props.theme.typography.body_m,
+  color: props.theme.colors.white_0,
   marginTop: props.theme.spacing(2),
   wordBreak: 'break-all',
 }));
 
-const ButtonText = styled.h1((props) => ({
-  ...props.theme.body_m,
+const ButtonText = styled.p((props) => ({
+  ...props.theme.typography.body_m,
   marginRight: props.theme.spacing(2),
-  color: props.theme.colors.white['0'],
+  color: props.theme.colors.white_0,
 }));
 
 const ButtonImage = styled.img((props) => ({
diff --git a/src/app/screens/transactionStatus/index.tsx b/src/app/screens/transactionStatus/index.tsx
index d48eea439..1e397eba8 100644
--- a/src/app/screens/transactionStatus/index.tsx
+++ b/src/app/screens/transactionStatus/index.tsx
@@ -10,13 +10,12 @@ import { useTranslation } from 'react-i18next';
 import { useLocation, useNavigate } from 'react-router-dom';
 import styled from 'styled-components';
 
-const TxStatusContainer = styled.div({
-  background: 'rgba(25, 25, 48, 0.74)',
+const TxStatusContainer = styled.div((props) => ({
+  background: props.theme.colors.elevation0,
   display: 'flex',
   flexDirection: 'column',
   height: '100%',
-  backdropFilter: 'blur(16px)',
-});
+}));
 
 const Container = styled.div({
   display: 'flex',
@@ -84,14 +83,14 @@ const Image = styled.img({
 });
 
 const HeadingText = styled.h1((props) => ({
-  ...props.theme.headline_s,
+  ...props.theme.typography.headline_s,
   color: props.theme.colors.white_0,
   textAlign: 'center',
   marginTop: props.theme.spacing(8),
 }));
 
 const BodyText = styled.h1((props) => ({
-  ...props.theme.body_m,
+  ...props.theme.typography.body_m,
   color: props.theme.colors.white_400,
   marginTop: props.theme.spacing(8),
   textAlign: 'center',
@@ -110,19 +109,19 @@ const TxIDText = styled.h1((props) => ({
 }));
 
 const BeforeButtonText = styled.h1((props) => ({
-  ...props.theme.body_m,
+  ...props.theme.typography.body_m,
   color: props.theme.colors.white_400,
 }));
 
 const IDText = styled.h1((props) => ({
-  ...props.theme.body_m,
+  ...props.theme.typography.body_m,
   color: props.theme.colors.white_0,
   marginTop: props.theme.spacing(2),
   wordBreak: 'break-all',
 }));
 
 const ButtonText = styled.h1((props) => ({
-  ...props.theme.body_m,
+  ...props.theme.typography.body_m,
   marginRight: props.theme.spacing(2),
   color: props.theme.colors.white_0,
 }));
@@ -187,10 +186,10 @@ function TransactionStatus() {
 
   const onCloseClick = () => {
     if (browserTx) window.close();
-    else if (isRareSat) navigate('/nftDashboard?tab=rareSats');
-    else if (isOrdinal) navigate('nftDashboard?tab=inscriptions');
-    else if (isNft) navigate('/nftDashboard?tab=nfts');
-    else navigate(-3);
+    else if (isRareSat) navigate('/nft-dashboard?tab=rareSats');
+    else if (isOrdinal) navigate('/nft-dashboard?tab=inscriptions');
+    else if (isNft) navigate('/nft-dashboard?tab=nfts');
+    else navigate('/');
   };
 
   const handleClickTrySwapAgain = () => {
diff --git a/src/locales/en.json b/src/locales/en.json
index 193964691..140f535f4 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -913,7 +913,7 @@
     },
     "COMPLETE": {
       "INSCRIBED": "Ordinal inscribed",
-      "MESSAGE": "Your ordinal have been successfully inscribed and should appear in a few minutes.",
+      "MESSAGE": "Your ordinal has been successfully inscribed and should appear in a few minutes.",
       "SEE_ON": "See on",
       "BITCOIN_EXPLORER": "mempool",
       "TRANSACTION_ID": "Transaction ID",