diff --git a/src/App.tsx b/src/App.tsx
index 2f874d93f1..7e222bcb5d 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -133,6 +133,7 @@ const Content = () => {
 
   // Check if we're on the trade page
   const isTradePage = matchPath(`${AppRoute.Trade}/*`, location.pathname) !== null;
+  const isSpotPage = matchPath(`${AppRoute.Spot}/*`, location.pathname) !== null;
 
   if (isSimpleUi) {
     const matchMarkets = matchPath(AppRoute.Markets, location.pathname);
@@ -197,7 +198,7 @@ const Content = () => {
   return (
     <>
       <GlobalStyle />
-      <$AppContainer isTradePage={isTradePage}>
+      <$AppContainer isTradePage={isTradePage || isSpotPage}>
         <$Content
           isShowingHeader={isShowingHeader}
           isShowingFooter={isShowingFooter}
diff --git a/src/pages/spot/Spot.tsx b/src/pages/spot/Spot.tsx
index 21f8d8de0a..1d24d5fdf8 100644
--- a/src/pages/spot/Spot.tsx
+++ b/src/pages/spot/Spot.tsx
@@ -380,10 +380,13 @@ const $SpotLayout = styled.article<{
 
 const $GridSection = styled.section<{ gridArea: string }>`
   grid-area: ${({ gridArea }) => gridArea};
+  border: var(--default-border-width, 1px) solid var(--color-border) !important;
+  border-radius: 0.75rem !important;
 `;
 
 const $SideGridSection = styled($GridSection)`
   ${layoutMixins.withInnerHorizontalBorders}
+  background-color: var(--color-layer-1);
 `;
 
 const $Output = styled(Output)`
diff --git a/src/pages/spot/SpotHeader.tsx b/src/pages/spot/SpotHeader.tsx
index d4491bbead..89a6b4a79e 100644
--- a/src/pages/spot/SpotHeader.tsx
+++ b/src/pages/spot/SpotHeader.tsx
@@ -61,4 +61,15 @@ const $Container = styled.div`
   grid-auto-flow: column;
   justify-content: start;
   align-items: stretch;
+
+  background-color: var(--color-layer-1);
+
+  /* Completely override box-shadow border from withOuterAndInnerBorders */
+  --border-color: transparent !important;
+  box-shadow: none !important;
+
+  /* Apply rounded border using border property which respects border-radius */
+  border: var(--default-border-width, 1px) solid var(--color-border) !important;
+  border-radius: 0.75rem !important;
+  overflow: hidden; // Clip content and borders to rounded corners
 `;
diff --git a/src/pages/spot/SpotMarketsDropdown.tsx b/src/pages/spot/SpotMarketsDropdown.tsx
index a766481765..9fdb2218b5 100644
--- a/src/pages/spot/SpotMarketsDropdown.tsx
+++ b/src/pages/spot/SpotMarketsDropdown.tsx
@@ -125,6 +125,7 @@ export const SpotMarketsDropdown = ({
       noBlur
       sideOffset={1}
       className={className}
+      align="start"
       slotTrigger={
         <$TriggerContainer $isOpen={isOpen}>
           <div tw="flex items-center gap-0.25">
@@ -236,7 +237,9 @@ const $Popover = styled(Popover)`
   max-width: 100vw;
 
   box-shadow: 0 0 0 1px var(--color-border);
-  border-radius: 0;
+
+  border: var(--default-border-width, 1px) solid var(--color-border);
+  border-radius: 0.75rem;
 
   &:focus-visible {
     outline: none;
diff --git a/src/pages/trade/MarketSelectorAndStats.tsx b/src/pages/trade/MarketSelectorAndStats.tsx
index c01f2609f6..bbefd701b6 100644
--- a/src/pages/trade/MarketSelectorAndStats.tsx
+++ b/src/pages/trade/MarketSelectorAndStats.tsx
@@ -63,7 +63,7 @@ const $Container = styled.div`
   grid-auto-flow: column;
   justify-content: start;
   align-items: stretch;
-  background-color: var(--color-layer-1) !important; // TODO: figure out why this is needed
+  background-color: var(--color-layer-1);
 
   /* Completely override box-shadow border from withOuterAndInnerBorders */
   --border-color: transparent !important;
diff --git a/src/views/MarketFilter.tsx b/src/views/MarketFilter.tsx
index 718bb1e3d2..ef339f4734 100644
--- a/src/views/MarketFilter.tsx
+++ b/src/views/MarketFilter.tsx
@@ -101,7 +101,7 @@ export const MarketFilter = forwardRef(
         }
         value={selectedFilter}
         onValueChange={onChangeFilter}
-        overflow="wrap"
+        overflow="scroll"
         slotBefore={unlaunchedMarketSwitch}
       />
     );
@@ -114,7 +114,7 @@ export const MarketFilter = forwardRef(
             onTextChange={onSearchTextChange}
           />
         </div>
-        <div tw="flex w-full items-center justify-start gap-0.5 overflow-hidden">
+        <div tw="relative flex w-full items-center justify-start gap-0.5 overflow-hidden overflow-x-auto">
           {filterToggles}
         </div>
       </$MarketFilter>