diff --git a/modules/app/components/PageLoadingPlaceholder.tsx b/modules/app/components/PageLoadingPlaceholder.tsx
index 075115e38..7afba4701 100644
--- a/modules/app/components/PageLoadingPlaceholder.tsx
+++ b/modules/app/components/PageLoadingPlaceholder.tsx
@@ -5,15 +5,11 @@ import SidebarLayout from 'modules/app/components/layout/layouts/Sidebar';
 
 type Props = {
   sidebar?: boolean;
-  shortenFooter?: boolean;
 };
 
-export default function PageLoadingPlaceholder({
-  sidebar = true,
-  shortenFooter = true
-}: Props): React.ReactElement {
+export default function PageLoadingPlaceholder({ sidebar = true }: Props): React.ReactElement {
   return (
-    <PrimaryLayout sx={{ maxWidth: 'dashboard' }} shortenFooter={shortenFooter}>
+    <PrimaryLayout sx={{ maxWidth: 'dashboard' }}>
       <Box mt={3} mb={4}>
         <Skeleton width="50%" height={'70px'} />
       </Box>
diff --git a/modules/app/components/layout/Footer/LongFooter.tsx b/modules/app/components/layout/Footer/LongFooter.tsx
deleted file mode 100644
index f3ab8bc37..000000000
--- a/modules/app/components/layout/Footer/LongFooter.tsx
+++ /dev/null
@@ -1,191 +0,0 @@
-import { Flex, Grid, Box, Container } from 'theme-ui';
-import { Icon } from '@makerdao/dai-ui-icons';
-import { ExternalLink } from 'modules/app/components/ExternalLink';
-import React from 'react';
-import { translate } from '@makerdao/i18n-helper';
-
-export default function LongFooter({ locale = 'en' }: { locale?: string }): React.ReactElement {
-  const t = text => translate(text, locale);
-
-  const links = [
-    {
-      header: t('Resources'),
-      list: [
-        {
-          url: 'https://makerdao.com/whitepaper',
-          title: t('Whitepaper')
-        },
-        {
-          url: 'https://awesome.makerdao.com/#faqs',
-          title: t('FAQs')
-        },
-        {
-          url: '/terms',
-          title: t('Terms')
-        },
-        {
-          url: '/cookies-policy',
-          title: 'Cookies policy'
-        },
-        {
-          url: 'https://www.notion.so/makerdao/Maker-Brand-ac517c82ff9a43089d0db5bb2ee045a4',
-          title: t('Brand Assets')
-        },
-        {
-          url: 'https://makerdao.com/en/feeds/',
-          title: t('Feeds')
-        },
-        {
-          url: 'https://makerdao.statuspage.io/',
-          title: t('Service Status')
-        }
-      ]
-    },
-    {
-      header: t('Products'),
-      list: [
-        {
-          url: 'https://oasis.app/',
-          title: t('Whitepaper')
-        },
-        {
-          url: 'https://migrate.makerdao.com/',
-          title: t('Migrate')
-        },
-        {
-          url: 'https://makerdao.com/en/ecosystem/',
-          title: t('Ecosystem')
-        },
-        {
-          url: 'https://makerdao.com/en/governance/',
-          title: t('Governance')
-        }
-      ]
-    },
-    {
-      header: t('Developers'),
-      list: [
-        {
-          url: 'https://docs.makerdao.com/',
-          title: t('Documentation')
-        },
-        {
-          url: 'https://github.com/makerdao/developerguides',
-          title: 'Developer Guides'
-        },
-        {
-          url: '/api-docs',
-          title: 'API Docs'
-        }
-      ]
-    },
-    {
-      header: 'Contact',
-      list: [
-        {
-          url: 'https://discord.gg/2sWcgCDWCX',
-          title: 'Support'
-        }
-      ]
-    }
-  ];
-
-  return (
-    <Container
-      as="footer"
-      sx={{
-        px: [4, 0, 0],
-        fontSize: '1.5rem',
-        pt: 5,
-        pb: 3,
-        width: '100%',
-        backgroundColor: 'transparent'
-      }}
-    >
-      <Grid
-        sx={{ maxWidth: 'page' }}
-        m="0 auto"
-        columns={['1fr', '1fr 1fr', '1fr 1fr', 'repeat(4, 1fr) auto']}
-        gap="2rem"
-      >
-        {links.map(group => (
-          <div key={group.header}>
-            <Box
-              as="div"
-              sx={{
-                fontWeight: '500',
-                marginBottom: '0.2rem',
-                color: 'text',
-                fontSize: 14.3
-              }}
-            >
-              {group.header}
-            </Box>
-            <Box
-              as="ul"
-              sx={{
-                paddingLeft: 0,
-                listStyle: 'none',
-                lineHeight: '2.1rem',
-                fontSize: 14,
-                '& a': {
-                  color: 'textSecondary',
-                  fontWeight: '400',
-                  transition: 'color 0.2s ease-out',
-                  textDecoration: 'none',
-                  ':hover': { color: 'greenLinkHover' }
-                }
-              }}
-            >
-              {group.list.map(link => (
-                <li key={link.url}>
-                  <ExternalLink href={link.url} title={link.title}>
-                    {link.title}
-                  </ExternalLink>
-                </li>
-              ))}
-            </Box>
-          </div>
-        ))}
-
-        <Box>
-          <Flex
-            mt="1.8rem"
-            sx={{
-              flexDirection: 'row',
-              justifyContent: 'left',
-              marginTop: 22,
-              '& svg': {
-                width: 20,
-                height: 20,
-                transition: 'opacity 0.2s',
-                cursor: 'pointer',
-                opacity: 0.8,
-                marginRight: 24,
-                ':hover': {
-                  opacity: 1
-                }
-              }
-            }}
-          >
-            <ExternalLink styles={{ color: 'text' }} href="https://twitter.com/MakerDAO" title="Twitter">
-              <Icon name="twitter" />
-            </ExternalLink>
-            <ExternalLink styles={{ color: 'text' }} href="https://www.reddit.com/r/MakerDAO/" title="Reddit">
-              <Icon name="reddit" />
-            </ExternalLink>
-            <ExternalLink styles={{ color: 'text' }} href="https://t.me/makerdaoOfficial" title="Telegram">
-              <Icon name="telegram" />
-            </ExternalLink>
-            <ExternalLink styles={{ color: 'text' }} href="https://www.youtube.com/MakerDAO" title="Youtube">
-              <Icon name="youtube" />
-            </ExternalLink>
-            <ExternalLink styles={{ color: 'text' }} href="https://discord.gg/tQ5wnN6Ms4" title="Discord">
-              <Icon name="discord" />
-            </ExternalLink>
-          </Flex>
-        </Box>
-      </Grid>
-    </Container>
-  );
-}
diff --git a/modules/app/components/layout/Footer/ShortFooter.tsx b/modules/app/components/layout/Footer/ShortFooter.tsx
deleted file mode 100644
index b244e48eb..000000000
--- a/modules/app/components/layout/Footer/ShortFooter.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import React from 'react';
-import { NavLink } from 'theme-ui';
-
-export default function ShortFooter(): React.ReactElement {
-  return (
-    <footer
-      sx={{
-        pt: 4,
-        pb: 3,
-        display: 'flex',
-        flexWrap: 'wrap',
-        alignItems: 'center',
-        variant: 'styles.footer',
-        fontSize: 2
-      }}
-    >
-      <NavLink href="/terms" variant="footer" p={1} title="Terms" sx={{ fontWeight: 400 }}>
-        Terms
-      </NavLink>
-      <NavLink
-        href="https://makerdao.statuspage.io/"
-        target="_blank"
-        variant="footer"
-        title="Status"
-        p={2}
-        sx={{ fontWeight: 400 }}
-      >
-        Status
-      </NavLink>
-      <NavLink href="/api-docs" variant="footer" title="Status" p={2} sx={{ fontWeight: 400 }}>
-        API Docs
-      </NavLink>
-      <NavLink
-        href="https://discord.gg/2sWcgCDWCX"
-        target="_blank"
-        variant="footer"
-        title="Bugs"
-        p={2}
-        sx={{ fontWeight: 400 }}
-      >
-        Support
-      </NavLink>
-      <div sx={{ mx: 'auto' }} />
-      <div sx={{ p: 2 }}>© {new Date().getFullYear()} Maker</div>
-    </footer>
-  );
-}
diff --git a/modules/app/components/layout/Footer/index.tsx b/modules/app/components/layout/Footer/index.tsx
deleted file mode 100644
index dcca97eea..000000000
--- a/modules/app/components/layout/Footer/index.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import React from 'react';
-import ShortFooter from './ShortFooter';
-import LandingFooter from 'modules/home/components/LandingFooter';
-
-export default function Footer({ shorten = false }: { shorten: boolean }): React.ReactElement {
-  if (shorten) {
-    return <ShortFooter />;
-  } else {
-    return <LandingFooter />;
-  }
-}
diff --git a/modules/app/components/layout/layouts/Primary.tsx b/modules/app/components/layout/layouts/Primary.tsx
index 84ac1b1cc..217cb4039 100644
--- a/modules/app/components/layout/layouts/Primary.tsx
+++ b/modules/app/components/layout/layouts/Primary.tsx
@@ -1,17 +1,14 @@
 import { Box, Flex, ThemeUIStyleObject } from 'theme-ui';
-
 import { fadeIn } from 'lib/keyframes';
-import Footer from '../Footer';
+import Footer from 'modules/home/components/Footer';
 
 type Props = {
-  shortenFooter?: boolean;
   fade?: boolean;
   sx?: ThemeUIStyleObject;
 };
 
 const PrimaryLayout = ({
   children,
-  shortenFooter = false,
   fade = true,
   ...props
 }: React.PropsWithChildren<Props>): React.ReactElement => {
@@ -29,7 +26,7 @@ const PrimaryLayout = ({
       <Box as="main" sx={{ width: '100%', flex: '1 1 auto', variant: 'layout.main' }}>
         {children}
       </Box>
-      <Footer shorten={shortenFooter} />
+      <Footer />
     </Flex>
   );
 };
diff --git a/modules/home/components/LandingFooter.tsx b/modules/home/components/Footer.tsx
similarity index 97%
rename from modules/home/components/LandingFooter.tsx
rename to modules/home/components/Footer.tsx
index e3fc59007..d023d7eb9 100644
--- a/modules/home/components/LandingFooter.tsx
+++ b/modules/home/components/Footer.tsx
@@ -39,7 +39,7 @@ const ContactSection = ({ heading, logos, icon }) => {
   );
 };
 
-export default function LandingFooter({ locale = 'en' }: { locale?: string }): React.ReactElement {
+export default function Footer({ locale = 'en' }: { locale?: string }): React.ReactElement {
   const bpi = useBreakpointIndex();
   const [mode] = useColorMode();
 
@@ -82,10 +82,7 @@ export default function LandingFooter({ locale = 'en' }: { locale?: string }): R
           url: 'https://makerdao.statuspage.io/',
           title: t('Service Status')
         },
-        {
-          url: 'https://oasis.app/',
-          title: t('Oasis')
-        },
+
         {
           url: 'https://auctions.makerdao.network/',
           title: t('Auctions Dashboard')
@@ -101,6 +98,10 @@ export default function LandingFooter({ locale = 'en' }: { locale?: string }): R
         {
           url: 'https://daistats.com/',
           title: t('DAI Stats')
+        },
+        {
+          url: 'https://vote.makerdao.com/terms',
+          title: t('Terms')
         }
       ]
     },
diff --git a/pages/account.tsx b/pages/account.tsx
index 75bc09370..db10592a4 100644
--- a/pages/account.tsx
+++ b/pages/account.tsx
@@ -67,7 +67,7 @@ const AccountPage = (): React.ReactElement => {
   const { create, tx, setTxId } = useDelegateCreate();
 
   return (
-    <PrimaryLayout shortenFooter={true} sx={{ maxWidth: [null, null, null, 'page', 'dashboard'] }}>
+    <PrimaryLayout sx={{ maxWidth: [null, null, null, 'page', 'dashboard'] }}>
       <HeadComponent title="Account" />
 
       <SidebarLayout>
diff --git a/pages/address/[address]/index.tsx b/pages/address/[address]/index.tsx
index bbb4b82ca..d5245503f 100644
--- a/pages/address/[address]/index.tsx
+++ b/pages/address/[address]/index.tsx
@@ -30,7 +30,7 @@ const AddressView = ({ addressInfo }: { addressInfo: AddressApiResponse }) => {
   );
 
   return (
-    <PrimaryLayout shortenFooter={true} sx={{ maxWidth: [null, null, null, 'page', 'dashboard'] }}>
+    <PrimaryLayout sx={{ maxWidth: [null, null, null, 'page', 'dashboard'] }}>
       <HeadComponent
         title={`${
           addressInfo.isDelegate ? `${addressInfo.delegateInfo?.name} Delegate` : 'Address'
diff --git a/pages/api-docs/index.tsx b/pages/api-docs/index.tsx
index 993bfe6d5..914c5a18a 100644
--- a/pages/api-docs/index.tsx
+++ b/pages/api-docs/index.tsx
@@ -18,7 +18,7 @@ const ApiDoc = ({ spec }: InferGetStaticPropsType<typeof getStaticProps>): JSX.E
       </InternalLink>
     </Box>
   ) : (
-    <PrimaryLayout shortenFooter={true} sx={{ maxWidth: [null, null, null, 'page', 'dashboard'] }}>
+    <PrimaryLayout sx={{ maxWidth: [null, null, null, 'page', 'dashboard'] }}>
       <HeadComponent title="Account" />
       <SwaggerUI spec={spec} />
     </PrimaryLayout>
diff --git a/pages/delegates/index.tsx b/pages/delegates/index.tsx
index 94ca96601..4bcb7b12e 100644
--- a/pages/delegates/index.tsx
+++ b/pages/delegates/index.tsx
@@ -72,7 +72,7 @@ const Delegates = ({ delegates, stats }: Props) => {
     .sort(d => (isOwner(d) ? -1 : 0));
 
   return (
-    <PrimaryLayout shortenFooter={true} sx={{ maxWidth: [null, null, null, 'page', 'dashboard'] }}>
+    <PrimaryLayout sx={{ maxWidth: [null, null, null, 'page', 'dashboard'] }}>
       <HeadComponent
         title="Delegates"
         description="Vote delegation allows for MKR holders to delegate their voting power to delegates, which increases the effectiveness and efficiency of the governance process."
diff --git a/pages/esmodule.tsx b/pages/esmodule.tsx
index 15e39e447..bc7d5ab64 100644
--- a/pages/esmodule.tsx
+++ b/pages/esmodule.tsx
@@ -111,7 +111,7 @@ const ESModule = (): React.ReactElement => {
   };
 
   return (
-    <PrimaryLayout shortenFooter={true} sx={{ maxWidth: 'container' }}>
+    <PrimaryLayout sx={{ maxWidth: 'container' }}>
       <HeadComponent title="Emergency Shutdown Module" />
 
       <DialogOverlay
diff --git a/pages/executive.tsx b/pages/executive.tsx
index 810d41694..b9f002cb6 100644
--- a/pages/executive.tsx
+++ b/pages/executive.tsx
@@ -181,7 +181,7 @@ export const ExecutiveOverview = ({ proposals }: { proposals?: Proposal[] }): JS
     !voteDelegateContractAddress;
 
   return (
-    <PrimaryLayout shortenFooter={true} sx={{ maxWidth: [null, null, null, 'page', 'dashboard'] }}>
+    <PrimaryLayout sx={{ maxWidth: [null, null, null, 'page', 'dashboard'] }}>
       <HeadComponent title="Executive Proposals" />
 
       {lockedMkrOldChief && lockedMkrOldChief.gt(0) && (
diff --git a/pages/executive/[proposal-id].tsx b/pages/executive/[proposal-id].tsx
index cdab4712b..4abfb8f5d 100644
--- a/pages/executive/[proposal-id].tsx
+++ b/pages/executive/[proposal-id].tsx
@@ -118,7 +118,7 @@ const ProposalView = ({ proposal, spellDiffs }: Props): JSX.Element => {
     );
 
   return (
-    <PrimaryLayout shortenFooter={true} sx={{ maxWidth: 'dashboard' }}>
+    <PrimaryLayout sx={{ maxWidth: 'dashboard' }}>
       <HeadComponent
         title={`Proposal ${proposal['title'] ? proposal['title'] : proposal.address}`}
         description={`See the results of the MakerDAO executive proposal ${
@@ -434,7 +434,7 @@ export default function ProposalPage({
 
   if (!isDefaultNetwork(network) && !_proposal)
     return (
-      <PrimaryLayout shortenFooter={true}>
+      <PrimaryLayout>
         <p>Loading…</p>
       </PrimaryLayout>
     );
diff --git a/pages/executive/create.tsx b/pages/executive/create.tsx
index e359fde3c..9ab443f81 100644
--- a/pages/executive/create.tsx
+++ b/pages/executive/create.tsx
@@ -95,7 +95,7 @@ const ExecutiveCreate = (): JSX.Element => {
   );
 
   return (
-    <PrimaryLayout shortenFooter={true} sx={{ maxWidth: 'dashboard' }}>
+    <PrimaryLayout sx={{ maxWidth: 'dashboard' }}>
       <HeadComponent title="Validate Executive Proposal" />
 
       <Stack gap={3}>
diff --git a/pages/index.tsx b/pages/index.tsx
index 221c299d9..4c089581e 100644
--- a/pages/index.tsx
+++ b/pages/index.tsx
@@ -236,7 +236,7 @@ const LandingPage = ({
             </section>
             <Flex
               onClick={() => window.scrollTo({ top: 0, behavior: 'smooth' })}
-              sx={{ justifyContent: 'flex-end' }}
+              sx={{ justifyContent: 'flex-end', mb: 3 }}
             >
               <ViewMore label="Back to the top" icon="chevron_up" />
             </Flex>
@@ -292,7 +292,7 @@ export default function Index({
   }
 
   if (!isDefaultNetwork(network) && (!pollsData || !proposalsData || !delegatesData)) {
-    return <PageLoadingPlaceholder sidebar={false} shortenFooter={false} />;
+    return <PageLoadingPlaceholder sidebar={false} />;
   }
 
   return (
diff --git a/pages/polling.tsx b/pages/polling.tsx
index 035ba1884..2731d86ff 100644
--- a/pages/polling.tsx
+++ b/pages/polling.tsx
@@ -145,7 +145,7 @@ const PollingOverview = ({ polls, categories }: Props) => {
   }, [addressToCheck]);
 
   return (
-    <PrimaryLayout shortenFooter={true} sx={{ maxWidth: [null, null, null, 'page', 'dashboard'] }}>
+    <PrimaryLayout sx={{ maxWidth: [null, null, null, 'page', 'dashboard'] }}>
       <HeadComponent
         title="Polling"
         description={`Lastest poll: ${polls[0].title}. Active Polls: ${activePolls.length}. Total Polls: ${polls.length}. .`}
diff --git a/pages/polling/[poll-hash].tsx b/pages/polling/[poll-hash].tsx
index b791ba135..ab01ec82f 100644
--- a/pages/polling/[poll-hash].tsx
+++ b/pages/polling/[poll-hash].tsx
@@ -65,7 +65,7 @@ const PollView = ({ poll }: { poll: Poll }) => {
   const { comments, error: errorComments } = usePollComments(poll.pollId);
 
   return (
-    <PrimaryLayout shortenFooter={true} sx={{ maxWidth: 'dashboard' }}>
+    <PrimaryLayout sx={{ maxWidth: 'dashboard' }}>
       {bpi === 0 && account && isActivePoll(poll) && (
         <MobileVoteSheet setPoll={setMobileVotingPoll} poll={mobileVotingPoll} withStart />
       )}
@@ -358,7 +358,7 @@ export default function PollPage({ poll: prefetchedPoll }: { poll?: Poll }): JSX
 
   if (isFallback || (!isDefaultNetwork(network) && !_poll))
     return (
-      <PrimaryLayout shortenFooter={true}>
+      <PrimaryLayout>
         <p>Loading…</p>
       </PrimaryLayout>
     );
diff --git a/pages/polling/create.tsx b/pages/polling/create.tsx
index 64481c690..a5440f7dd 100644
--- a/pages/polling/create.tsx
+++ b/pages/polling/create.tsx
@@ -95,7 +95,7 @@ const PollingCreate = (): React.ReactElement => {
   };
 
   return (
-    <PrimaryLayout shortenFooter={true} sx={{ maxWidth: 'dashboard' }}>
+    <PrimaryLayout sx={{ maxWidth: 'dashboard' }}>
       <HeadComponent title="Create Poll" />
 
       <Stack gap={3}>
diff --git a/pages/polling/review.tsx b/pages/polling/review.tsx
index d027fb3aa..0279f72f2 100644
--- a/pages/polling/review.tsx
+++ b/pages/polling/review.tsx
@@ -153,7 +153,7 @@ const PollingReview = ({ polls }: { polls: Poll[] }) => {
   const hasVoted = previousVotesLength > 0 && ballotCount === 0;
 
   return (
-    <PrimaryLayout shortenFooter={true} sx={{ maxWidth: 'dashboard' }}>
+    <PrimaryLayout sx={{ maxWidth: 'dashboard' }}>
       <Stack gap={3}>
         {!hasVoted && (
           <Heading mb={3} as="h4">