diff --git a/packages/web/README.md b/packages/web/README.md
index 2536ed01456..3f9d053ebf9 100644
--- a/packages/web/README.md
+++ b/packages/web/README.md
@@ -14,6 +14,16 @@ and then running
 
 which will start a server accessible at [http://localhost:3000](http://localhost:3000)
 
+## Testing
+
+run tests with `yarn test`
+
+tools: `jest`, `@testing-library/react`
+
+#### Testing Strategy
+
+Each page should have a snapshot test found in `src/_page-tests` more interactive components should have an additional tests for various states/ interactions.
+
 ## Architecture
 
 The website uses [React.js](https://reactjs.org/), [Next.js](https://nextjs.org/), and [React Native Web](https://github.com/necolas/react-native-web). React is a great library for building user interfaces. Next.js takes care of server-rendering React apps in a simple way and preloading/transitioning pages quickly. React Native web allows us to use the same code in the application on the website, specifically the way we do CSS.
@@ -35,7 +45,3 @@ Now you can run
 `yarn run deploy:dev`
 
 to deploy to the `dev` environment, with similar commands for `staging` and `prod`
-
-## Add your picture
-
-Take a look at the files in [this folder](https://github.com/celo-org/celo-monorepo/tree/master/packages/web/src/about/team) and see if you can figure out how to add your picture to the `/about` page :)
diff --git a/packages/web/package.json b/packages/web/package.json
index f8dff3a3a1b..97805ece0c8 100644
--- a/packages/web/package.json
+++ b/packages/web/package.json
@@ -53,7 +53,7 @@
     "net": "^1.0.2",
     "network-speed": "^2.0.4",
     "next": "^9.1.5",
-    "next-i18next": "^2.1.1",
+    "next-i18next": "^4.0.1",
     "next-images": "^1.2.0",
     "next-plugin-transpile-modules": "^2.0.0",
     "node-cache": "^5.0.2",
diff --git a/packages/web/static/assets/CeloColorLogo.zip b/packages/web/public/assets/CeloColorLogo.zip
similarity index 100%
rename from packages/web/static/assets/CeloColorLogo.zip
rename to packages/web/public/assets/CeloColorLogo.zip
diff --git a/packages/web/static/assets/CeloColorLogoReverse.zip b/packages/web/public/assets/CeloColorLogoReverse.zip
similarity index 100%
rename from packages/web/static/assets/CeloColorLogoReverse.zip
rename to packages/web/public/assets/CeloColorLogoReverse.zip
diff --git a/packages/web/static/assets/CeloGlyphs.zip b/packages/web/public/assets/CeloGlyphs.zip
similarity index 100%
rename from packages/web/static/assets/CeloGlyphs.zip
rename to packages/web/public/assets/CeloGlyphs.zip
diff --git a/packages/web/static/assets/CeloLogoPackage.zip b/packages/web/public/assets/CeloLogoPackage.zip
similarity index 100%
rename from packages/web/static/assets/CeloLogoPackage.zip
rename to packages/web/public/assets/CeloLogoPackage.zip
diff --git a/packages/web/static/assets/CeloMonochromeLogo.zip b/packages/web/public/assets/CeloMonochromeLogo.zip
similarity index 100%
rename from packages/web/static/assets/CeloMonochromeLogo.zip
rename to packages/web/public/assets/CeloMonochromeLogo.zip
diff --git a/packages/web/static/assets/CeloMonochromeLogoReverse.zip b/packages/web/public/assets/CeloMonochromeLogoReverse.zip
similarity index 100%
rename from packages/web/static/assets/CeloMonochromeLogoReverse.zip
rename to packages/web/public/assets/CeloMonochromeLogoReverse.zip
diff --git a/packages/web/static/AboutPreview.jpg b/packages/web/public/images/AboutPreview.jpg
similarity index 100%
rename from packages/web/static/AboutPreview.jpg
rename to packages/web/public/images/AboutPreview.jpg
diff --git a/packages/web/static/favicon.ico b/packages/web/public/static/favicon.ico
similarity index 100%
rename from packages/web/static/favicon.ico
rename to packages/web/public/static/favicon.ico
diff --git a/packages/web/static/locales/en/about.json b/packages/web/public/static/locales/en/about.json
similarity index 100%
rename from packages/web/static/locales/en/about.json
rename to packages/web/public/static/locales/en/about.json
diff --git a/packages/web/static/locales/en/applications.json b/packages/web/public/static/locales/en/applications.json
similarity index 100%
rename from packages/web/static/locales/en/applications.json
rename to packages/web/public/static/locales/en/applications.json
diff --git a/packages/web/static/locales/en/brand.json b/packages/web/public/static/locales/en/brand.json
similarity index 100%
rename from packages/web/static/locales/en/brand.json
rename to packages/web/public/static/locales/en/brand.json
diff --git a/packages/web/static/locales/en/codeofconduct.json b/packages/web/public/static/locales/en/codeofconduct.json
similarity index 100%
rename from packages/web/static/locales/en/codeofconduct.json
rename to packages/web/public/static/locales/en/codeofconduct.json
diff --git a/packages/web/static/locales/en/common.json b/packages/web/public/static/locales/en/common.json
similarity index 100%
rename from packages/web/static/locales/en/common.json
rename to packages/web/public/static/locales/en/common.json
diff --git a/packages/web/static/locales/en/community.json b/packages/web/public/static/locales/en/community.json
similarity index 100%
rename from packages/web/static/locales/en/community.json
rename to packages/web/public/static/locales/en/community.json
diff --git a/packages/web/static/locales/en/dev.json b/packages/web/public/static/locales/en/dev.json
similarity index 100%
rename from packages/web/static/locales/en/dev.json
rename to packages/web/public/static/locales/en/dev.json
diff --git a/packages/web/static/locales/en/download.json b/packages/web/public/static/locales/en/download.json
similarity index 100%
rename from packages/web/static/locales/en/download.json
rename to packages/web/public/static/locales/en/download.json
diff --git a/packages/web/static/locales/en/faq.json b/packages/web/public/static/locales/en/faq.json
similarity index 100%
rename from packages/web/static/locales/en/faq.json
rename to packages/web/public/static/locales/en/faq.json
diff --git a/packages/web/static/locales/en/faucet.json b/packages/web/public/static/locales/en/faucet.json
similarity index 100%
rename from packages/web/static/locales/en/faucet.json
rename to packages/web/public/static/locales/en/faucet.json
diff --git a/packages/web/static/locales/en/home.json b/packages/web/public/static/locales/en/home.json
similarity index 100%
rename from packages/web/static/locales/en/home.json
rename to packages/web/public/static/locales/en/home.json
diff --git a/packages/web/static/locales/en/jobs.json b/packages/web/public/static/locales/en/jobs.json
similarity index 100%
rename from packages/web/static/locales/en/jobs.json
rename to packages/web/public/static/locales/en/jobs.json
diff --git a/packages/web/static/locales/en/technology.json b/packages/web/public/static/locales/en/technology.json
similarity index 100%
rename from packages/web/static/locales/en/technology.json
rename to packages/web/public/static/locales/en/technology.json
diff --git a/packages/web/static/locales/en/terms.json b/packages/web/public/static/locales/en/terms.json
similarity index 100%
rename from packages/web/static/locales/en/terms.json
rename to packages/web/public/static/locales/en/terms.json
diff --git a/packages/web/static/normalize.css b/packages/web/public/static/normalize.css
similarity index 100%
rename from packages/web/static/normalize.css
rename to packages/web/public/static/normalize.css
diff --git a/packages/web/src/_page-tests/__snapshots__/about.test.tsx.snap b/packages/web/src/_page-tests/__snapshots__/about.test.tsx.snap
index d27f5e0d4d0..4f890aa3ff5 100644
--- a/packages/web/src/_page-tests/__snapshots__/about.test.tsx.snap
+++ b/packages/web/src/_page-tests/__snapshots__/about.test.tsx.snap
@@ -27,7 +27,7 @@ exports[`About renders 1`] = `
         autoPlay={true}
         loop={true}
         muted={true}
-        poster="/static/AboutPreview.jpg"
+        poster="/images/AboutPreview.jpg"
         style={
           Object {
             "MozTransitionProperty": "filter",
@@ -63,7 +63,7 @@ exports[`About renders 1`] = `
             style={
               Object {
                 "backgroundColor": "rgba(0,0,0,0.00)",
-                "backgroundImage": "url(\\"/static/AboutPreview.jpg\\")",
+                "backgroundImage": "url(\\"/images/AboutPreview.jpg\\")",
                 "backgroundPosition": "center",
                 "backgroundRepeat": "no-repeat",
                 "backgroundSize": "cover",
@@ -82,7 +82,7 @@ exports[`About renders 1`] = `
             alt=""
             className="css-accessibilityImage-9pa8cd"
             draggable={false}
-            src="/static/AboutPreview.jpg"
+            src="/images/AboutPreview.jpg"
           />
         </div>
       </video>
diff --git a/packages/web/src/_page-tests/experience/__snapshots__/logo.test.tsx.snap b/packages/web/src/_page-tests/experience/__snapshots__/logo.test.tsx.snap
index 73eeade8153..5561cfff1b2 100644
--- a/packages/web/src/_page-tests/experience/__snapshots__/logo.test.tsx.snap
+++ b/packages/web/src/_page-tests/experience/__snapshots__/logo.test.tsx.snap
@@ -1041,7 +1041,7 @@ exports[`Experience/Logo renders 1`] = `
                   className="css-reset-4rbku5 css-cursor-18t94o4 css-text-901oao"
                   data-focusable={true}
                   dir="auto"
-                  href="/static/assets/CeloLogoPackage.zip"
+                  href="/assets/CeloLogoPackage.zip"
                   role="link"
                   style={
                     Object {
@@ -1365,7 +1365,7 @@ exports[`Experience/Logo renders 1`] = `
                     className="css-reset-4rbku5 css-cursor-18t94o4 css-text-901oao"
                     data-focusable={true}
                     dir="auto"
-                    href="/static/assets/CeloColorLogo.zip"
+                    href="/assets/CeloColorLogo.zip"
                     role="link"
                     style={
                       Object {
@@ -1544,7 +1544,7 @@ exports[`Experience/Logo renders 1`] = `
                     className="css-reset-4rbku5 css-cursor-18t94o4 css-text-901oao"
                     data-focusable={true}
                     dir="auto"
-                    href="/static/assets/CeloColorLogoReverse.zip"
+                    href="/assets/CeloColorLogoReverse.zip"
                     role="link"
                     style={
                       Object {
@@ -1731,7 +1731,7 @@ exports[`Experience/Logo renders 1`] = `
                     className="css-reset-4rbku5 css-cursor-18t94o4 css-text-901oao"
                     data-focusable={true}
                     dir="auto"
-                    href="/static/assets/CeloMonochromeLogo.zip"
+                    href="/assets/CeloMonochromeLogo.zip"
                     role="link"
                     style={
                       Object {
@@ -1910,7 +1910,7 @@ exports[`Experience/Logo renders 1`] = `
                     className="css-reset-4rbku5 css-cursor-18t94o4 css-text-901oao"
                     data-focusable={true}
                     dir="auto"
-                    href="/static/assets/CeloMonochromeLogoReverse.zip"
+                    href="/assets/CeloMonochromeLogoReverse.zip"
                     role="link"
                     style={
                       Object {
@@ -2048,7 +2048,7 @@ exports[`Experience/Logo renders 1`] = `
                   className="css-reset-4rbku5 css-cursor-18t94o4 css-text-901oao"
                   data-focusable={true}
                   dir="auto"
-                  href="/static/assets/CeloGlyphs.zip"
+                  href="/assets/CeloGlyphs.zip"
                   role="link"
                   style={
                     Object {
diff --git a/packages/web/src/about/VideoCover.tsx b/packages/web/src/about/VideoCover.tsx
index 795a0ade3a5..e7d28be6069 100644
--- a/packages/web/src/about/VideoCover.tsx
+++ b/packages/web/src/about/VideoCover.tsx
@@ -7,8 +7,8 @@ import Hoverable from 'src/shared/Hoverable'
 import { PlayCircle2 } from 'src/shared/PlayCircle'
 import VideoModal from 'src/shared/VideoModal'
 import { standardStyles, textStyles } from 'src/styles'
-
 import { hasGoodConnection } from 'src/utils/utils'
+
 interface State {
   isHovering: boolean
   supportsVideo: boolean
@@ -56,7 +56,7 @@ class VideoCover extends React.PureComponent<I18nProps & ScreenProps, State> {
             muted={true}
             autoPlay={true}
             loop={true}
-            poster="/static/AboutPreview.jpg"
+            poster="/images/AboutPreview.jpg"
           >
             {this.state.supportsVideo && (
               <source
@@ -67,7 +67,7 @@ class VideoCover extends React.PureComponent<I18nProps & ScreenProps, State> {
             }
             <Image
               resizeMode="cover"
-              source={{ uri: '/static/AboutPreview.jpg' }}
+              source={{ uri: '/images/AboutPreview.jpg' }}
               style={standardStyles.image}
             />
           </Video>
diff --git a/packages/web/src/brandkit/Logo.tsx b/packages/web/src/brandkit/Logo.tsx
index cf5bf1ed9a3..b3a9d53fe28 100644
--- a/packages/web/src/brandkit/Logo.tsx
+++ b/packages/web/src/brandkit/Logo.tsx
@@ -50,7 +50,7 @@ const Overview = withNamespaces(NameSpaces.brand)(
           <Button
             kind={BTN.PRIMARY}
             text={t('logo.overviewBtn')}
-            href="/static/assets/CeloLogoPackage.zip"
+            href="/assets/CeloLogoPackage.zip"
           />
           <Text style={[fonts.h5, standardStyles.blockMarginTop]}>{t('licenseTitle')}</Text>
           <Text
@@ -73,28 +73,28 @@ const Overview = withNamespaces(NameSpaces.brand)(
             hasBorder={true}
             logoType={Logos.light}
             background={colors.white}
-            href="/static/assets/CeloColorLogo.zip"
+            href="/assets/CeloColorLogo.zip"
             caption={t('logo.fullColorOnLightCaption')}
           />
           <LogoExample
             hasBorder={false}
             logoType={Logos.dark}
             background={colors.dark}
-            href="/static/assets/CeloColorLogoReverse.zip"
+            href="/assets/CeloColorLogoReverse.zip"
             caption={t('logo.fullColorOnDarkCaption')}
           />
           <LogoExample
             hasBorder={true}
             logoType={Logos.black}
             background={colors.white}
-            href="/static/assets/CeloMonochromeLogo.zip"
+            href="/assets/CeloMonochromeLogo.zip"
             caption={t('logo.monochromeCaption')}
           />
           <LogoExample
             hasBorder={false}
             logoType={Logos.white}
             background={colors.dark}
-            href="/static/assets/CeloMonochromeLogoReverse.zip"
+            href="/assets/CeloMonochromeLogoReverse.zip"
             caption={t('logo.monochromeInverseCaption')}
           />
         </View>
@@ -103,7 +103,7 @@ const Overview = withNamespaces(NameSpaces.brand)(
             {t('logo.glyphTitle')}
           </Text>
           <Text style={fonts.p}>{t('logo.glyphText')}</Text>
-          <DownloadButton uri="/static/assets/CeloGlyphs.zip" />
+          <DownloadButton uri="/assets/CeloGlyphs.zip" />
           <View style={[styles.tiling, standardStyles.elementalMarginTop]}>
             <View
               style={[
diff --git a/packages/web/src/community/CodeOfConduct.tsx b/packages/web/src/community/CodeOfConduct.tsx
index 986e6594c57..35214efc639 100644
--- a/packages/web/src/community/CodeOfConduct.tsx
+++ b/packages/web/src/community/CodeOfConduct.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { StyleSheet, View } from 'react-native'
-import defaultContent from 'src/../static/locales/en/codeofconduct.json'
+import defaultContent from 'src/../public/static/locales/en/codeofconduct.json'
 import { IntegratingAnimation } from 'src/community/connect/CodeOfConduct'
 import { H1, Li, Ul } from 'src/fonts/Fonts'
 import OpenGraph from 'src/header/OpenGraph'
diff --git a/yarn.lock b/yarn.lock
index 410b3810edf..4c2eb83f201 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -19145,13 +19145,6 @@ i18next-xhr-backend@^3.0.0:
   dependencies:
     "@babel/runtime" "^7.5.5"
 
-i18next@^18.0.1:
-  version "18.0.1"
-  resolved "https://registry.yarnpkg.com/i18next/-/i18next-18.0.1.tgz#10841209f6983df4d8e367204da403d8cbc609cf"
-  integrity sha512-KWd9qMFXw0qjxF7cTAqQselPCYoHfaLvBs8c6JcNzaQKVxbAlE/wv9EZXPy+JlKUcXCT0qgjcmxrJjmbnEp60A==
-  dependencies:
-    "@babel/runtime" "^7.3.1"
-
 i18next@^19.0.2:
   version "19.0.2"
   resolved "https://registry.yarnpkg.com/i18next/-/i18next-19.0.2.tgz#d72502ef031403572703f2e9f013cae005265444"
@@ -19159,6 +19152,13 @@ i18next@^19.0.2:
   dependencies:
     "@babel/runtime" "^7.3.1"
 
+i18next@^19.0.3:
+  version "19.1.0"
+  resolved "https://registry.yarnpkg.com/i18next/-/i18next-19.1.0.tgz#fe1a1da3d208872946307c7d2d115da45d46159f"
+  integrity sha512-ISbmukX4L6Dz0QoH9+EW1AnBw7j+NRLoMu9uLPMaNSSTP9Eie9/oUL0dOyWX15baB3gYOpkHJpGZRHOqcnl0ew==
+  dependencies:
+    "@babel/runtime" "^7.3.1"
+
 iconv-lite@0.4.19:
   version "0.4.19"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
@@ -24172,15 +24172,15 @@ nexmo@2.4.2:
     request "^2.88.0"
     uuid "^2.0.2"
 
-next-i18next@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/next-i18next/-/next-i18next-2.1.1.tgz#fb669b57b42efe95242af98a892be85096e2371a"
-  integrity sha512-Mbeb73SK9ozNBQIp8Fp/Fb51Xw7Tx/1m4rNHFnkTEupztrMCHBdKsG0t7L4k4VWwchW+a2sJ284nxSxtFSHOaw==
+next-i18next@^4.0.1:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/next-i18next/-/next-i18next-4.1.0.tgz#dcb5afba1254551b5ced34ef2e40b38203babdb6"
+  integrity sha512-i02CxQdLzUg1ny3FNFZ0QXoBu8Yn5SkNt1lctcUYUQNWw/xBGfN+WhuDAM8Vcifhb5bAcJeo3nX7ELMG2PyhBw==
   dependencies:
     core-js "^2"
     detect-node "^2.0.4"
     hoist-non-react-statics "^3.2.0"
-    i18next "^18.0.1"
+    i18next "^19.0.3"
     i18next-browser-languagedetector "^4.0.0"
     i18next-express-middleware "^1.5.0"
     i18next-node-fs-backend "^2.1.0"