diff --git a/src/app/[lng]/swap/[segments]/page.tsx b/src/app/[lng]/swap/[segments]/page.tsx
index 4e009d12d..a5c0d4eda 100644
--- a/src/app/[lng]/swap/[segments]/page.tsx
+++ b/src/app/[lng]/swap/[segments]/page.tsx
@@ -69,6 +69,7 @@ export default async function Page({
       <SwapPage
         sourceChain={sourceChain}
         sourceToken={sourceToken}
+        destinationChain={sourceChain}
         destinationToken={destinationToken}
         tokens={tokens}
       />
diff --git a/src/app/ui/swap/SwapPage.tsx b/src/app/ui/swap/SwapPage.tsx
index b88d0b66e..0118b4bd8 100644
--- a/src/app/ui/swap/SwapPage.tsx
+++ b/src/app/ui/swap/SwapPage.tsx
@@ -9,6 +9,7 @@ import StepsExplainerSection from './SwapStepsExplainer';
 
 interface SwapPageProps {
   sourceChain: ExtendedChain;
+  destinationChain: ExtendedChain;
   tokens: TokensResponse['tokens'];
   sourceToken?: Token;
   destinationToken?: Token;
@@ -41,6 +42,7 @@ const BridgePage = ({
         <StepsExplainerSection
           sourceChain={sourceChain}
           sourceToken={sourceToken}
+          destinationChain={sourceChain}
           destinationToken={destinationToken}
         />
 
diff --git a/src/app/ui/swap/SwapStepsExplainer.tsx b/src/app/ui/swap/SwapStepsExplainer.tsx
index f1d52a615..e0afd069b 100644
--- a/src/app/ui/swap/SwapStepsExplainer.tsx
+++ b/src/app/ui/swap/SwapStepsExplainer.tsx
@@ -10,12 +10,14 @@ import { getWidgetImageProps } from 'src/utils/image-generation/getWidgetImage';
 
 interface SwapStepsExplainerProps {
   sourceChain: ExtendedChain;
+  destinationChain: ExtendedChain;
   sourceToken?: Token;
   destinationToken?: Token;
 }
 
 const SwapStepsExplainerSection = ({
   sourceChain,
+  destinationChain,
   sourceToken,
   destinationToken,
 }: SwapStepsExplainerProps) => {
@@ -43,6 +45,7 @@ const SwapStepsExplainerSection = ({
       img: getWidgetImageProps({
         sourceToken,
         sourceChain,
+        destinationChain,
         destinationToken,
         theme,
         widgetImageProps: {
@@ -70,6 +73,7 @@ const SwapStepsExplainerSection = ({
       img: getWidgetImageProps({
         sourceToken,
         sourceChain,
+        destinationChain,
         destinationToken,
         theme,
         widgetImageProps: {
@@ -100,6 +104,7 @@ const SwapStepsExplainerSection = ({
       img: getWidgetImageProps({
         sourceToken,
         sourceChain,
+        destinationChain,
         destinationToken,
         theme,
         widgetImageProps: {
@@ -133,6 +138,7 @@ const SwapStepsExplainerSection = ({
       img: getWidgetImageProps({
         sourceToken,
         sourceChain,
+        destinationChain,
         destinationToken,
         theme,
         widgetImageProps: {
diff --git a/src/components/AvatarBadge/NoMUI/AvatarBadgeNoMUI.tsx b/src/components/AvatarBadge/NoMUI/AvatarBadgeNoMUI.tsx
index cbf528769..3943df5d7 100644
--- a/src/components/AvatarBadge/NoMUI/AvatarBadgeNoMUI.tsx
+++ b/src/components/AvatarBadge/NoMUI/AvatarBadgeNoMUI.tsx
@@ -85,7 +85,16 @@ export const AvatarBadgeNoMUI = ({
             }}
           />
         ) : (
-          <AvatarSkeleton width={badgeSize} height={badgeSize} />
+          <AvatarSkeleton
+            width={badgeSize}
+            height={badgeSize}
+            sx={{
+              position: 'absolute',
+              bottom: 0,
+              right: 0,
+              transform: `translate(${badgeOffset?.x ? badgeOffset.x : 0}px, ${badgeOffset?.y ? badgeOffset.y : 0}px)`,
+            }}
+          />
         )}
       </div>
     </div>
diff --git a/src/components/ImageGeneration/Fields/TokenField.tsx b/src/components/ImageGeneration/Fields/TokenField.tsx
index 8d1759f77..1554c890b 100644
--- a/src/components/ImageGeneration/Fields/TokenField.tsx
+++ b/src/components/ImageGeneration/Fields/TokenField.tsx
@@ -22,7 +22,6 @@ const TokenField = ({
   fullWidth?: boolean;
 }) => {
   // Function to calculate top offset based on conditions
-
   const fieldContainerStyle = fieldContainerStyles();
   return (
     <div style={{ display: 'flex', width: fullWidth ? 368 : 174 }}>