diff --git a/packages/site/src/pages/SwapWidget/SwapWidget.tsx b/packages/site/src/pages/SwapWidget/SwapWidget.tsx
index 68e578cc..face6d54 100644
--- a/packages/site/src/pages/SwapWidget/SwapWidget.tsx
+++ b/packages/site/src/pages/SwapWidget/SwapWidget.tsx
@@ -6,8 +6,8 @@ import {
 } from '../../components';
 import type { DurationUnits, TakerTypeValues } from '../../stores/SwapStore';
 import { useSwapStore } from '../../stores/SwapStore';
-import { FromToken } from '../FromToken/FromToken';
-import { ToToken } from '../ToToken/ToToken';
+import { FromToken } from '../TokenSelectContainers/FromToken';
+import { ToToken } from '../TokenSelectContainers/ToToken';
 import {
   ButtonWrapper,
   Container,
diff --git a/packages/site/src/pages/ToToken/ToTokenStyles.ts b/packages/site/src/pages/ToToken/ToTokenStyles.ts
deleted file mode 100644
index 123eda59..00000000
--- a/packages/site/src/pages/ToToken/ToTokenStyles.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import styled from 'styled-components';
-
-export const ToTokenContainer = styled.div`
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  width: 100%;
-  padding: 1rem;
-  margin: 1rem;
-  font-size: 18px;
-  border: solid #34425c 1px;
-  border-radius: 10px;
-  background: #13203d;
-`;
-
-export const TokenSelector = styled.div`
-  width: 50%;
-`;
-
-export const AmountWrapper = styled.div`
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-`;
diff --git a/packages/site/src/pages/FromToken/FromToken.tsx b/packages/site/src/pages/TokenSelectContainers/FromToken.tsx
similarity index 90%
rename from packages/site/src/pages/FromToken/FromToken.tsx
rename to packages/site/src/pages/TokenSelectContainers/FromToken.tsx
index d7f8fac3..fdde7fa9 100644
--- a/packages/site/src/pages/FromToken/FromToken.tsx
+++ b/packages/site/src/pages/TokenSelectContainers/FromToken.tsx
@@ -2,14 +2,14 @@ import { RadixSelect, NumberInput } from '../../components';
 import { useSwapStore } from '../../stores/SwapStore';
 import {
   AmountWrapper,
-  FromTokenContainer,
+  TokenContainer,
   TokenSelector,
 } from './FromTokenStyles';
 
 export const FromToken = () => {
   const { setFromToken, setFromAmount } = useSwapStore();
   return (
-    <FromTokenContainer>
+    <TokenContainer>
       <TokenSelector>
         From
         <RadixSelect
@@ -22,6 +22,6 @@ export const FromToken = () => {
       <AmountWrapper>
         <NumberInput placeholder="0.00" onTextChange={setFromAmount} />
       </AmountWrapper>
-    </FromTokenContainer>
+    </TokenContainer>
   );
 };
diff --git a/packages/site/src/pages/FromToken/FromTokenStyles.ts b/packages/site/src/pages/TokenSelectContainers/FromTokenStyles.ts
similarity index 90%
rename from packages/site/src/pages/FromToken/FromTokenStyles.ts
rename to packages/site/src/pages/TokenSelectContainers/FromTokenStyles.ts
index dda5c0a4..ac978fff 100644
--- a/packages/site/src/pages/FromToken/FromTokenStyles.ts
+++ b/packages/site/src/pages/TokenSelectContainers/FromTokenStyles.ts
@@ -1,6 +1,6 @@
 import styled from 'styled-components';
 
-export const FromTokenContainer = styled.div`
+export const TokenContainer = styled.div`
   display: flex;
   flex-direction: row;
   justify-content: space-between;
diff --git a/packages/site/src/pages/ToToken/ToToken.tsx b/packages/site/src/pages/TokenSelectContainers/ToToken.tsx
similarity index 87%
rename from packages/site/src/pages/ToToken/ToToken.tsx
rename to packages/site/src/pages/TokenSelectContainers/ToToken.tsx
index 3b50cf48..1c550c26 100644
--- a/packages/site/src/pages/ToToken/ToToken.tsx
+++ b/packages/site/src/pages/TokenSelectContainers/ToToken.tsx
@@ -2,14 +2,14 @@ import { RadixSelect, NumberInput } from '../../components';
 import { useSwapStore } from '../../stores/SwapStore';
 import {
   AmountWrapper,
-  ToTokenContainer,
+  TokenContainer,
   TokenSelector,
-} from './ToTokenStyles';
+} from './FromTokenStyles';
 
 export const ToToken = () => {
   const { setToToken, setToAmount } = useSwapStore();
   return (
-    <ToTokenContainer>
+    <TokenContainer>
       <TokenSelector>
         To
         <RadixSelect
@@ -22,6 +22,6 @@ export const ToToken = () => {
       <AmountWrapper>
         <NumberInput placeholder="0.00" onTextChange={setToAmount} />
       </AmountWrapper>
-    </ToTokenContainer>
+    </TokenContainer>
   );
 };