diff --git a/src/app/components/layout/headers/header-grid.tsx b/src/app/components/layout/headers/header-grid.tsx
index e48f7fed6df..a92199c1c0d 100644
--- a/src/app/components/layout/headers/header-grid.tsx
+++ b/src/app/components/layout/headers/header-grid.tsx
@@ -15,7 +15,7 @@ export function HeaderGrid({ leftCol, centerCol, rightCol, ...props }: HeaderGri
   return (
     <Grid
       alignItems="center"
-      gridTemplateColumns={centerCol ? '2fr 4fr 2fr' : 'auto 4fr auto'}
+      gridTemplateColumns={centerCol ? '2fr 4fr 2fr' : 'auto auto'}
       gridAutoFlow="column"
       width="100%"
       {...props}
diff --git a/src/app/components/layout/layouts/content.layout.tsx b/src/app/components/layout/layouts/content.layout.tsx
index 80ce69e9175..e02485371a8 100644
--- a/src/app/components/layout/layouts/content.layout.tsx
+++ b/src/app/components/layout/layouts/content.layout.tsx
@@ -4,7 +4,13 @@ import type { HasChildren } from '@app/common/has-children';
 
 export function Content({ children }: HasChildren) {
   return (
-    <Flex className="main-content" flexGrow={1} position="relative" width="100%">
+    <Flex
+      className="main-content"
+      flexGrow={1}
+      position="relative"
+      width="100%"
+      maxWidth="fullPageMaxWidth"
+    >
       {children}
     </Flex>
   );
diff --git a/src/app/components/layout/layouts/two-column.layout.tsx b/src/app/components/layout/layouts/two-column.layout.tsx
index 98dd8ad7288..201ea2f1abe 100644
--- a/src/app/components/layout/layouts/two-column.layout.tsx
+++ b/src/app/components/layout/layouts/two-column.layout.tsx
@@ -25,7 +25,6 @@ export function TwoColumnLayout({
       mx={{ base: 'auto', md: 'space.03', lg: 'space.06' }}
       gap="space.05"
       width={{ base: '100vw', md: 'unset' }}
-      maxWidth="fullPageMaxWidth"
     >
       <Flex flexDirection="column" gap="space.04">
         <Stack gap="space.04">
diff --git a/src/app/features/container/headers/home.header.tsx b/src/app/features/container/headers/home.header.tsx
index b194920072f..e6eb78de9ca 100644
--- a/src/app/features/container/headers/home.header.tsx
+++ b/src/app/features/container/headers/home.header.tsx
@@ -16,7 +16,7 @@ export function HomeHeader() {
     useOutletContext<SwitchAccountOutletContext>();
 
   return (
-    <Header paddingLeft={{ base: undefined, sm: 0 }}>
+    <Header>
       <HeaderGrid
         leftCol={<LogoBox hideBelow={undefined} />}
         rightCol={
diff --git a/src/app/features/container/headers/page.header.tsx b/src/app/features/container/headers/page.header.tsx
index 7871903f64d..b89dce993ae 100644
--- a/src/app/features/container/headers/page.header.tsx
+++ b/src/app/features/container/headers/page.header.tsx
@@ -38,44 +38,40 @@ export function PageHeader({
   const canGoBack = !isSummaryPage;
 
   return (
-    <>
-      <Header>
-        <HeaderGrid
-          leftCol={
-            <>
-              {canGoBack && (
-                <HeaderActionButton
-                  icon={<ArrowLeftIcon />}
-                  onAction={onGoBack}
-                  dataTestId={SharedComponentsSelectors.HeaderBackBtn}
+    <Header>
+      <HeaderGrid
+        leftCol={
+          <>
+            {canGoBack && (
+              <HeaderActionButton
+                icon={<ArrowLeftIcon />}
+                onAction={onGoBack}
+                dataTestId={SharedComponentsSelectors.HeaderBackBtn}
+              />
+            )}
+            <LogoBox onClick={() => navigate(RouteUrls.Home)} />
+          </>
+        }
+        centerCol={title && <styled.span textStyle="heading.05">{title}</styled.span>}
+        rightCol={
+          <HeaderGridRightCol>
+            {isSummaryPage ? (
+              <HeaderActionButton
+                icon={<CloseIcon />}
+                dataTestId={SharedComponentsSelectors.HeaderCloseBtn}
+                onAction={() => navigate(RouteUrls.Home)}
+              />
+            ) : (
+              <styled.div hideBelow={isSettingsVisibleOnSm ? undefined : 'sm'}>
+                <Settings
+                  triggerButton={<HamburgerIcon data-testid={SettingsSelectors.SettingsMenuBtn} />}
+                  toggleSwitchAccount={() => setIsShowingSwitchAccount(!isShowingSwitchAccount)}
                 />
-              )}
-              <LogoBox onClick={() => navigate(RouteUrls.Home)} />
-            </>
-          }
-          centerCol={title && <styled.span textStyle="heading.05">{title}</styled.span>}
-          rightCol={
-            <HeaderGridRightCol>
-              {isSummaryPage ? (
-                <HeaderActionButton
-                  icon={<CloseIcon />}
-                  dataTestId={SharedComponentsSelectors.HeaderCloseBtn}
-                  onAction={() => navigate(RouteUrls.Home)}
-                />
-              ) : (
-                <styled.div hideBelow={isSettingsVisibleOnSm ? undefined : 'sm'}>
-                  <Settings
-                    triggerButton={
-                      <HamburgerIcon data-testid={SettingsSelectors.SettingsMenuBtn} />
-                    }
-                    toggleSwitchAccount={() => setIsShowingSwitchAccount(!isShowingSwitchAccount)}
-                  />
-                </styled.div>
-              )}
-            </HeaderGridRightCol>
-          }
-        />
-      </Header>
-    </>
+              </styled.div>
+            )}
+          </HeaderGridRightCol>
+        }
+      />
+    </Header>
   );
 }
diff --git a/src/app/features/container/headers/unlock.header.tsx b/src/app/features/container/headers/unlock.header.tsx
index 13852efc292..9c3c99502ae 100644
--- a/src/app/features/container/headers/unlock.header.tsx
+++ b/src/app/features/container/headers/unlock.header.tsx
@@ -15,7 +15,7 @@ export function UnlockHeader() {
   const navigate = useNavigate();
 
   return (
-    <Header paddingLeft={{ base: undefined, sm: 0 }}>
+    <Header>
       <HeaderGrid
         leftCol={
           <LogoBox onClick={() => navigate(RouteUrls.Home)} hideBelow={undefined} hideFrom="sm" />
diff --git a/src/app/pages/fund/components/fund.layout.tsx b/src/app/pages/fund/components/fund.layout.tsx
index 54d88f60b6e..9e19290da02 100644
--- a/src/app/pages/fund/components/fund.layout.tsx
+++ b/src/app/pages/fund/components/fund.layout.tsx
@@ -14,7 +14,6 @@ export function FundLayout({ blockchain, symbol, children }: FundLayoutProps) {
       alignItems={{ base: 'left', md: 'center' }}
       p={{ base: 'space.05', md: 'unset' }}
       gap={{ base: 'space.04', md: 'space.05' }}
-      maxWidth="fullPageMaxWidth"
     >
       <styled.h1
         textAlign={{ base: 'left', md: 'center' }}
diff --git a/src/app/pages/home/home.tsx b/src/app/pages/home/home.tsx
index 3e65553651c..787cd57b9cb 100644
--- a/src/app/pages/home/home.tsx
+++ b/src/app/pages/home/home.tsx
@@ -49,7 +49,6 @@ export function Home() {
   return (
     <Stack
       data-testid={HomePageSelectors.HomePageContainer}
-      maxWidth={{ base: 'unset', md: 'fullPageMaxWidth' }}
       px={{ base: 0, md: 'space.05' }}
       py={{ base: 0, md: 'space.07' }}
       gap={{ base: 0, md: 'space.06' }}