diff --git a/src/components/@reviewScreens/TakeOrderReview/TakeOrderReview.tsx b/src/components/@reviewScreens/TakeOrderReview/TakeOrderReview.tsx
index 80e64627..ff1f90b6 100644
--- a/src/components/@reviewScreens/TakeOrderReview/TakeOrderReview.tsx
+++ b/src/components/@reviewScreens/TakeOrderReview/TakeOrderReview.tsx
@@ -77,20 +77,20 @@ const MakeOrderReview: FC<TakeOrderReviewProps> = ({
           {t("common.review")}
         </Title>
       </StyledWidgetHeader>
-      {signerToken && (
+      {senderToken && (
         <OrderReviewToken
-          amount={signerAmount}
+          amount={senderAmount}
           label={t("common.send")}
-          tokenSymbol={justifiedSignerToken?.symbol || "?"}
-          tokenUri={justifiedSignerToken?.logoURI}
+          tokenSymbol={justifiedSenderToken?.symbol || "?"}
+          tokenUri={justifiedSenderToken?.logoURI}
         />
       )}
-      {senderToken && (
+      {signerToken && (
         <OrderReviewToken
-          amount={senderAmount}
+          amount={signerAmount}
           label={t("common.receive")}
-          tokenSymbol={justifiedSenderToken?.symbol || "?"}
-          tokenUri={justifiedSenderToken?.logoURI}
+          tokenSymbol={justifiedSignerToken?.symbol || "?"}
+          tokenUri={justifiedSignerToken?.logoURI}
         />
       )}
       <ReviewList>
diff --git a/src/components/@widgets/MakeWidget/MakeWidget.tsx b/src/components/@widgets/MakeWidget/MakeWidget.tsx
index dc722d3e..17a0ade6 100644
--- a/src/components/@widgets/MakeWidget/MakeWidget.tsx
+++ b/src/components/@widgets/MakeWidget/MakeWidget.tsx
@@ -129,11 +129,8 @@ const MakeWidget: FC = () => {
   const [takerAmount, setTakerAmount] = useState("");
 
   // States derived from user input
-  const defaultTokenFromAddress = useTokenAddress("USDT");
   const defaultTokenToAddress = nativeCurrency[chainId!]?.address;
-  const makerTokenInfo = useTokenInfo(
-    userTokens.tokenFrom || defaultTokenFromAddress || null
-  );
+  const makerTokenInfo = useTokenInfo(userTokens.tokenFrom || null);
   const takerTokenInfo = useTokenInfo(
     userTokens.tokenTo || defaultTokenToAddress || null
   );
@@ -222,7 +219,7 @@ const MakeWidget: FC = () => {
       type,
       value,
       userTokens.tokenTo || defaultTokenToAddress || undefined,
-      userTokens.tokenFrom || defaultTokenFromAddress || undefined
+      userTokens.tokenFrom || undefined
     );
 
     dispatch(
diff --git a/src/components/@widgets/OrderDetailWidget/subcomponents/ActionButtons/ActionButtons.tsx b/src/components/@widgets/OrderDetailWidget/subcomponents/ActionButtons/ActionButtons.tsx
index a139a3ee..bc276d68 100644
--- a/src/components/@widgets/OrderDetailWidget/subcomponents/ActionButtons/ActionButtons.tsx
+++ b/src/components/@widgets/OrderDetailWidget/subcomponents/ActionButtons/ActionButtons.tsx
@@ -139,7 +139,7 @@ const ActionButtons: FC<ActionButtonsProps> = ({
       <Container className={className}>
         <BackButton onClick={onBackButtonClick}>{t("common.back")}</BackButton>
         <SignButton disabled intent="neutral">
-          {t("orders.insufficientBalance")}
+          {t("orders.insufficientBalance", { symbol: senderTokenSymbol })}
         </SignButton>
       </Container>
     );
diff --git a/src/features/balances/balancesSlice.ts b/src/features/balances/balancesSlice.ts
index 0abdaf91..d45281a4 100644
--- a/src/features/balances/balancesSlice.ts
+++ b/src/features/balances/balancesSlice.ts
@@ -92,6 +92,9 @@ const getThunk: (
           ...(wrappedNativeToken ? [wrappedNativeToken] : []),
           ADDRESS_ZERO,
         ];
+        if (state.takeOtc.activeOrder) {
+          activeTokensAddresses.push(state.takeOtc.activeOrder.senderToken);
+        }
         dispatch(
           getSetInFlightRequestTokensAction(type)(activeTokensAddresses)
         );