diff --git a/package-lock.json b/package-lock.json
index 84b5833a6..198e0b07c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -27,6 +27,7 @@
         "ethers": "^5.7.1",
         "flickity": "^2.3.0",
         "gatsby": "^4.10.1",
+        "gatsby-link": "^4.23.0",
         "gatsby-plugin-image": "^2.10.0",
         "gatsby-plugin-manifest": "^4.10.1",
         "gatsby-plugin-offline": "^5.10.1",
diff --git a/package.json b/package.json
index 071150577..2ebc08814 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,8 @@
       "<rootDir>/src/"
     ],
     "moduleNameMapper": {
-      "\\.(css|less|sass|scss|gif|ttf|eot|svg)$": "<rootDir>/src/__mocks__/files.ts"
+      "\\.(css|less|sass|scss|gif|ttf|eot|svg)$": "<rootDir>/src/__mocks__/files.ts",
+      "^gatsby-page-utils/(.*)$": "gatsby-page-utils/dist/$1"
     }
   },
   "repository": {
@@ -64,6 +65,7 @@
     "ethers": "^5.7.1",
     "flickity": "^2.3.0",
     "gatsby": "^4.10.1",
+    "gatsby-link": "^4.23.0",
     "gatsby-plugin-image": "^2.10.0",
     "gatsby-plugin-manifest": "^4.10.1",
     "gatsby-plugin-offline": "^5.10.1",
diff --git a/src/components/Category/CategoryBanner.tsx b/src/components/Category/CategoryBanner.tsx
index b56d03330..748721409 100644
--- a/src/components/Category/CategoryBanner.tsx
+++ b/src/components/Category/CategoryBanner.tsx
@@ -4,10 +4,10 @@ import classNames from 'classnames'
 import Link from 'decentraland-gatsby/dist/components/Text/Link'
 import Markdown from 'decentraland-gatsby/dist/components/Text/Markdown'
 import Paragraph from 'decentraland-gatsby/dist/components/Text/Paragraph'
-import { navigate } from 'decentraland-gatsby/dist/plugins/intl'
 
 import { HiringType, PoiType, ProposalType, isHiringType } from '../../entities/Proposal/types'
 import useFormatMessage from '../../hooks/useFormatMessage'
+import { navigate } from '../../utils/locations'
 import AddPoi from '../Icon/ProposalCategories/AddPoi'
 import BanName from '../Icon/ProposalCategories/BanName'
 import Catalyst from '../Icon/ProposalCategories/Catalyst'
diff --git a/src/components/Category/CategoryOption.tsx b/src/components/Category/CategoryOption.tsx
index 276e3429b..95b8f8896 100644
--- a/src/components/Category/CategoryOption.tsx
+++ b/src/components/Category/CategoryOption.tsx
@@ -3,7 +3,6 @@ import React, { Fragment, useEffect, useMemo, useState } from 'react'
 import { useLocation } from '@reach/router'
 import classNames from 'classnames'
 import Paragraph from 'decentraland-gatsby/dist/components/Text/Paragraph'
-import { navigate } from 'decentraland-gatsby/dist/plugins/intl'
 import isNumber from 'lodash/isNumber'
 import toSnakeCase from 'lodash/snakeCase'
 
@@ -12,6 +11,7 @@ import { getNewGrantsCategoryIcon } from '../../entities/Grant/utils'
 import { ProposalType, toProposalType } from '../../entities/Proposal/types'
 import { CategoryIconVariant } from '../../helpers/styles'
 import useFormatMessage from '../../hooks/useFormatMessage'
+import { navigate } from '../../utils/locations'
 import Arrow from '../Icon/Arrow'
 import All from '../Icon/ProposalCategories/All'
 import Grant from '../Icon/ProposalCategories/Grant'
diff --git a/src/components/Category/CategoryPill.tsx b/src/components/Category/CategoryPill.tsx
index 2a02a3119..71b272b02 100644
--- a/src/components/Category/CategoryPill.tsx
+++ b/src/components/Category/CategoryPill.tsx
@@ -1,11 +1,11 @@
 import React from 'react'
 
-import { Link } from '@reach/router'
 import classNames from 'classnames'
 import { Mobile, NotMobile } from 'decentraland-ui/dist/components/Media/Media'
 
 import { ProposalType } from '../../entities/Proposal/types'
 import locations from '../../utils/locations'
+import Link from '../Common/Link'
 import Pill, { PillColor } from '../Common/Pill'
 
 const ColorsConfig: Record<ProposalType, PillColor> = {
@@ -45,14 +45,14 @@ const CategoryPill = ({ className, proposalType, size = 'default', isLink }: Pro
   return (
     <>
       <Mobile>
-        <Link to={href}>
+        <Link href={href}>
           <Pill style="light" color={colorsConfig} className={pillClassNames} size="small">
             {getProposalTypeShortLabel(proposalType)}
           </Pill>
         </Link>
       </Mobile>
       <NotMobile>
-        <Link to={href}>
+        <Link href={href}>
           <Pill style="light" color={colorsConfig} className={pillClassNames} size={size}>
             {getProposalTypeLabel(proposalType)}
           </Pill>
diff --git a/src/components/Common/Link.css b/src/components/Common/Link.css
new file mode 100644
index 000000000..8b496dae1
--- /dev/null
+++ b/src/components/Common/Link.css
@@ -0,0 +1,14 @@
+.Link {
+  font-size: inherit;
+  line-height: inherit;
+  color: var(--primary);
+}
+
+.Link.Link--pointer {
+  cursor: pointer;
+}
+
+.Link .icon {
+  font-size: 19px;
+  vertical-align: middle;
+}
diff --git a/src/components/Common/Link.tsx b/src/components/Common/Link.tsx
new file mode 100644
index 000000000..4462b2264
--- /dev/null
+++ b/src/components/Common/Link.tsx
@@ -0,0 +1,38 @@
+import React, { useCallback, useMemo } from 'react'
+
+import classNames from 'classnames'
+
+import { isLocalLink, navigate } from '../../utils/locations'
+
+import './Link.css'
+
+export type LinkProps = React.AnchorHTMLAttributes<HTMLAnchorElement>
+
+export default React.memo(function Link({ target, rel, href, onClick, ...props }: LinkProps) {
+  const isLocal = useMemo(() => isLocalLink(href), [href])
+  const linkTarget = useMemo(() => (!target && !isLocal ? '_blank' : target || undefined), [isLocal, target])
+  const linkRel = useMemo(() => (!isLocal ? classNames(rel, 'noopener', 'noreferrer') : rel), [isLocal, rel])
+  const onClickHandler = useCallback(
+    (e: React.MouseEvent<HTMLAnchorElement>) => {
+      if (onClick) {
+        onClick(e)
+      }
+      if (isLocal && href) {
+        e.preventDefault()
+        navigate(href)
+      }
+    },
+    [href, isLocal, onClick]
+  )
+
+  return (
+    <a
+      {...props}
+      className={classNames('Link', (onClick || href) && 'Link--pointer', props.className)}
+      target={linkTarget}
+      rel={linkRel}
+      href={href}
+      onClick={onClickHandler}
+    />
+  )
+})
diff --git a/src/components/Common/LinkWithTitle.tsx b/src/components/Common/LinkWithTitle.tsx
index 4ab20c16a..0d5e52d89 100644
--- a/src/components/Common/LinkWithTitle.tsx
+++ b/src/components/Common/LinkWithTitle.tsx
@@ -19,6 +19,7 @@ const fetchTitle = async (url: string) => {
     return response.title || ''
   } catch (error) {
     console.error(error)
+    return ''
   }
 }
 
diff --git a/src/components/Delegation/DelegatorCardProfile.tsx b/src/components/Delegation/DelegatorCardProfile.tsx
index 99a95ce64..7d3b46d3b 100644
--- a/src/components/Delegation/DelegatorCardProfile.tsx
+++ b/src/components/Delegation/DelegatorCardProfile.tsx
@@ -1,10 +1,9 @@
 import React from 'react'
 import { useIntl } from 'react-intl'
 
-import { Link } from '@reach/router'
-
 import useFormatMessage from '../../hooks/useFormatMessage'
 import locations from '../../utils/locations'
+import Link from '../Common/Link'
 import ChevronRightCircleOutline from '../Icon/ChevronRightCircleOutline'
 import Username from '../User/Username'
 
@@ -20,7 +19,7 @@ function DelegatorCardProfile({ address, vp }: Props) {
   const intl = useIntl()
 
   return (
-    <Link className="DelegatorCardProfile" to={locations.profile({ address })}>
+    <Link className="DelegatorCardProfile" href={locations.profile({ address })}>
       <div className="DelegatorCardProfile__Section">
         <Username className="DelegatorCardProfile__Avatar" address={address} variant="avatar" size="medium" />
         <div>
diff --git a/src/components/GrantRequest/GrantRequestSectionCard.tsx b/src/components/GrantRequest/GrantRequestSectionCard.tsx
index ca5433b57..91e6e5470 100644
--- a/src/components/GrantRequest/GrantRequestSectionCard.tsx
+++ b/src/components/GrantRequest/GrantRequestSectionCard.tsx
@@ -1,9 +1,9 @@
 import React from 'react'
 import Skeleton from 'react-loading-skeleton'
 
-import { Link } from '@reach/router'
 import classNames from 'classnames'
 
+import Link from '../Common/Link'
 import ExclamationCircle from '../Icon/ExclamationCircle'
 
 import './GrantRequestSectionCard.css'
@@ -35,7 +35,7 @@ export const GrantRequestSectionCard = ({
         error && 'GrantRequestSectionCard__Error',
         href && 'GrantRequestSectionCard__Hoverable'
       )}
-      to={href || ''}
+      href={href || ''}
     >
       <div className="GrantRequestSectionCard__Header">
         <div className="GrantRequestSectionCard__HeaderTitle">
diff --git a/src/components/Grants/GrantBeneficiaryItem.tsx b/src/components/Grants/GrantBeneficiaryItem.tsx
index 53cb47c89..c27621029 100644
--- a/src/components/Grants/GrantBeneficiaryItem.tsx
+++ b/src/components/Grants/GrantBeneficiaryItem.tsx
@@ -1,7 +1,6 @@
 import React from 'react'
 import { useIntl } from 'react-intl'
 
-import { Link } from '@reach/router'
 import Markdown from 'decentraland-gatsby/dist/components/Text/Markdown'
 import { Card } from 'decentraland-ui/dist/components/Card/Card'
 import { Mobile, NotMobile } from 'decentraland-ui/dist/components/Media/Media'
@@ -12,6 +11,7 @@ import { isProposalInCliffPeriod } from '../../entities/Proposal/utils'
 import useFormatMessage from '../../hooks/useFormatMessage'
 import { abbreviateTimeDifference, formatDate } from '../../utils/date/Time'
 import locations from '../../utils/locations'
+import Link from '../Common/Link'
 import ChevronRightCircleOutline from '../Icon/ChevronRightCircleOutline'
 import Username from '../User/Username'
 
diff --git a/src/components/Grants/GrantCard/GrantCard.tsx b/src/components/Grants/GrantCard/GrantCard.tsx
index fc0fd96b4..b3f0e84c5 100644
--- a/src/components/Grants/GrantCard/GrantCard.tsx
+++ b/src/components/Grants/GrantCard/GrantCard.tsx
@@ -1,11 +1,11 @@
 import React, { useState } from 'react'
 
-import { Link } from '@reach/router'
 import classNames from 'classnames'
 
 import { GrantWithUpdate } from '../../../entities/Proposal/types'
 import { isProposalInCliffPeriod } from '../../../entities/Proposal/utils'
 import locations from '../../../utils/locations'
+import Link from '../../Common/Link'
 import ProposalUpdate from '../../Proposal/Update/ProposalUpdate'
 
 import CliffProgress from './CliffProgress'
@@ -26,7 +26,7 @@ const GrantCard = ({ grant, hoverable = false }: Props) => {
 
   return (
     <Link
-      to={locations.proposal(id)}
+      href={locations.proposal(id)}
       onMouseEnter={() => hoverable && setExpanded(true)}
       onMouseLeave={() => hoverable && setExpanded(false)}
       className={classNames('GrantCard', hoverable && 'GrantCard__Expanded')}
diff --git a/src/components/Grants/GrantsPastItem.tsx b/src/components/Grants/GrantsPastItem.tsx
index 6c663fbcf..44cc45f4a 100644
--- a/src/components/Grants/GrantsPastItem.tsx
+++ b/src/components/Grants/GrantsPastItem.tsx
@@ -1,13 +1,12 @@
 import React, { useCallback } from 'react'
 
-import { navigate } from 'decentraland-gatsby/dist/plugins/intl'
 import { Table } from 'decentraland-ui/dist/components/Table/Table'
 
 import { ProposalGrantCategory } from '../../entities/Grant/types'
 import { Grant } from '../../entities/Proposal/types'
 import useFormatMessage from '../../hooks/useFormatMessage'
 import Time from '../../utils/date/Time'
-import locations from '../../utils/locations'
+import locations, { navigate } from '../../utils/locations'
 import ChevronRight from '../Icon/ChevronRight'
 
 import GrantPill from './GrantPill'
diff --git a/src/components/Grants/RequestBanner.tsx b/src/components/Grants/RequestBanner.tsx
index a652fefec..b5ffa3e31 100644
--- a/src/components/Grants/RequestBanner.tsx
+++ b/src/components/Grants/RequestBanner.tsx
@@ -1,11 +1,10 @@
 import React from 'react'
 
-import { navigate } from 'decentraland-gatsby/dist/plugins/intl/utils'
 import { Button } from 'decentraland-ui/dist/components/Button/Button'
 
 import { ProposalType } from '../../entities/Proposal/types'
 import useFormatMessage from '../../hooks/useFormatMessage'
-import locations from '../../utils/locations'
+import locations, { navigate } from '../../utils/locations'
 
 import './RequestBanner.css'
 
diff --git a/src/components/Home/MainBanner.tsx b/src/components/Home/MainBanner.tsx
index 7ece28655..b05a72436 100644
--- a/src/components/Home/MainBanner.tsx
+++ b/src/components/Home/MainBanner.tsx
@@ -1,10 +1,10 @@
 import React, { useEffect, useState } from 'react'
 
-import { Link } from '@reach/router'
 import { Button } from 'decentraland-ui/dist/components/Button/Button'
 
 import { DAO_DISCORD_URL, DOCS_URL } from '../../constants'
 import useFormatMessage from '../../hooks/useFormatMessage'
+import Link from '../Common/Link'
 import CloseCircle from '../Icon/CloseCircle'
 
 import './MainBanner.css'
@@ -40,10 +40,10 @@ const MainBanner = () => {
       <h2 className="MainBanner__Title">{t('page.home.main_banner.title')}</h2>
       <p className="MainBanner__Description">{t('page.home.main_banner.description')}</p>
       <div className="MainBanner__ButtonsContainer">
-        <Button as={Link} to={DAO_DISCORD_URL} className="MainBanner__Button MainBanner__DiscordButton">
+        <Button as={Link} href={DAO_DISCORD_URL} className="MainBanner__Button MainBanner__DiscordButton">
           {t('page.home.main_banner.discord_button')}
         </Button>
-        <Button as={Link} to={DOCS_URL} className="MainBanner__Button MainBanner__DocsButton">
+        <Button as={Link} href={DOCS_URL} className="MainBanner__Button MainBanner__DocsButton">
           {t('page.home.main_banner.docs_button')}
         </Button>
       </div>
diff --git a/src/components/Home/MetricsCard.tsx b/src/components/Home/MetricsCard.tsx
index b4becc157..96a1429f0 100644
--- a/src/components/Home/MetricsCard.tsx
+++ b/src/components/Home/MetricsCard.tsx
@@ -1,8 +1,9 @@
 import React from 'react'
 
-import { Link } from '@reach/router'
 import { Card } from 'decentraland-ui/dist/components/Card/Card'
 
+import Link from '../Common/Link'
+
 import HomeLoader from './HomeLoader'
 import './MetricsCard.css'
 
@@ -17,7 +18,7 @@ interface Props {
 
 const MetricsCard = ({ href, category, title, description, isLoading, loadingLabel }: Props) => {
   return (
-    <Card as={Link} to={href} className="MetricsCard">
+    <Card as={Link} href={href} className="MetricsCard">
       {!isLoading && (
         <div className="MetricsCard__Container">
           <p className="MetricsCard__Category">{category}</p>
diff --git a/src/components/Home/OpenProposal.tsx b/src/components/Home/OpenProposal.tsx
index 01b6190ac..8bd9dd69c 100644
--- a/src/components/Home/OpenProposal.tsx
+++ b/src/components/Home/OpenProposal.tsx
@@ -1,6 +1,5 @@
 import React, { useMemo } from 'react'
 
-import { Link } from '@reach/router'
 import useAuthContext from 'decentraland-gatsby/dist/context/Auth/useAuthContext'
 import { Mobile } from 'decentraland-ui/dist/components/Media/Media'
 import isEmpty from 'lodash/isEmpty'
@@ -13,6 +12,7 @@ import useProposalVotes from '../../hooks/useProposalVotes'
 import Time from '../../utils/date/Time'
 import locations from '../../utils/locations'
 import CategoryPill from '../Category/CategoryPill'
+import Link from '../Common/Link'
 import ChevronRight from '../Icon/ChevronRight'
 import Username from '../User/Username'
 
@@ -51,7 +51,7 @@ const OpenProposal = ({ proposal }: Props) => {
   })
 
   return (
-    <Link className="OpenProposal" to={locations.proposal(proposal.id)}>
+    <Link className="OpenProposal" href={locations.proposal(proposal.id)}>
       <div className="OpenProposal__Section">
         <Username className="OpenProposal__Avatar" address={user} variant="avatar" size="medium" />
         <div>
diff --git a/src/components/Layout/BurgerMenu/MobileNavigation.tsx b/src/components/Layout/BurgerMenu/MobileNavigation.tsx
index a6e9213f4..b461ddb73 100644
--- a/src/components/Layout/BurgerMenu/MobileNavigation.tsx
+++ b/src/components/Layout/BurgerMenu/MobileNavigation.tsx
@@ -1,13 +1,12 @@
 import React from 'react'
 
 import Link from 'decentraland-gatsby/dist/components/Text/Link'
-import { navigate } from 'decentraland-gatsby/dist/plugins/intl'
 import prevent from 'decentraland-gatsby/dist/utils/react/prevent'
 import { Button } from 'decentraland-ui/dist/components/Button/Button'
 import { Header } from 'decentraland-ui/dist/components/Header/Header'
 
 import useFormatMessage from '../../../hooks/useFormatMessage'
-import locations from '../../../utils/locations'
+import locations, { navigate } from '../../../utils/locations'
 import { NavigationProps, NavigationTab } from '../Navigation'
 
 import './MobileNavigation.css'
diff --git a/src/components/Layout/ContentLayout.tsx b/src/components/Layout/ContentLayout.tsx
index 4fa8c7c17..2000df389 100644
--- a/src/components/Layout/ContentLayout.tsx
+++ b/src/components/Layout/ContentLayout.tsx
@@ -1,12 +1,11 @@
 import React from 'react'
 
 import classNames from 'classnames'
-import { navigate } from 'decentraland-gatsby/dist/plugins/intl'
 import { Back } from 'decentraland-ui/dist/components/Back/Back'
 import { Container } from 'decentraland-ui/dist/components/Container/Container'
 
 import usePreventNavigation from '../../hooks/usePreventNavigation'
-import locations from '../../utils/locations'
+import locations, { navigate } from '../../utils/locations'
 
 import './ContentLayout.css'
 
diff --git a/src/components/Layout/Layout.tsx b/src/components/Layout/Layout.tsx
index 1feeaade1..7f61eafcd 100644
--- a/src/components/Layout/Layout.tsx
+++ b/src/components/Layout/Layout.tsx
@@ -4,7 +4,6 @@ import { ChainId } from '@dcl/schemas/dist/dapps/chain-id'
 // import WalletSelectorModal from 'decentraland-gatsby/dist/components/Modal/WalletSelectorModal'
 // import WrongNetworkModal from 'decentraland-gatsby/dist/components/Modal/WrongNetworkModal'
 import useAuthContext from 'decentraland-gatsby/dist/context/Auth/useAuthContext'
-import { DecentralandIntlContext } from 'decentraland-gatsby/dist/plugins/intl/types'
 import env from 'decentraland-gatsby/dist/utils/env'
 import { Footer } from 'decentraland-ui/dist/components/Footer/Footer'
 import { Locale } from 'decentraland-ui/dist/components/LanguageIcon/LanguageIcon'
@@ -25,15 +24,10 @@ export function getSupportedChainIds(): ChainId[] {
 
 export type LayoutProps = Omit<PageProps, 'children'> & {
   rightMenu: NavbarProps['rightMenu']
-  pageContext?: {
-    intl?: DecentralandIntlContext
-  }
   children?: React.ReactNode
 }
 
-export default function Layout({ children, pageContext, ...props }: LayoutProps) {
-  const locale = pageContext?.intl?.locale || 'en'
-  const locales = pageContext?.intl?.locales || ['en']
+export default function Layout({ children, ...props }: LayoutProps) {
   const [, state] = useAuthContext()
 
   const handleChangeLocal = function (_: React.SyntheticEvent<HTMLElement>, data: DropdownProps) {
@@ -70,12 +64,7 @@ export default function Layout({ children, pageContext, ...props }: LayoutProps)
         onConnect={(providerType, chainId) => state.connect(providerType, chainId)}
         onClose={() => state.select(false)}
       /> */}
-      <Footer
-        locale={locale as Locale}
-        locales={locales as Locale[]}
-        isFullWidth={false}
-        onChange={handleChangeLocal}
-      />
+      <Footer locale="en" locales={['en']} isFullWidth={false} onChange={handleChangeLocal} />
     </>
   )
 }
diff --git a/src/components/Layout/Navigation.tsx b/src/components/Layout/Navigation.tsx
index 474c34142..494fb3e10 100644
--- a/src/components/Layout/Navigation.tsx
+++ b/src/components/Layout/Navigation.tsx
@@ -1,6 +1,5 @@
 import React, { useEffect, useState } from 'react'
 
-import { Link } from '@reach/router'
 import useAuthContext from 'decentraland-gatsby/dist/context/Auth/useAuthContext'
 import { Button } from 'decentraland-ui/dist/components/Button/Button'
 import { Popup } from 'decentraland-ui/dist/components/Popup/Popup'
@@ -10,6 +9,7 @@ import useFormatMessage from '../../hooks/useFormatMessage'
 import useIsDebugAddress from '../../hooks/useIsDebugAddress'
 import useIsProfileValidated from '../../hooks/useIsProfileValidated'
 import locations from '../../utils/locations'
+import Link from '../Common/Link'
 import Dot from '../Icon/Dot'
 import SearchInput from '../Search/SearchInput'
 
@@ -66,17 +66,17 @@ const Navigation = ({ activeTab }: NavigationProps) => {
     <div className="Navigation">
       <Tabs>
         <Tabs.Left>
-          <Link to={locations.home()}>
+          <Link href={locations.home()}>
             <Tabs.Tab active={activeTab === NavigationTab.Home}>{t('navigation.home')}</Tabs.Tab>
           </Link>
-          <Link to={locations.proposals()}>
+          <Link href={locations.proposals()}>
             <Tabs.Tab active={activeTab === NavigationTab.Proposals}>{t('navigation.proposals')}</Tabs.Tab>
           </Link>
-          <Link to={locations.grants()}>
+          <Link href={locations.grants()}>
             <Tabs.Tab active={activeTab === NavigationTab.Grants}>{t('navigation.grants')}</Tabs.Tab>
           </Link>
           {user && (
-            <Link to={locations.profile({ address: user })}>
+            <Link href={locations.profile({ address: user })}>
               <Popup
                 style={{ zIndex: 1000 }}
                 className="NavigationProfilePopUp"
@@ -105,11 +105,11 @@ const Navigation = ({ activeTab }: NavigationProps) => {
               />
             </Link>
           )}
-          <Link to={locations.transparency()}>
+          <Link href={locations.transparency()}>
             <Tabs.Tab active={activeTab === NavigationTab.Transparency}>{t('navigation.transparency')}</Tabs.Tab>
           </Link>
           {user && isDebugAddress && (
-            <Link to={locations.debug()}>
+            <Link href={locations.debug()}>
               <Tabs.Tab active={activeTab === NavigationTab.Debug}>{t('navigation.debug')}</Tabs.Tab>
             </Link>
           )}
diff --git a/src/components/Modal/Votes/VoteListItem.tsx b/src/components/Modal/Votes/VoteListItem.tsx
index b4a9bf110..02760978e 100644
--- a/src/components/Modal/Votes/VoteListItem.tsx
+++ b/src/components/Modal/Votes/VoteListItem.tsx
@@ -1,13 +1,12 @@
 import React from 'react'
 
 import classNames from 'classnames'
-import { navigate } from 'decentraland-gatsby/dist/plugins/intl'
 import Grid from 'semantic-ui-react/dist/commonjs/collections/Grid/Grid'
 
 import { Vote } from '../../../entities/Votes/types'
 import { abbreviateNumber } from '../../../entities/Votes/utils'
 import useFormatMessage from '../../../hooks/useFormatMessage'
-import locations from '../../../utils/locations'
+import locations, { navigate } from '../../../utils/locations'
 import { formatChoice } from '../../../utils/votes/utils'
 import Username from '../../User/Username'
 
diff --git a/src/components/Modal/Votes/VotingModal/VotingModalSurvey.tsx b/src/components/Modal/Votes/VotingModal/VotingModalSurvey.tsx
index babb95c9a..770288638 100644
--- a/src/components/Modal/Votes/VotingModal/VotingModalSurvey.tsx
+++ b/src/components/Modal/Votes/VotingModal/VotingModalSurvey.tsx
@@ -1,6 +1,5 @@
 import React, { useMemo, useState } from 'react'
 
-import { Link } from '@reach/router'
 import classNames from 'classnames'
 import Paragraph from 'decentraland-gatsby/dist/components/Text/Paragraph'
 import { Button } from 'decentraland-ui/dist/components/Button/Button'
@@ -12,6 +11,7 @@ import { SelectedVoteChoice } from '../../../../entities/Votes/types'
 import useFormatMessage from '../../../../hooks/useFormatMessage'
 import { ProposalPageState } from '../../../../pages/proposal'
 import { formatChoice } from '../../../../utils/votes/utils'
+import Link from '../../../Common/Link'
 import SentimentSurvey from '../../../Proposal/SentimentSurvey/SentimentSurvey'
 import '../../ProposalModal.css'
 
diff --git a/src/components/Profile/ProposalCreatedItem.tsx b/src/components/Profile/ProposalCreatedItem.tsx
index 1fe56b3c2..d81cf8276 100644
--- a/src/components/Profile/ProposalCreatedItem.tsx
+++ b/src/components/Profile/ProposalCreatedItem.tsx
@@ -1,6 +1,5 @@
 import React from 'react'
 
-import { Link } from '@reach/router'
 import { Card } from 'decentraland-ui/dist/components/Card/Card'
 import { Header } from 'decentraland-ui/dist/components/Header/Header'
 import { Mobile, NotMobile } from 'decentraland-ui/dist/components/Media/Media'
@@ -12,6 +11,7 @@ import useProposalVotes from '../../hooks/useProposalVotes'
 import { abbreviateTimeDifference } from '../../utils/date/Time'
 import locations from '../../utils/locations'
 import CategoryPill from '../Category/CategoryPill'
+import Link from '../Common/Link'
 import ChevronRightCircleOutline from '../Icon/ChevronRightCircleOutline'
 import StatusPill from '../Status/StatusPill'
 
diff --git a/src/components/Proposal/Comments/ProposalComment.tsx b/src/components/Proposal/Comments/ProposalComment.tsx
index 2cb276f9f..0b747303d 100644
--- a/src/components/Proposal/Comments/ProposalComment.tsx
+++ b/src/components/Proposal/Comments/ProposalComment.tsx
@@ -1,6 +1,5 @@
 import React from 'react'
 
-import { Link } from '@reach/router'
 import Paragraph from 'decentraland-gatsby/dist/components/Text/Paragraph'
 import Avatar from 'decentraland-gatsby/dist/components/User/Avatar'
 import DOMPurify from 'dompurify'
@@ -9,6 +8,7 @@ import isEthereumAddress from 'validator/lib/isEthereumAddress'
 import { getUserProfileUrl } from '../../../entities/User/utils'
 import useProfile from '../../../hooks/useProfile'
 import Time from '../../../utils/date/Time'
+import Link from '../../Common/Link'
 import ValidatedProfile from '../../Icon/ValidatedProfile'
 
 import './ProposalComment.css'
@@ -49,13 +49,13 @@ export default function ProposalComment({ user, avatarUrl, createdAt, cooked, ad
   return (
     <div className="ProposalComment">
       <div className="ProposalComment__ProfileImage">
-        <Link to={discourseUserUrl} target={linkTarget} rel={linkRel}>
+        <Link href={discourseUserUrl} target={linkTarget} rel={linkRel}>
           {address ? <Avatar address={address} size="medium" /> : <Avatar size="medium" src={avatarUrl} />}
         </Link>
       </div>
       <div className="ProposalComment__Content">
         <div className="ProposalComment__Author">
-          <Link to={discourseUserUrl} target={linkTarget} rel={linkRel}>
+          <Link href={discourseUserUrl} target={linkTarget} rel={linkRel}>
             <Paragraph bold>
               {displayableAddress && !isEthereumAddress(displayableAddress) ? displayableAddress : user}
               {address && <ValidatedProfile />}
diff --git a/src/components/Proposal/ProfileProposalItem.tsx b/src/components/Proposal/ProfileProposalItem.tsx
index 923025f6c..075392715 100644
--- a/src/components/Proposal/ProfileProposalItem.tsx
+++ b/src/components/Proposal/ProfileProposalItem.tsx
@@ -1,6 +1,5 @@
 import React from 'react'
 
-import { Link } from '@reach/router'
 import { Card } from 'decentraland-ui/dist/components/Card/Card'
 import { Header } from 'decentraland-ui/dist/components/Header/Header'
 import { Mobile, NotMobile } from 'decentraland-ui/dist/components/Media/Media'
@@ -10,6 +9,7 @@ import useFormatMessage from '../../hooks/useFormatMessage'
 import Time from '../../utils/date/Time'
 import locations from '../../utils/locations'
 import CategoryPill from '../Category/CategoryPill'
+import Link from '../Common/Link'
 import ChevronRightCircleOutline from '../Icon/ChevronRightCircleOutline'
 import StatusPill from '../Status/StatusPill'
 
diff --git a/src/components/Proposal/ProposalItem.tsx b/src/components/Proposal/ProposalItem.tsx
index 4172b5796..e1d606a51 100644
--- a/src/components/Proposal/ProposalItem.tsx
+++ b/src/components/Proposal/ProposalItem.tsx
@@ -1,6 +1,5 @@
 import React, { useMemo } from 'react'
 
-import { Link } from '@reach/router'
 import classNames from 'classnames'
 import useAuthContext from 'decentraland-gatsby/dist/context/Auth/useAuthContext'
 import { Button } from 'decentraland-ui/dist/components/Button/Button'
@@ -14,6 +13,7 @@ import { calculateResultWinner } from '../../entities/Votes/utils'
 import useFormatMessage from '../../hooks/useFormatMessage'
 import locations from '../../utils/locations'
 import CategoryPill from '../Category/CategoryPill'
+import Link from '../Common/Link'
 import Subscribe from '../Icon/Subscribe'
 import Subscribed from '../Icon/Subscribed'
 import CoauthorRequestLabel from '../Status/CoauthorRequestLabel'
diff --git a/src/components/Proposal/Submit/ProposalSubmitHiringPage.tsx b/src/components/Proposal/Submit/ProposalSubmitHiringPage.tsx
index aa6e8e4d8..ab804bb47 100644
--- a/src/components/Proposal/Submit/ProposalSubmitHiringPage.tsx
+++ b/src/components/Proposal/Submit/ProposalSubmitHiringPage.tsx
@@ -7,7 +7,6 @@ import Label from 'decentraland-gatsby/dist/components/Form/Label'
 import Head from 'decentraland-gatsby/dist/components/Head/Head'
 import Paragraph from 'decentraland-gatsby/dist/components/Text/Paragraph'
 import useAuthContext from 'decentraland-gatsby/dist/context/Auth/useAuthContext'
-import { navigate } from 'decentraland-gatsby/dist/plugins/intl'
 import type { DropdownItemProps } from 'decentraland-ui'
 import { Button } from 'decentraland-ui/dist/components/Button/Button'
 import { Dropdown } from 'decentraland-ui/dist/components/Dropdown/Dropdown'
@@ -25,7 +24,7 @@ import {
 } from '../../../entities/Proposal/types'
 import useFormatMessage from '../../../hooks/useFormatMessage'
 import useVotingPowerDistribution from '../../../hooks/useVotingPowerDistribution'
-import locations from '../../../utils/locations'
+import locations, { navigate } from '../../../utils/locations'
 import Field from '../../Common/Form/Field'
 import MarkdownField from '../../Common/Form/MarkdownField'
 import SubLabel from '../../Common/SubLabel'
diff --git a/src/components/Proposal/Submit/ProposalSubmitPoiPage.tsx b/src/components/Proposal/Submit/ProposalSubmitPoiPage.tsx
index b8fd962f8..f29463964 100644
--- a/src/components/Proposal/Submit/ProposalSubmitPoiPage.tsx
+++ b/src/components/Proposal/Submit/ProposalSubmitPoiPage.tsx
@@ -6,7 +6,6 @@ import Label from 'decentraland-gatsby/dist/components/Form/Label'
 import Head from 'decentraland-gatsby/dist/components/Head/Head'
 import Paragraph from 'decentraland-gatsby/dist/components/Text/Paragraph'
 import useAuthContext from 'decentraland-gatsby/dist/context/Auth/useAuthContext'
-import { navigate } from 'decentraland-gatsby/dist/plugins/intl'
 import { Button } from 'decentraland-ui/dist/components/Button/Button'
 import { Header } from 'decentraland-ui/dist/components/Header/Header'
 
@@ -15,7 +14,7 @@ import { PoiType, getPoiTypeAction, newProposalPOIScheme } from '../../../entiti
 import { asNumber, isAlreadyPointOfInterest, isValidPointOfInterest } from '../../../entities/Proposal/utils'
 import { disableOnWheelInput } from '../../../helpers'
 import useFormatMessage from '../../../hooks/useFormatMessage'
-import locations from '../../../utils/locations'
+import locations, { navigate } from '../../../utils/locations'
 import Field from '../../Common/Form/Field'
 import MarkdownField from '../../Common/Form/MarkdownField'
 import ErrorMessage from '../../Error/ErrorMessage'
diff --git a/src/components/Proposal/Update/CollapsedProposalUpdate.tsx b/src/components/Proposal/Update/CollapsedProposalUpdate.tsx
index ad40e372e..c0240912f 100644
--- a/src/components/Proposal/Update/CollapsedProposalUpdate.tsx
+++ b/src/components/Proposal/Update/CollapsedProposalUpdate.tsx
@@ -2,7 +2,6 @@ import React, { useCallback } from 'react'
 
 import classNames from 'classnames'
 import useAuth from 'decentraland-gatsby/dist/hooks/useAuth'
-import { Link, navigate } from 'decentraland-gatsby/dist/plugins/intl'
 import { Button } from 'decentraland-ui/dist/components/Button/Button'
 import Icon from 'semantic-ui-react/dist/commonjs/elements/Icon'
 
@@ -11,8 +10,9 @@ import { UpdateAttributes, UpdateStatus } from '../../../entities/Updates/types'
 import { isBetweenLateThresholdDate } from '../../../entities/Updates/utils'
 import useFormatMessage from '../../../hooks/useFormatMessage'
 import { formatDate } from '../../../utils/date/Time'
-import locations from '../../../utils/locations'
+import locations, { navigate } from '../../../utils/locations'
 import DateTooltip from '../../Common/DateTooltip'
+import Link from '../../Common/Link'
 
 import { getStatusIcon } from './ProposalUpdate'
 import './ProposalUpdate.css'
diff --git a/src/components/Proposal/Update/ProposalUpdate.tsx b/src/components/Proposal/Update/ProposalUpdate.tsx
index 671c8e593..804b6d087 100644
--- a/src/components/Proposal/Update/ProposalUpdate.tsx
+++ b/src/components/Proposal/Update/ProposalUpdate.tsx
@@ -1,13 +1,12 @@
 import React, { useState } from 'react'
 
 import useAuth from 'decentraland-gatsby/dist/hooks/useAuth'
-import { navigate } from 'decentraland-gatsby/dist/plugins/intl'
 
 import { Governance } from '../../../clients/Governance'
 import { Grant, ProposalAttributes } from '../../../entities/Proposal/types'
 import { isSameAddress } from '../../../entities/Snapshot/utils'
 import { ProjectHealth, UpdateAttributes } from '../../../entities/Updates/types'
-import locations from '../../../utils/locations'
+import locations, { navigate } from '../../../utils/locations'
 import CancelIcon from '../../Icon/Cancel'
 import CheckCircleIcon from '../../Icon/CheckCircle'
 import QuestionCircleIcon from '../../Icon/QuestionCircle'
diff --git a/src/components/Proposal/View/ProposalCard.tsx b/src/components/Proposal/View/ProposalCard.tsx
index bfaaf99c0..a13683384 100644
--- a/src/components/Proposal/View/ProposalCard.tsx
+++ b/src/components/Proposal/View/ProposalCard.tsx
@@ -1,6 +1,5 @@
 import React from 'react'
 
-import { Link } from '@reach/router'
 import classNames from 'classnames'
 
 import { ProposalAttributes } from '../../../entities/Proposal/types'
@@ -8,6 +7,7 @@ import useFormatMessage from '../../../hooks/useFormatMessage'
 import { useProposalDateText } from '../../../hooks/useProposalDateText'
 import useProposalVotes from '../../../hooks/useProposalVotes'
 import locations from '../../../utils/locations'
+import Link from '../../Common/Link'
 import ChevronRight from '../../Icon/ChevronRight'
 import Username from '../../User/Username'
 
@@ -31,7 +31,7 @@ export default function ProposalCard({ proposal, highlight, isOverBudget }: Prop
         'ProposalCard',
         highlight && (isOverBudget ? 'ProposalCard--overbudget' : 'ProposalCard--highlight')
       )}
-      to={locations.proposal(id)}
+      href={locations.proposal(id)}
     >
       <div className="ProposalCard__Container">
         <span className="ProposalCard__Title">{title}</span>
diff --git a/src/components/Proposal/View/ProposalPromotionSection.tsx b/src/components/Proposal/View/ProposalPromotionSection.tsx
index 847b6e136..4be8dafc7 100644
--- a/src/components/Proposal/View/ProposalPromotionSection.tsx
+++ b/src/components/Proposal/View/ProposalPromotionSection.tsx
@@ -1,13 +1,12 @@
 import React from 'react'
 
 import Markdown from 'decentraland-gatsby/dist/components/Text/Markdown'
-import { navigate } from 'decentraland-gatsby/dist/plugins/intl'
 import { Button } from 'decentraland-ui/dist/components/Button/Button'
 
 import { ProposalAttributes, ProposalType } from '../../../entities/Proposal/types'
 import useFormatMessage from '../../../hooks/useFormatMessage'
 import { useTenderProposals } from '../../../hooks/useTenderProposals'
-import locations from '../../../utils/locations'
+import locations, { navigate } from '../../../utils/locations'
 import Pill from '../../Common/Pill'
 
 import './ProposalPromotionSection.css'
diff --git a/src/components/Proposal/View/ProposalUpdatesActions.tsx b/src/components/Proposal/View/ProposalUpdatesActions.tsx
index 99672970d..bc2af41a9 100644
--- a/src/components/Proposal/View/ProposalUpdatesActions.tsx
+++ b/src/components/Proposal/View/ProposalUpdatesActions.tsx
@@ -1,14 +1,13 @@
 import React, { useCallback } from 'react'
 
 import Markdown from 'decentraland-gatsby/dist/components/Text/Markdown'
-import { navigate } from 'decentraland-gatsby/dist/plugins/intl'
 import { Button } from 'decentraland-ui/dist/components/Button/Button'
 
 import { ProposalAttributes } from '../../../entities/Proposal/types'
 import { UpdateAttributes, UpdateStatus } from '../../../entities/Updates/types'
 import useFormatMessage from '../../../hooks/useFormatMessage'
 import Time from '../../../utils/date/Time'
-import locations from '../../../utils/locations'
+import locations, { navigate } from '../../../utils/locations'
 import DateTooltip from '../../Common/DateTooltip'
 import Helper from '../../Helper/Helper'
 
diff --git a/src/components/Proposal/View/ProposalVoting/ChangeVoteButton.tsx b/src/components/Proposal/View/ProposalVoting/ChangeVoteButton.tsx
index 9bd5ace9d..402d725d7 100644
--- a/src/components/Proposal/View/ProposalVoting/ChangeVoteButton.tsx
+++ b/src/components/Proposal/View/ProposalVoting/ChangeVoteButton.tsx
@@ -1,10 +1,10 @@
 import React, { useCallback } from 'react'
 
-import { Link } from '@reach/router'
 import { Button } from 'decentraland-ui/dist/components/Button/Button'
 
 import { Vote } from '../../../../entities/Votes/types'
 import useFormatMessage from '../../../../hooks/useFormatMessage'
+import Link from '../../../Common/Link'
 
 interface ChangeVoteButtonProps {
   vote: Vote | null
diff --git a/src/components/Proposal/View/ProposalVoting/VotingSectionFooter.tsx b/src/components/Proposal/View/ProposalVoting/VotingSectionFooter.tsx
index c052774e4..2b43f41fc 100644
--- a/src/components/Proposal/View/ProposalVoting/VotingSectionFooter.tsx
+++ b/src/components/Proposal/View/ProposalVoting/VotingSectionFooter.tsx
@@ -1,6 +1,5 @@
 import React from 'react'
 
-import { Link } from '@reach/router'
 import useAuthContext from 'decentraland-gatsby/dist/context/Auth/useAuthContext'
 import useCountdown from 'decentraland-gatsby/dist/hooks/useCountdown'
 
@@ -9,6 +8,7 @@ import useFormatMessage from '../../../../hooks/useFormatMessage'
 import { ProposalPageState } from '../../../../pages/proposal'
 import Time from '../../../../utils/date/Time'
 import locations from '../../../../utils/locations'
+import Link from '../../../Common/Link'
 
 import { ChangeVoteButton } from './ChangeVoteButton'
 import VoteVotingPowerInfo from './VoteVotingPowerInfo'
@@ -65,7 +65,7 @@ const VotingSectionFooter = ({
           </div>
           <div className="VotingSectionFooter__Actions">
             {showVotingPowerInfo && userAddress && !hasEnoughToVote && (
-              <Link to={locations.profile({ address: userAddress })}>{t('page.proposal_detail.get_vp')}</Link>
+              <Link href={locations.profile({ address: userAddress })}>{t('page.proposal_detail.get_vp')}</Link>
             )}
             {hasEnoughToVote && (
               <ChangeVoteButton
diff --git a/src/components/Search/FilterLabel.tsx b/src/components/Search/FilterLabel.tsx
index 4cfec1c48..86bc282c7 100644
--- a/src/components/Search/FilterLabel.tsx
+++ b/src/components/Search/FilterLabel.tsx
@@ -2,7 +2,8 @@ import React from 'react'
 
 import classNames from 'classnames'
 import Paragraph from 'decentraland-gatsby/dist/components/Text/Paragraph'
-import { navigate } from 'decentraland-gatsby/dist/plugins/intl'
+
+import { navigate } from '../../utils/locations'
 
 import './FilterLabel.css'
 
diff --git a/src/components/Search/SearchInput.tsx b/src/components/Search/SearchInput.tsx
index 0f6f6b75e..a9e86e1d5 100644
--- a/src/components/Search/SearchInput.tsx
+++ b/src/components/Search/SearchInput.tsx
@@ -2,12 +2,11 @@ import React, { useEffect, useRef, useState } from 'react'
 
 import { useLocation } from '@reach/router'
 import classNames from 'classnames'
-import { navigate } from 'decentraland-gatsby/dist/plugins/intl'
 import { Close } from 'decentraland-ui/dist/components/Close/Close'
 
 import useFormatMessage from '../../hooks/useFormatMessage'
 import { useProposalsSearchParams } from '../../hooks/useSearchParams'
-import locations from '../../utils/locations'
+import locations, { navigate } from '../../utils/locations'
 
 import './SearchInput.css'
 
diff --git a/src/components/Search/SearchTitle.tsx b/src/components/Search/SearchTitle.tsx
index dd7faac8f..c295cc7cb 100644
--- a/src/components/Search/SearchTitle.tsx
+++ b/src/components/Search/SearchTitle.tsx
@@ -1,14 +1,13 @@
 import React from 'react'
 
 import classNames from 'classnames'
-import { navigate } from 'decentraland-gatsby/dist/plugins/intl'
 import { Back } from 'decentraland-ui/dist/components/Back/Back'
 import { Header } from 'decentraland-ui/dist/components/Header/Header'
 import { useMobileMediaQuery } from 'decentraland-ui/dist/components/Media/Media'
 
 import useFormatMessage from '../../hooks/useFormatMessage'
 import { useProposalsSearchParams } from '../../hooks/useSearchParams'
-import locations from '../../utils/locations'
+import locations, { navigate } from '../../utils/locations'
 
 import './SearchTitle.css'
 
diff --git a/src/components/Search/SortingMenu.tsx b/src/components/Search/SortingMenu.tsx
index 0dba8e7a1..8de35b8f1 100644
--- a/src/components/Search/SortingMenu.tsx
+++ b/src/components/Search/SortingMenu.tsx
@@ -2,12 +2,12 @@ import React, { useMemo } from 'react'
 
 import { useLocation } from '@reach/router'
 import classNames from 'classnames'
-import { navigate } from 'decentraland-gatsby/dist/plugins/intl'
 import { Dropdown } from 'decentraland-ui/dist/components/Dropdown/Dropdown'
 import { useMobileMediaQuery } from 'decentraland-ui/dist/components/Media/Media'
 
 import { getUrlFilters } from '../../helpers'
 import useFormatMessage from '../../hooks/useFormatMessage'
+import { navigate } from '../../utils/locations'
 
 import './SortingMenu.css'
 
diff --git a/src/components/Status/StatusPill.tsx b/src/components/Status/StatusPill.tsx
index 01f1cd2a5..3d920325b 100644
--- a/src/components/Status/StatusPill.tsx
+++ b/src/components/Status/StatusPill.tsx
@@ -1,12 +1,12 @@
 import React from 'react'
 
-import { Link } from '@reach/router'
 import classNames from 'classnames'
 import { Mobile, NotMobile } from 'decentraland-ui/dist/components/Media/Media'
 
 import { ProposalStatus } from '../../entities/Proposal/types'
 import { getProposalStatusDisplayName, getProposalStatusShortName } from '../../entities/Proposal/utils'
 import locations from '../../utils/locations'
+import Link from '../Common/Link'
 import Pill, { PillColor, Props as PillProps } from '../Common/Pill'
 import Check from '../Icon/Check'
 
@@ -42,14 +42,14 @@ const StatusPill = ({ className, status, size, isLink }: Props) => {
   return (
     <>
       <Mobile>
-        <Wrapper to={href}>
+        <Wrapper href={href}>
           <Pill size={'small'} style={style} className={pillClassNames} color={colorsConfig} icon={icon}>
             {getProposalStatusShortName(status)}
           </Pill>
         </Wrapper>
       </Mobile>
       <NotMobile>
-        <Wrapper to={href}>
+        <Wrapper href={href}>
           <Pill size={size || 'default'} style={style} className={pillClassNames} color={colorsConfig} icon={icon}>
             {getProposalStatusDisplayName(status)}
           </Pill>
diff --git a/src/components/Transparency/GrantList.tsx b/src/components/Transparency/GrantList.tsx
index af91abfb4..ac9a27cfa 100644
--- a/src/components/Transparency/GrantList.tsx
+++ b/src/components/Transparency/GrantList.tsx
@@ -1,6 +1,5 @@
 import React, { useMemo } from 'react'
 
-import { Link } from '@reach/router'
 import { Card } from 'decentraland-ui/dist/components/Card/Card'
 import { Header } from 'decentraland-ui/dist/components/Header/Header'
 
@@ -9,6 +8,7 @@ import { formatBalance } from '../../entities/Proposal/utils'
 import useFormatMessage from '../../hooks/useFormatMessage'
 import useProposals from '../../hooks/useProposals'
 import locations from '../../utils/locations'
+import Link from '../Common/Link'
 import { DetailItem } from '../Proposal/View/DetailItem'
 
 import './GrantList.css'
@@ -52,7 +52,10 @@ export default React.memo(function GrantList({ status, title }: GrantListProps)
                 )
               })}
             {additionalGrants > 0 && (
-              <Link to={locations.proposals({ type: ProposalType.Grant, status: status })} className="GrantList__Link">
+              <Link
+                href={locations.proposals({ type: ProposalType.Grant, status: status })}
+                className="GrantList__Link"
+              >
                 {t('page.transparency.funding.view_more', { count: additionalGrants })}
               </Link>
             )}
diff --git a/src/components/User/LogIn.tsx b/src/components/User/LogIn.tsx
index 7b8a4b211..ebfb3c7e6 100644
--- a/src/components/User/LogIn.tsx
+++ b/src/components/User/LogIn.tsx
@@ -3,14 +3,13 @@ import React from 'react'
 import Head from 'decentraland-gatsby/dist/components/Head/Head'
 import Paragraph from 'decentraland-gatsby/dist/components/Text/Paragraph'
 import useAuthContext from 'decentraland-gatsby/dist/context/Auth/useAuthContext'
-import { navigate } from 'decentraland-gatsby/dist/plugins/intl'
 import { Button } from 'decentraland-ui/dist/components/Button/Button'
 import { Container } from 'decentraland-ui/dist/components/Container/Container'
 import { useMobileMediaQuery } from 'decentraland-ui/dist/components/Media/Media'
 import { SignIn } from 'decentraland-ui/dist/components/SignIn/SignIn'
 
 import useFormatMessage from '../../hooks/useFormatMessage'
-import locations from '../../utils/locations'
+import locations, { navigate } from '../../utils/locations'
 
 import './LogIn.css'
 
diff --git a/src/components/User/Username.tsx b/src/components/User/Username.tsx
index 56fd5f18c..abc47af65 100644
--- a/src/components/User/Username.tsx
+++ b/src/components/User/Username.tsx
@@ -1,6 +1,5 @@
 import React from 'react'
 
-import { Link } from '@reach/router'
 import classNames from 'classnames'
 import { Size, SizeProps } from 'decentraland-gatsby/dist/components/Props/types'
 import Avatar from 'decentraland-gatsby/dist/components/User/Avatar'
@@ -10,6 +9,7 @@ import { Blockie } from 'decentraland-ui/dist/components/Blockie/Blockie'
 import { getChecksumAddress } from '../../entities/Snapshot/utils'
 import useProfile from '../../hooks/useProfile'
 import locations from '../../utils/locations'
+import Link from '../Common/Link'
 
 import './Username.css'
 
@@ -94,7 +94,7 @@ const Username = ({ address, size, linked, variant = UsernameVariant.Full, stron
   return (
     <>
       {linked ? (
-        <Link className={classNames('Username', className)} to={locations.profile({ address: checksumAddress })}>
+        <Link className={classNames('Username', className)} href={locations.profile({ address: checksumAddress })}>
           {userElement}
         </Link>
       ) : (
diff --git a/src/hooks/useFormatMessage.ts b/src/hooks/useFormatMessage.ts
index 48216b78f..59c01a2cc 100644
--- a/src/hooks/useFormatMessage.ts
+++ b/src/hooks/useFormatMessage.ts
@@ -1,11 +1,19 @@
-import { PrimitiveType, useIntl } from 'react-intl'
+import { useCallback } from 'react'
+import { useIntl } from 'react-intl'
 
 function useFormatMessage() {
   const intl = useIntl()
-  return (id?: string, values?: Record<string, PrimitiveType>) => {
-    if (!id || id.length === 0) return ''
-    return intl.formatMessage({ id }, values)
-  }
+  return useCallback(
+    // eslint-disable-next-line @typescript-eslint/ban-types
+    function format<V extends {}>(id?: string | null, values?: V) {
+      if (!id || !intl.messages[id]) {
+        return id || ''
+      }
+
+      return intl.formatMessage({ id }, { ...values })
+    },
+    [intl]
+  )
 }
 
 export default useFormatMessage
diff --git a/src/hooks/usePreventNavigation.ts b/src/hooks/usePreventNavigation.ts
index 11ae0aaf5..f1e5fa11d 100644
--- a/src/hooks/usePreventNavigation.ts
+++ b/src/hooks/usePreventNavigation.ts
@@ -1,9 +1,8 @@
 import { useEffect, useRef } from 'react'
 
 import { globalHistory, useLocation } from '@reach/router'
-import { navigate } from 'decentraland-gatsby/dist/plugins/intl'
 
-import locations from '../utils/locations'
+import locations, { navigate } from '../utils/locations'
 
 import useFormatMessage from './useFormatMessage'
 
diff --git a/src/pages/profile.tsx b/src/pages/profile.tsx
index b664e0c3f..54def99c1 100644
--- a/src/pages/profile.tsx
+++ b/src/pages/profile.tsx
@@ -3,7 +3,6 @@ import React, { useMemo } from 'react'
 import { useLocation } from '@reach/router'
 import Head from 'decentraland-gatsby/dist/components/Head/Head'
 import useAuthContext from 'decentraland-gatsby/dist/context/Auth/useAuthContext'
-import { navigate } from 'decentraland-gatsby/dist/plugins/intl'
 import isEthereumAddress from 'validator/lib/isEthereumAddress'
 
 import BurgerMenuLayout from '../components/Layout/BurgerMenu/BurgerMenuLayout'
@@ -20,6 +19,7 @@ import UserStats from '../components/User/UserStats'
 import useFormatMessage from '../hooks/useFormatMessage'
 import useProfile from '../hooks/useProfile'
 import useVotingPowerInformation from '../hooks/useVotingPowerInformation'
+import { navigate } from '../utils/locations'
 import { isUnderMaintenance } from '../utils/maintenance'
 
 import './profile.css'
diff --git a/src/pages/proposal.tsx b/src/pages/proposal.tsx
index 32890ce19..8dca950bd 100644
--- a/src/pages/proposal.tsx
+++ b/src/pages/proposal.tsx
@@ -9,7 +9,6 @@ import NotFound from 'decentraland-gatsby/dist/components/Layout/NotFound'
 import Markdown from 'decentraland-gatsby/dist/components/Text/Markdown'
 import useAuthContext from 'decentraland-gatsby/dist/context/Auth/useAuthContext'
 import usePatchState from 'decentraland-gatsby/dist/hooks/usePatchState'
-import { navigate } from 'decentraland-gatsby/dist/plugins/intl'
 import { Header } from 'decentraland-ui/dist/components/Header/Header'
 import { Loader } from 'decentraland-ui/dist/components/Loader/Loader'
 import { Desktop } from 'decentraland-ui/dist/components/Media/Media'
@@ -63,7 +62,7 @@ import useProposalVotes from '../hooks/useProposalVotes'
 import useSurveyTopics from '../hooks/useSurveyTopics'
 import { useTenderProposals } from '../hooks/useTenderProposals'
 import useURLSearchParams from '../hooks/useURLSearchParams'
-import locations from '../utils/locations'
+import locations, { navigate } from '../utils/locations'
 import { isUnderMaintenance } from '../utils/maintenance'
 
 import './proposal.css'
diff --git a/src/pages/proposals.tsx b/src/pages/proposals.tsx
index 073e43ac7..74b774dc2 100644
--- a/src/pages/proposals.tsx
+++ b/src/pages/proposals.tsx
@@ -5,7 +5,6 @@ import { useQuery } from '@tanstack/react-query'
 import Head from 'decentraland-gatsby/dist/components/Head/Head'
 import Link from 'decentraland-gatsby/dist/components/Text/Link'
 import useAuthContext from 'decentraland-gatsby/dist/context/Auth/useAuthContext'
-import { navigate } from 'decentraland-gatsby/dist/plugins/intl'
 import prevent from 'decentraland-gatsby/dist/utils/react/prevent'
 import { Button } from 'decentraland-ui/dist/components/Button/Button'
 import { Container } from 'decentraland-ui/dist/components/Container/Container'
@@ -39,7 +38,7 @@ import useProposals from '../hooks/useProposals'
 import useProposalsByCoAuthor from '../hooks/useProposalsByCoAuthor'
 import { useProposalsSearchParams } from '../hooks/useSearchParams'
 import useSubscriptions from '../hooks/useSubscriptions'
-import locations from '../utils/locations'
+import locations, { navigate } from '../utils/locations'
 import { isUnderMaintenance } from '../utils/maintenance'
 
 import './proposals.css'
diff --git a/src/pages/submit/ban-name.tsx b/src/pages/submit/ban-name.tsx
index 832ffc2c9..c6b783b16 100644
--- a/src/pages/submit/ban-name.tsx
+++ b/src/pages/submit/ban-name.tsx
@@ -6,7 +6,6 @@ import Label from 'decentraland-gatsby/dist/components/Form/Label'
 import Head from 'decentraland-gatsby/dist/components/Head/Head'
 import Paragraph from 'decentraland-gatsby/dist/components/Text/Paragraph'
 import useAuthContext from 'decentraland-gatsby/dist/context/Auth/useAuthContext'
-import { navigate } from 'decentraland-gatsby/dist/plugins/intl'
 import { Button } from 'decentraland-ui/dist/components/Button/Button'
 import { Header } from 'decentraland-ui/dist/components/Header/Header'
 
@@ -22,7 +21,7 @@ import LogIn from '../../components/User/LogIn'
 import { NewProposalBanName, newProposalBanNameScheme } from '../../entities/Proposal/types'
 import { isAlreadyBannedName, isValidName } from '../../entities/Proposal/utils'
 import useFormatMessage from '../../hooks/useFormatMessage'
-import locations from '../../utils/locations'
+import locations, { navigate } from '../../utils/locations'
 
 import './submit.css'
 
diff --git a/src/pages/submit/catalyst.tsx b/src/pages/submit/catalyst.tsx
index aa5a6ecfa..125e457f6 100644
--- a/src/pages/submit/catalyst.tsx
+++ b/src/pages/submit/catalyst.tsx
@@ -7,7 +7,6 @@ import Label from 'decentraland-gatsby/dist/components/Form/Label'
 import Head from 'decentraland-gatsby/dist/components/Head/Head'
 import Paragraph from 'decentraland-gatsby/dist/components/Text/Paragraph'
 import useAuthContext from 'decentraland-gatsby/dist/context/Auth/useAuthContext'
-import { navigate } from 'decentraland-gatsby/dist/plugins/intl'
 import Catalyst from 'decentraland-gatsby/dist/utils/api/Catalyst'
 import { Button } from 'decentraland-ui/dist/components/Button/Button'
 import { Header } from 'decentraland-ui/dist/components/Header/Header'
@@ -25,7 +24,7 @@ import LogIn from '../../components/User/LogIn'
 import { NewProposalCatalyst, newProposalCatalystScheme } from '../../entities/Proposal/types'
 import { isAlreadyACatalyst, isValidDomainName } from '../../entities/Proposal/utils'
 import useFormatMessage from '../../hooks/useFormatMessage'
-import locations from '../../utils/locations'
+import locations, { navigate } from '../../utils/locations'
 
 import './catalyst.css'
 import './submit.css'
diff --git a/src/pages/submit/draft.tsx b/src/pages/submit/draft.tsx
index 0bf13f9c7..4d7135a03 100644
--- a/src/pages/submit/draft.tsx
+++ b/src/pages/submit/draft.tsx
@@ -7,7 +7,6 @@ import Head from 'decentraland-gatsby/dist/components/Head/Head'
 import Markdown from 'decentraland-gatsby/dist/components/Text/Markdown'
 import Paragraph from 'decentraland-gatsby/dist/components/Text/Paragraph'
 import useAuthContext from 'decentraland-gatsby/dist/context/Auth/useAuthContext'
-import { navigate } from 'decentraland-gatsby/dist/plugins/intl'
 import { Button } from 'decentraland-ui/dist/components/Button/Button'
 import { Header } from 'decentraland-ui/dist/components/Header/Header'
 import { SelectField } from 'decentraland-ui/dist/components/SelectField/SelectField'
@@ -27,7 +26,7 @@ import useFormatMessage from '../../hooks/useFormatMessage'
 import usePreselectedProposal from '../../hooks/usePreselectedProposal'
 import useURLSearchParams from '../../hooks/useURLSearchParams'
 import useVotingPowerDistribution from '../../hooks/useVotingPowerDistribution'
-import locations from '../../utils/locations'
+import locations, { navigate } from '../../utils/locations'
 
 import './submit.css'
 
diff --git a/src/pages/submit/governance.tsx b/src/pages/submit/governance.tsx
index 65d09b5a0..3c92fdab3 100644
--- a/src/pages/submit/governance.tsx
+++ b/src/pages/submit/governance.tsx
@@ -8,7 +8,6 @@ import Head from 'decentraland-gatsby/dist/components/Head/Head'
 import Markdown from 'decentraland-gatsby/dist/components/Text/Markdown'
 import Paragraph from 'decentraland-gatsby/dist/components/Text/Paragraph'
 import useAuthContext from 'decentraland-gatsby/dist/context/Auth/useAuthContext'
-import { navigate } from 'decentraland-gatsby/dist/plugins/intl'
 import { Button } from 'decentraland-ui/dist/components/Button/Button'
 import { Field } from 'decentraland-ui/dist/components/Field/Field'
 import { Header } from 'decentraland-ui/dist/components/Header/Header'
@@ -27,7 +26,7 @@ import { NewProposalDraft, NewProposalGovernance, newProposalGovernanceScheme }
 import useFormatMessage from '../../hooks/useFormatMessage'
 import usePreselectedProposal from '../../hooks/usePreselectedProposal'
 import useVotingPowerDistribution from '../../hooks/useVotingPowerDistribution'
-import locations from '../../utils/locations'
+import locations, { navigate } from '../../utils/locations'
 
 import './submit.css'
 
diff --git a/src/pages/submit/grant.tsx b/src/pages/submit/grant.tsx
index b275717be..2158cab1d 100644
--- a/src/pages/submit/grant.tsx
+++ b/src/pages/submit/grant.tsx
@@ -6,7 +6,6 @@ import Head from 'decentraland-gatsby/dist/components/Head/Head'
 import Markdown from 'decentraland-gatsby/dist/components/Text/Markdown'
 import useAuthContext from 'decentraland-gatsby/dist/context/Auth/useAuthContext'
 import usePatchState from 'decentraland-gatsby/dist/hooks/usePatchState'
-import { navigate } from 'decentraland-gatsby/dist/plugins/intl'
 import { Button } from 'decentraland-ui/dist/components/Button/Button'
 import { Container } from 'decentraland-ui/dist/components/Container/Container'
 import camelCase from 'lodash/camelCase'
@@ -38,7 +37,7 @@ import { asNumber, isGrantProposalSubmitEnabled, userModifiedForm } from '../../
 import { toNewGrantCategory } from '../../entities/QuarterCategoryBudget/utils'
 import useFormatMessage from '../../hooks/useFormatMessage'
 import usePreventNavigation from '../../hooks/usePreventNavigation'
-import locations from '../../utils/locations'
+import locations, { navigate } from '../../utils/locations'
 
 import './grant.css'
 import './submit.css'
diff --git a/src/pages/submit/linked-wearables.tsx b/src/pages/submit/linked-wearables.tsx
index 898a86042..8c2b47e0d 100644
--- a/src/pages/submit/linked-wearables.tsx
+++ b/src/pages/submit/linked-wearables.tsx
@@ -8,7 +8,6 @@ import Markdown from 'decentraland-gatsby/dist/components/Text/Markdown'
 import Paragraph from 'decentraland-gatsby/dist/components/Text/Paragraph'
 import useAuthContext from 'decentraland-gatsby/dist/context/Auth/useAuthContext'
 import { assert } from 'decentraland-gatsby/dist/hooks/useEditor'
-import { navigate } from 'decentraland-gatsby/dist/plugins/intl'
 import { Button } from 'decentraland-ui/dist/components/Button/Button'
 import { Field as DCLField } from 'decentraland-ui/dist/components/Field/Field'
 import { Header } from 'decentraland-ui/dist/components/Header/Header'
@@ -33,7 +32,7 @@ import { asNumber, isValidImage } from '../../entities/Proposal/utils'
 import { disableOnWheelInput } from '../../helpers'
 import { isHttpsURL } from '../../helpers'
 import useFormatMessage from '../../hooks/useFormatMessage'
-import locations from '../../utils/locations'
+import locations, { navigate } from '../../utils/locations'
 
 import './submit.css'
 
diff --git a/src/pages/submit/pitch.tsx b/src/pages/submit/pitch.tsx
index 8f133750f..0b6ea4b53 100644
--- a/src/pages/submit/pitch.tsx
+++ b/src/pages/submit/pitch.tsx
@@ -7,7 +7,6 @@ import Head from 'decentraland-gatsby/dist/components/Head/Head'
 import Markdown from 'decentraland-gatsby/dist/components/Text/Markdown'
 import Paragraph from 'decentraland-gatsby/dist/components/Text/Paragraph'
 import useAuthContext from 'decentraland-gatsby/dist/context/Auth/useAuthContext'
-import { navigate } from 'decentraland-gatsby/dist/plugins/intl'
 import { Button } from 'decentraland-ui/dist/components/Button/Button'
 import { Header } from 'decentraland-ui/dist/components/Header/Header'
 
@@ -24,7 +23,7 @@ import { SUBMISSION_THRESHOLD_PITCH } from '../../entities/Proposal/constants'
 import { NewProposalPitch, newProposalPitchScheme } from '../../entities/Proposal/types'
 import useFormatMessage from '../../hooks/useFormatMessage'
 import useVotingPowerDistribution from '../../hooks/useVotingPowerDistribution'
-import locations from '../../utils/locations'
+import locations, { navigate } from '../../utils/locations'
 
 import './submit.css'
 
diff --git a/src/pages/submit/poll.tsx b/src/pages/submit/poll.tsx
index 33086343d..5e50b3afe 100644
--- a/src/pages/submit/poll.tsx
+++ b/src/pages/submit/poll.tsx
@@ -6,7 +6,6 @@ import Head from 'decentraland-gatsby/dist/components/Head/Head'
 import Markdown from 'decentraland-gatsby/dist/components/Text/Markdown'
 import Paragraph from 'decentraland-gatsby/dist/components/Text/Paragraph'
 import useAuthContext from 'decentraland-gatsby/dist/context/Auth/useAuthContext'
-import { navigate } from 'decentraland-gatsby/dist/plugins/intl'
 import { Button } from 'decentraland-ui/dist/components/Button/Button'
 import { Field as DCLField } from 'decentraland-ui/dist/components/Field/Field'
 import { Header } from 'decentraland-ui/dist/components/Header/Header'
@@ -29,7 +28,7 @@ import { SUBMISSION_THRESHOLD_POLL } from '../../entities/Proposal/constants'
 import { INVALID_PROPOSAL_POLL_OPTIONS, newProposalPollScheme } from '../../entities/Proposal/types'
 import useFormatMessage from '../../hooks/useFormatMessage'
 import useVotingPowerDistribution from '../../hooks/useVotingPowerDistribution'
-import locations from '../../utils/locations'
+import locations, { navigate } from '../../utils/locations'
 
 import './poll.css'
 import './submit.css'
diff --git a/src/pages/submit/tender.tsx b/src/pages/submit/tender.tsx
index 807721b62..080eaccbb 100644
--- a/src/pages/submit/tender.tsx
+++ b/src/pages/submit/tender.tsx
@@ -7,7 +7,6 @@ import Head from 'decentraland-gatsby/dist/components/Head/Head'
 import Markdown from 'decentraland-gatsby/dist/components/Text/Markdown'
 import Paragraph from 'decentraland-gatsby/dist/components/Text/Paragraph'
 import useAuthContext from 'decentraland-gatsby/dist/context/Auth/useAuthContext'
-import { navigate } from 'decentraland-gatsby/dist/plugins/intl'
 import { Button } from 'decentraland-ui/dist/components/Button/Button'
 import { Dropdown } from 'decentraland-ui/dist/components/Dropdown/Dropdown'
 import { Header } from 'decentraland-ui/dist/components/Header/Header'
@@ -29,7 +28,7 @@ import usePreselectedProposal from '../../hooks/usePreselectedProposal'
 import useURLSearchParams from '../../hooks/useURLSearchParams'
 import useVotingPowerDistribution from '../../hooks/useVotingPowerDistribution'
 import Time from '../../utils/date/Time'
-import locations from '../../utils/locations'
+import locations, { navigate } from '../../utils/locations'
 
 import './submit.css'
 
diff --git a/src/pages/submit/update.tsx b/src/pages/submit/update.tsx
index 9615c0cf9..6abe93e5b 100644
--- a/src/pages/submit/update.tsx
+++ b/src/pages/submit/update.tsx
@@ -8,7 +8,6 @@ import NotFound from 'decentraland-gatsby/dist/components/Layout/NotFound'
 import Paragraph from 'decentraland-gatsby/dist/components/Text/Paragraph'
 import useAuthContext from 'decentraland-gatsby/dist/context/Auth/useAuthContext'
 import useEditor, { assert, createValidator } from 'decentraland-gatsby/dist/hooks/useEditor'
-import { navigate } from 'decentraland-gatsby/dist/plugins/intl'
 import { Button } from 'decentraland-ui/dist/components/Button/Button'
 import { Container } from 'decentraland-ui/dist/components/Container/Container'
 import { Header } from 'decentraland-ui/dist/components/Header/Header'
@@ -24,7 +23,7 @@ import UpdateMarkdownView from '../../components/Updates/UpdateMarkdownView'
 import { ProjectHealth, UpdateStatus } from '../../entities/Updates/types'
 import useFormatMessage from '../../hooks/useFormatMessage'
 import useProposalUpdate from '../../hooks/useProposalUpdate'
-import locations from '../../utils/locations'
+import locations, { navigate } from '../../utils/locations'
 
 import './submit.css'
 import './update.css'
diff --git a/src/pages/update.tsx b/src/pages/update.tsx
index e73598b3d..fb7d8cf0f 100644
--- a/src/pages/update.tsx
+++ b/src/pages/update.tsx
@@ -1,11 +1,11 @@
 import React, { useMemo } from 'react'
 
 import { useLocation } from '@reach/router'
-import { Link } from '@reach/router'
 import Head from 'decentraland-gatsby/dist/components/Head/Head'
 import NotFound from 'decentraland-gatsby/dist/components/Layout/NotFound'
 import { Header } from 'decentraland-ui/dist/components/Header/Header'
 
+import Link from '../components/Common/Link'
 import ContentLayout, { ContentSection } from '../components/Layout/ContentLayout'
 import LoadingView from '../components/Layout/LoadingView'
 import UpdateMarkdownView from '../components/Updates/UpdateMarkdownView'
@@ -56,7 +56,7 @@ export default function UpdateDetail() {
       <ContentLayout navigateHref={proposalHref} small>
         <ContentSection className="UpdateDetail__Header">
           <span className="UpdateDetail__ProjectTitle">
-            {t('page.update_detail.project_title', { title: <Link to={proposalHref}>{proposal?.title}</Link> })}
+            {t('page.update_detail.project_title', { title: <Link href={proposalHref}>{proposal?.title}</Link> })}
           </span>
           <Header size="huge">{t('page.update_detail.title', { index })}</Header>
         </ContentSection>
diff --git a/src/utils/locations.ts b/src/utils/locations.ts
index 0966d0e8d..a21c7da78 100644
--- a/src/utils/locations.ts
+++ b/src/utils/locations.ts
@@ -1,4 +1,6 @@
+import { NavigateOptions } from '@reach/router'
 import API from 'decentraland-gatsby/dist/utils/api/API'
+import { navigate as gatsbyNavigate } from 'gatsby-link'
 
 import { HiringType, PoiType, ProposalStatus, ProposalType } from '../entities/Proposal/types'
 
@@ -67,3 +69,16 @@ export default {
     update: (id: string) => url('edit/update/', { id }),
   },
 }
+
+export function isLocalLink(href?: string | null) {
+  return (
+    typeof href === 'string' && !href.startsWith('https://') && !href.startsWith('http://') && !href.startsWith('//')
+  )
+}
+
+export function navigate(to: string, options?: NavigateOptions<any>) {
+  if (typeof window === 'undefined') {
+    return
+  }
+  gatsbyNavigate(to, options)
+}