diff --git a/src/images/common/trade-tools/swap-forex-formula.png b/src/images/common/trade-tools/swap-forex-formula.png
index b6f5ac88eb5..46980a1c86c 100644
Binary files a/src/images/common/trade-tools/swap-forex-formula.png and b/src/images/common/trade-tools/swap-forex-formula.png differ
diff --git a/src/images/common/trade-tools/swap-synthetic-formula.png b/src/images/common/trade-tools/swap-synthetic-formula.png
index 070069b2c47..492f2cb3739 100644
Binary files a/src/images/common/trade-tools/swap-synthetic-formula.png and b/src/images/common/trade-tools/swap-synthetic-formula.png differ
diff --git a/src/pages/trader-tools/_margin-calculator.js b/src/pages/trader-tools/_margin-calculator.js
index 8f8ae0f5a9e..deafe485cb0 100644
--- a/src/pages/trader-tools/_margin-calculator.js
+++ b/src/pages/trader-tools/_margin-calculator.js
@@ -88,7 +88,7 @@ const MarginCalculator = () => {
     }
 
     const toFixed = (val) => {
-        return parseFloat(val.toFixed(2)).toLocaleString()
+        return parseFloat(val.toFixed(3)).toLocaleString()
     }
 
     const resetValidation = (values) => {
@@ -376,10 +376,13 @@ const MarginCalculator = () => {
                             {localize('How margin is calculated')}
                         </RightContentHeader>
 
+                        <StyledText>
+                            <Localize translate_text="The margin required for a contract on DMT5 is calculated based on the formula:" />
+                        </StyledText>
                         <StyledText mb="1.6rem">
                             <Localize
-                                translate_text="The margin required for a contract on DMT5 is calculated based on the formula:<1></1><0> Margin = volume in lots × contract size × asset price/leverage </0>"
-                                components={[<strong key={0} />, <br key={1} />]}
+                                translate_text="<0> Margin = volume in lots × contract size × asset price/leverage </0>"
+                                components={[<strong key={0} />]}
                             />
                         </StyledText>
 
diff --git a/src/pages/trader-tools/_style.js b/src/pages/trader-tools/_style.js
index 84de2bda191..a6835c5057e 100644
--- a/src/pages/trader-tools/_style.js
+++ b/src/pages/trader-tools/_style.js
@@ -82,9 +82,10 @@ export const FormWrapper = styled(Flex)`
     }
 `
 export const SwapFormWrapper = styled(FormWrapper)`
-    max-height: 580px;
-    margin-top: 40px;
+    height: 569px;
+    margin-top: 45px;
     @media ${device.tabletL} {
+        height: unset;
         margin-top: 0;
     }
 `
diff --git a/src/pages/trader-tools/_swap-calculator.js b/src/pages/trader-tools/_swap-calculator.js
index 21cccd99eb0..49168568e0f 100644
--- a/src/pages/trader-tools/_swap-calculator.js
+++ b/src/pages/trader-tools/_swap-calculator.js
@@ -105,7 +105,7 @@ const SwapCalculator = () => {
     }
 
     const toFixed = (val) => {
-        return parseFloat(val.toFixed(2)).toLocaleString()
+        return parseFloat(val.toFixed(3)).toLocaleString()
     }
 
     const resetValidationSynthetic = (values) => {
@@ -209,7 +209,15 @@ const SwapCalculator = () => {
     }
 
     const numberSubmitFormatNegative = (input) => {
-        return input.replace(/^(-?)0+/, '$1')
+        let result = input.replace(/^(-?)0+/, '$1')
+
+        if (result.charAt(0) == '-' && result.charAt(1) == '.') {
+            result = result.slice(0, 1) + '0' + result.slice(1)
+        } else if (result.charAt(0) == '.') {
+            result = '0' + result
+        }
+
+        return result
     }
 
     return (
@@ -224,7 +232,7 @@ const SwapCalculator = () => {
                 )}
             </SectionSubtitle>
 
-            <Flex mb="8rem" p="0 1.6rem" tablet={{ mb: '32px', height: 'unset' }}>
+            <Flex mb="40px" p="0 1.6rem" tablet={{ mb: '32px', height: 'unset' }}>
                 <SwapTabSelector
                     active={tab === 'Synthetic'}
                     onClick={() => onTabClick('Synthetic')}
@@ -457,10 +465,13 @@ const SwapCalculator = () => {
                                     {localize('How swap charges are calculated')}
                                 </RightContentHeader>
 
+                                <StyledText size="1.6rem">
+                                    <Localize translate_text="For synthetic indices, the swap charge is calculated on an annual basis for long and short positions using the formula:" />
+                                </StyledText>
                                 <StyledText size="1.6rem" mb="2rem">
                                     <Localize
-                                        translate_text="For synthetic indices, the swap charge is calculated on an annual basis for long and short positions using the formula:<1></1><0>Swap charge = volume × contract size × asset price × (swap rate/100) /360</0>"
-                                        components={[<strong key={0} />, <br key={1} />]}
+                                        translate_text="<0>Swap charge = volume × contract size × asset price × (swap rate/100) /360</0>"
+                                        components={[<strong key={0} />]}
                                     />
                                 </StyledText>
 
@@ -502,7 +513,7 @@ const SwapCalculator = () => {
                                 </FormulaText>
                             </ImageWrapper>
                             <TextWrapper>
-                                <StyledText size="1.6rem" mb="2rem" mt="1.6rem">
+                                <StyledText size="1.6rem" mt="1.6rem">
                                     <Localize
                                         translate_text="So you will be required to pay a swap charge of <0>0.83 USD</0> to keep the position open for one night."
                                         components={[<strong key={0} />]}
@@ -758,10 +769,13 @@ const SwapCalculator = () => {
                                     {localize('How swap charges are calculated')}
                                 </RightContentHeader>
 
+                                <StyledText size="1.6rem">
+                                    <Localize translate_text="For forex and commodities, the swap charge is calculated using the formula is:" />
+                                </StyledText>
                                 <StyledText size="1.6rem" mb="2rem">
                                     <Localize
-                                        translate_text="For forex and commodities, the swap charge is calculated using the formula is:<1></1><0>Swap charge = volume × contract size × point value × swap rate</0>"
-                                        components={[<strong key={0} />, <br key={1} />]}
+                                        translate_text="<0>Swap charge = volume × contract size × point value × swap rate</0>"
+                                        components={[<strong key={0} />]}
                                     />
                                 </StyledText>
 
diff --git a/src/pages/trader-tools/index.js b/src/pages/trader-tools/index.js
index 7f009dc3ea0..0de1a8fe576 100644
--- a/src/pages/trader-tools/index.js
+++ b/src/pages/trader-tools/index.js
@@ -9,7 +9,6 @@ import { localize, WithIntl } from 'components/localization'
 import Layout from 'components/layout/layout'
 import { getLocationHash, isBrowser, scrollTop } from 'common/utility'
 import Patterns from 'images/common/trade-tools/trade-tools-bg.png'
-import Signup, { Appearances } from 'components/custom/signup'
 
 const Hero = styled(Flex)`
     height: 40rem;
@@ -33,7 +32,6 @@ const Item = styled.div`
 
     h4 {
         color: var(--color-black);
-        opacity: ${(props) => (props.name === props.active_tab ? '1' : '0.32')};
         font-weight: ${(props) => (props.name === props.active_tab ? 'bold' : 'normal')};
     }
     @media ${device.tabletL} {
@@ -103,7 +101,6 @@ const TraderTools = () => {
                 {active_tab === 'marginCalculator' && <MarginCalculator />}
                 {active_tab === 'swapCalculator' && <SwapCalculator />}
             </Box>
-            <Signup appearance={Appearances.public} />
         </Layout>
     )
 }