diff --git a/packages/common-components/src/MenuDropdown/MenuDropdown.tsx b/packages/common-components/src/MenuDropdown/MenuDropdown.tsx
index 7c73d2c959..e64a71ae86 100644
--- a/packages/common-components/src/MenuDropdown/MenuDropdown.tsx
+++ b/packages/common-components/src/MenuDropdown/MenuDropdown.tsx
@@ -218,7 +218,7 @@ const MenuDropdown: React.FC<IMenuDropdownProps> = ({
         {title && (
           <Typography
             component="p"
-            variant="body2"
+            variant="body1"
             className={classNames?.titleText}
           >
             {title}
diff --git a/packages/files-ui/src/Components/Elements/MnemonicForm.tsx b/packages/files-ui/src/Components/Elements/MnemonicForm.tsx
index 9f2714ed90..2c50eb4c70 100644
--- a/packages/files-ui/src/Components/Elements/MnemonicForm.tsx
+++ b/packages/files-ui/src/Components/Elements/MnemonicForm.tsx
@@ -78,7 +78,7 @@ const useStyles = makeStyles(({ animation, constants, palette, zIndex }: CSFThem
       width: 35,
       marginLeft: constants.generalUnit * 3,
       "&.active": {
-        fill: palette.success.main
+        fill: palette.primary.main
       }
     },
     loader: {
@@ -160,7 +160,7 @@ const MnemonicForm = ({ buttonLabel, onComplete }: Props) => {
                   <div className={clsx(classes.copiedFlag, { "active": copied })}>
                     <span>
                       <Trans>
-                      Copied!
+                        Copied!
                       </Trans>
                     </span>
                   </div>
diff --git a/packages/files-ui/src/Components/FilesRoutes.tsx b/packages/files-ui/src/Components/FilesRoutes.tsx
index b1bad41dce..3589c19f7d 100644
--- a/packages/files-ui/src/Components/FilesRoutes.tsx
+++ b/packages/files-ui/src/Components/FilesRoutes.tsx
@@ -16,7 +16,7 @@ export const ROUTE_LINKS = {
   Terms: "https://files.chainsafe.io/terms-of-service",
   ChainSafe: "https://chainsafe.io/",
   // TODO: update link
-  ApplyCryptography: "https://chainsafe.io/",
+  ApplyCryptography: "https://medium.com/chainsafe-systems/major-improvement-to-chainsafe-files-ab489d3e52a2",
   Home: (path?: string) => `/home${path ? `?path=${path}` : ""}`,
   Search: (search?: string) => `/search${search ? `?search=${search}` : ""}`,
   Bin: "/bin",
diff --git a/packages/files-ui/src/Components/Modules/FileBrowsers/FileInfoModal.tsx b/packages/files-ui/src/Components/Modules/FileBrowsers/FileInfoModal.tsx
index db294e147a..86f6fd8e20 100644
--- a/packages/files-ui/src/Components/Modules/FileBrowsers/FileInfoModal.tsx
+++ b/packages/files-ui/src/Components/Modules/FileBrowsers/FileInfoModal.tsx
@@ -303,7 +303,7 @@ const FileInfoModal: React.FC<IFileInfoModuleProps> = ({
                           classes.copiedContainer
                         )}
                       >
-                        <Trans>copied !</Trans>
+                        <Trans>copied!</Trans>
                       </Typography>
                     )}
                   </Grid>
diff --git a/packages/files-ui/src/Components/Modules/LoginModule/AuthenticationFactors.tsx b/packages/files-ui/src/Components/Modules/LoginModule/AuthenticationFactors.tsx
index cd8ef73174..70ff337984 100644
--- a/packages/files-ui/src/Components/Modules/LoginModule/AuthenticationFactors.tsx
+++ b/packages/files-ui/src/Components/Modules/LoginModule/AuthenticationFactors.tsx
@@ -89,6 +89,13 @@ const useStyles = makeStyles(({ breakpoints, constants, typography, palette, zIn
       [breakpoints.down("md")]: {
         marginTop: constants.generalUnit * 3
       }
+    },
+    title: {
+      fontWeight: 400,
+      marginBottom: constants.generalUnit * 2.5,
+      [breakpoints.down("md")]: {
+        ...typography.h4
+      }
     }
   })
 )
@@ -109,8 +116,9 @@ const AuthenticationFactors = ({ goToComplete, goToMnemonic, goToPassword, goToS
   return (
     <div className={clsx(classes.root, className)}>
       <Typography
-        variant={desktop ? "h2" : "h4"}
-        component="h1"
+        variant="h2"
+        component="h2"
+        className={classes.title}
       >
         <Trans>
           Your Authentication Factors
diff --git a/packages/files-ui/src/Components/Modules/LoginModule/Complete.tsx b/packages/files-ui/src/Components/Modules/LoginModule/Complete.tsx
index e718159513..b9e6633d32 100644
--- a/packages/files-ui/src/Components/Modules/LoginModule/Complete.tsx
+++ b/packages/files-ui/src/Components/Modules/LoginModule/Complete.tsx
@@ -67,8 +67,8 @@ const useStyles = makeStyles(({ breakpoints, constants, palette, zIndex }: CSFTh
       color: constants.loginModule.completeBg,
       backgroundColor: constants.loginModule.completeText,
       "&:hover": {
-        backgroundColor: palette.success.main,
-        color: constants.loginModule.completeBg
+        backgroundColor: palette.primary.main,
+        color: palette.common.white.main
       }
     }
   })
@@ -99,7 +99,7 @@ const Complete = ({ className }: IComplete) => {
       </Typography>
       <Typography
         component="p"
-        variant="body2"
+        variant="body1"
       >
         <Trans>
           Thanks for taking care of that. You can <br/> adjust these anytime in security settings.
diff --git a/packages/files-ui/src/Components/Modules/LoginModule/ConciseExplainer.tsx b/packages/files-ui/src/Components/Modules/LoginModule/ConciseExplainer.tsx
index ccac24b5c6..fcee471483 100644
--- a/packages/files-ui/src/Components/Modules/LoginModule/ConciseExplainer.tsx
+++ b/packages/files-ui/src/Components/Modules/LoginModule/ConciseExplainer.tsx
@@ -129,7 +129,7 @@ const ConciseExplainer: React.FC<IConciseExplainerProps> = ({ className, onConti
           className={classes.subtitle}
         >
           <Trans>
-            For security reasons, upon signing in we’ll ask you for one of the following to confirm your identity.
+            For security reasons, each time you sign in we’ll ask you for one of the following to confirm your identity.
           </Trans>
           &nbsp;
           <a
diff --git a/packages/files-ui/src/Components/Modules/LoginModule/ConfirmSkip.tsx b/packages/files-ui/src/Components/Modules/LoginModule/ConfirmSkip.tsx
index 1dd8904160..547230a9f7 100644
--- a/packages/files-ui/src/Components/Modules/LoginModule/ConfirmSkip.tsx
+++ b/packages/files-ui/src/Components/Modules/LoginModule/ConfirmSkip.tsx
@@ -24,6 +24,8 @@ const useStyles = makeStyles(({ breakpoints, constants, typography }: CSFTheme)
       }
     },
     warning: {
+      fontSize: 16,
+      lineHeight: "24px",
       [breakpoints.up("md")]: {
         marginTop: constants.generalUnit * 2.5,
         marginBottom: constants.generalUnit * 14.5
@@ -50,6 +52,9 @@ const useStyles = makeStyles(({ breakpoints, constants, typography }: CSFTheme)
         position: "relative",
         left: -constants.generalUnit
       }
+    },
+    importantText:{
+      textDecorationLine: "underline"
     }
   })
 )
@@ -72,7 +77,7 @@ const ConfirmSkip = ({ cancel, confirm, className }: IConfirmSkip) => {
         component="p"
       >
         <Trans>
-          Are you sure?
+          Setup incomplete
         </Trans>
       </Typography>
 
@@ -81,10 +86,8 @@ const ConfirmSkip = ({ cancel, confirm, className }: IConfirmSkip) => {
         component="p"
       >
         <Trans>
-          Without setting up at least three authentication factors,
-          you risk getting locked out of your account.
-          <br/><br/>Remember, you need a minimum of two factors to sign in.
-          If you only have one, you’ll lose access to your account forever.
+          <span className={classes.importantText}>You’re at risk of getting locked out of your account
+          because you only have two auth factors set up.</span> Add at least one more to ensure account recovery.
         </Trans>
       </Typography>
 
@@ -96,7 +99,7 @@ const ConfirmSkip = ({ cancel, confirm, className }: IConfirmSkip) => {
           variant="outline"
         >
           <Trans>
-            Yes I understand
+            I understand the risk
           </Trans>
         </Button>
         <Button
@@ -106,7 +109,7 @@ const ConfirmSkip = ({ cancel, confirm, className }: IConfirmSkip) => {
           variant="primary"
         >
           <Trans>
-            Set up sign in methods
+            Set up auth factors
           </Trans>
         </Button>
       </section>
diff --git a/packages/files-ui/src/Components/Modules/LoginModule/InitialScreen.tsx b/packages/files-ui/src/Components/Modules/LoginModule/InitialScreen.tsx
index 1956cf261e..ca4bf9a65c 100644
--- a/packages/files-ui/src/Components/Modules/LoginModule/InitialScreen.tsx
+++ b/packages/files-ui/src/Components/Modules/LoginModule/InitialScreen.tsx
@@ -12,7 +12,7 @@ import clsx from "clsx"
 import { IdentityProvider } from "@chainsafe/files-api-client"
 
 const useStyles = makeStyles(
-  ({ constants, palette, breakpoints }: CSFTheme) =>
+  ({ constants, palette, breakpoints, typography }: CSFTheme) =>
     createStyles({
       root: {
         backgroundColor: constants.loginModule.background,
@@ -64,7 +64,11 @@ const useStyles = makeStyles(
       },
       button: {
         width: 240,
+        fontWeight: typography.fontWeight.medium,
         marginBottom: constants.generalUnit * 2,
+        "& .icon" : {
+          fontSize: 25
+        },
         "&:last-child": {
           marginBottom: 0
         }
@@ -122,6 +126,9 @@ const useStyles = makeStyles(
         textDecoration: "underline",
         cursor: "pointer",
         textAlign: "center"
+      },
+      web3Button: {
+        minHeight: 41
       }
     })
 )
@@ -251,7 +258,7 @@ const InitialScreen = ({ className }: IInitialScreen) => {
                     setLoginMode("web3")
                     handleSelectWalletAndConnect()
                   }}
-                  className={classes.button}
+                  className={clsx(classes.button, classes.web3Button)}
                   variant="primary"
                   size="large"
                   disabled={maintenanceMode || isConnecting || status !== "initialized"}
@@ -260,35 +267,35 @@ const InitialScreen = ({ className }: IInitialScreen) => {
                 </Button>
                 <Button
                   className={classes.button}
-                  variant="primary"
                   size="large"
                   onClick={() => handleLogin("github")}
                   disabled={maintenanceMode || isConnecting || status !== "initialized"}
                   loading={isConnecting && loginMode === "github"}
+                  variant="secondary"
                 >
-                  <GithubLogoIcon />
+                  <GithubLogoIcon className="icon"/>
                   <Trans>Continue with Github</Trans>
                 </Button>
                 <Button
                   className={classes.button}
-                  variant="primary"
                   size="large"
                   onClick={() => handleLogin("google")}
                   disabled={maintenanceMode || isConnecting || status !== "initialized"}
                   loading={isConnecting && loginMode === "google"}
+                  variant="secondary"
                 >
-                  <GoogleLogoIcon />
+                  <GoogleLogoIcon className="icon"/>
                   <Trans>Continue with Google</Trans>
                 </Button>
                 <Button
                   className={classes.button}
                   size="large"
-                  variant="primary"
                   onClick={() => handleLogin("facebook")}
                   disabled={maintenanceMode || isConnecting || status !== "initialized"}
                   loading={isConnecting && loginMode === "facebook"}
+                  variant="secondary"
                 >
-                  <FacebookLogoIcon />
+                  <FacebookLogoIcon className="icon"/>
                   <Trans>Continue with Facebook</Trans>
                 </Button>
               </section>
diff --git a/packages/files-ui/src/Media/landing/layers/desktop-mobile.png b/packages/files-ui/src/Media/landing/layers/desktop-mobile.png
index 67796a6f79..251a0b9b51 100644
Binary files a/packages/files-ui/src/Media/landing/layers/desktop-mobile.png and b/packages/files-ui/src/Media/landing/layers/desktop-mobile.png differ
diff --git a/packages/files-ui/src/Media/landing/layers/password-key.png b/packages/files-ui/src/Media/landing/layers/password-key.png
index 9820a7c8e3..dfe52b2803 100644
Binary files a/packages/files-ui/src/Media/landing/layers/password-key.png and b/packages/files-ui/src/Media/landing/layers/password-key.png differ
diff --git a/packages/files-ui/src/Media/landing/layers/peaceful-succotash.png b/packages/files-ui/src/Media/landing/layers/peaceful-succotash.png
index 6ff364e343..ff00b5a14b 100644
Binary files a/packages/files-ui/src/Media/landing/layers/peaceful-succotash.png and b/packages/files-ui/src/Media/landing/layers/peaceful-succotash.png differ
diff --git a/packages/files-ui/src/locales/en/messages.po b/packages/files-ui/src/locales/en/messages.po
index a05b658a97..f4162332f5 100644
--- a/packages/files-ui/src/locales/en/messages.po
+++ b/packages/files-ui/src/locales/en/messages.po
@@ -16,6 +16,9 @@ msgstr ""
 msgid "(Change)"
 msgstr "(Change)"
 
+msgid "<0>You’re at risk of getting locked out of your account because you only have two auth factors set up.</0> Add at least one more to ensure account recovery."
+msgstr "<0>You’re at risk of getting locked out of your account because you only have two auth factors set up.</0> Add at least one more to ensure account recovery."
+
 msgid "A backup phrase will be generated and used for your account.<0/>We do not store it and <1>it can only be displayed once</1>. Save it somewhere safe!"
 msgstr "A backup phrase will be generated and used for your account.<0/>We do not store it and <1>it can only be displayed once</1>. Save it somewhere safe!"
 
@@ -34,9 +37,6 @@ msgstr "Add more files"
 msgid "Approve"
 msgstr "Approve"
 
-msgid "Are you sure?"
-msgstr "Are you sure?"
-
 msgid "Backup phrase"
 msgstr "Backup phrase"
 
@@ -217,8 +217,8 @@ msgstr "Folder created successfully"
 msgid "Folders"
 msgstr "Folders"
 
-msgid "For security reasons, upon signing in we’ll ask you for one of the following to confirm your identity."
-msgstr "For security reasons, upon signing in we’ll ask you for one of the following to confirm your identity."
+msgid "For security reasons, each time you sign in we’ll ask you for one of the following to confirm your identity."
+msgstr "For security reasons, each time you sign in we’ll ask you for one of the following to confirm your identity."
 
 msgid "Forget this browser"
 msgstr "Forget this browser"
@@ -256,6 +256,9 @@ msgstr "Hold on, we are logging you in..."
 msgid "Home"
 msgstr "Home"
 
+msgid "I understand the risk"
+msgstr "I understand the risk"
+
 msgid "Info"
 msgstr "Info"
 
@@ -457,15 +460,18 @@ msgstr "Set up"
 msgid "Set up a password"
 msgstr "Set up a password"
 
+msgid "Set up auth factors"
+msgstr "Set up auth factors"
+
 msgid "Set up password"
 msgstr "Set up password"
 
-msgid "Set up sign in methods"
-msgstr "Set up sign in methods"
-
 msgid "Settings"
 msgstr "Settings"
 
+msgid "Setup incomplete"
+msgstr "Setup incomplete"
+
 msgid "Share"
 msgstr "Share"
 
@@ -601,12 +607,6 @@ msgstr "What a fine day it is."
 msgid "What a fine night it is."
 msgstr "What a fine night it is."
 
-msgid "Without setting up at least three authentication factors, you risk getting locked out of your account.<0/><1/>Remember, you need a minimum of two factors to sign in. If you only have one, you’ll lose access to your account forever."
-msgstr "Without setting up at least three authentication factors, you risk getting locked out of your account.<0/><1/>Remember, you need a minimum of two factors to sign in. If you only have one, you’ll lose access to your account forever."
-
-msgid "Yes I understand"
-msgstr "Yes I understand"
-
 msgid "Yes, save it"
 msgstr "Yes, save it"
 
@@ -625,8 +625,8 @@ msgstr "Your Authentication Factors"
 msgid "Your recovery key can be used to restore your account in place of your backup phrase."
 msgstr "Your recovery key can be used to restore your account in place of your backup phrase."
 
-msgid "copied !"
-msgstr "copied !"
+msgid "copied!"
+msgstr "copied!"
 
 msgid "deleted successfully"
 msgstr "deleted successfully"
diff --git a/packages/files-ui/src/locales/fr/messages.mo b/packages/files-ui/src/locales/fr/messages.mo
index a602c61a71..57df0909dc 100644
Binary files a/packages/files-ui/src/locales/fr/messages.mo and b/packages/files-ui/src/locales/fr/messages.mo differ
diff --git a/packages/files-ui/src/locales/fr/messages.po b/packages/files-ui/src/locales/fr/messages.po
index 8334b009fa..e7b4969fa8 100644
--- a/packages/files-ui/src/locales/fr/messages.po
+++ b/packages/files-ui/src/locales/fr/messages.po
@@ -17,6 +17,9 @@ msgstr ""
 msgid "(Change)"
 msgstr "(Changer)"
 
+msgid "<0>You’re at risk of getting locked out of your account because you only have two auth factors set up.</0> Add at least one more to ensure account recovery."
+msgstr "<0> Vous risquez d'être bloqué sur votre compte car vous n'avez configuré que deux facteurs d'authentification.</0> Ajoutez-en au moins un autre pour garantir la récupération du compte."
+
 msgid "A backup phrase will be generated and used for your account.<0/>We do not store it and <1>it can only be displayed once</1>. Save it somewhere safe!"
 msgstr "Une phrase de backup sera générée et utilisé pour ce comte.<0/>Nous ne la sauvergardons pas <1>elle ne peut être montrée qu'une seule fois</1>. Garde la dans un endroit sûr!"
 
@@ -35,9 +38,6 @@ msgstr "Ajoute d'autres fichiers"
 msgid "Approve"
 msgstr "Accepter"
 
-msgid "Are you sure?"
-msgstr "Es-tu certain?"
-
 msgid "Backup phrase"
 msgstr "Phrase de secours"
 
@@ -218,8 +218,8 @@ msgstr "Dossier créé avec succès"
 msgid "Folders"
 msgstr "Dossiers"
 
-msgid "For security reasons, upon signing in we’ll ask you for one of the following to confirm your identity."
-msgstr "Pour des raisons de sécurité, lors de votre connexion, nous vous demanderons l'un des éléments suivants pour confirmer votre identité."
+msgid "For security reasons, each time you sign in we’ll ask you for one of the following to confirm your identity."
+msgstr "Pour des raisons de sécurité, chaque fois que vous vous connectez, nous vous demanderons l'une des informations suivantes pour confirmer votre identité."
 
 msgid "Forget this browser"
 msgstr "Oublier ce navigateur"
@@ -246,7 +246,7 @@ msgid "Great! You’re all done."
 msgstr "Génial! Vous avez terminé."
 
 msgid "Hello again!"
-msgstr ""
+msgstr "Ravis de vous revoir!"
 
 msgid "Hey! You only have two sign-in methods. If you lose that and have only one left, you will be locked out of your account forever."
 msgstr "Hey! Tu ne disposes que de deux méthodes d'authentification. Si tu en perds une, tu seras bloqué pour toujours et ne pourras plus te connecter à ton compte Files."
@@ -257,6 +257,9 @@ msgstr "Un instant, nous te connectons ..."
 msgid "Home"
 msgstr "Accueil"
 
+msgid "I understand the risk"
+msgstr "Je prends le risque"
+
 msgid "Info"
 msgstr "Info"
 
@@ -447,7 +450,7 @@ msgid "Send Feedback"
 msgstr "Donner son avis"
 
 msgid "Set Password"
-msgstr "Définir un Mot de Passe"
+msgstr "Définir un mot de passe"
 
 msgid "Set it up now"
 msgstr "Définir"
@@ -458,15 +461,18 @@ msgstr "Définir"
 msgid "Set up a password"
 msgstr "Définir un mot de passe"
 
+msgid "Set up auth factors"
+msgstr "Configurer"
+
 msgid "Set up password"
 msgstr "Définir un mot de passe"
 
-msgid "Set up sign in methods"
-msgstr "Définir les méthodes d'authentifiction"
-
 msgid "Settings"
 msgstr "Paramètres"
 
+msgid "Setup incomplete"
+msgstr "Configuration incomplète"
+
 msgid "Share"
 msgstr "Partager"
 
@@ -516,7 +522,7 @@ msgid "Terms and Conditions"
 msgstr "Termes et conditions"
 
 msgid "Thanks for taking care of that. You can <0/> adjust these anytime in security settings."
-msgstr "Vous pouvez <0 /> les ajuster à tout moment dans les paramètres de sécurité."
+msgstr "Vous pouvez <0/> les ajuster à tout moment dans les paramètres de sécurité."
 
 msgid "The authentication popup was closed"
 msgstr "Le popup d'authentification a été fermé"
@@ -594,7 +600,7 @@ msgid "Web3: {0}"
 msgstr "Web3: {0}"
 
 msgid "We’ve got a new authentication system in place. All you need to do is enter your password again to migrate your credentials over to the new system."
-msgstr ""
+msgstr "Nous avons mis en place un nouveau système d’authentification. Tout ce que vous avez à faire est de saisir à nouveau votre mot de passe pour migrer vos informations d'identification vers le nouveau système."
 
 msgid "What a fine day it is."
 msgstr "Une belle journée."
@@ -602,12 +608,6 @@ msgstr "Une belle journée."
 msgid "What a fine night it is."
 msgstr "Une belle nuit."
 
-msgid "Without setting up at least three authentication factors, you risk getting locked out of your account.<0/><1/>Remember, you need a minimum of two factors to sign in. If you only have one, you’ll lose access to your account forever."
-msgstr "Si vous ne configurez pas au moins trois facteurs d'authentification, vous risquez de ne plus pouvoir accéder à votre compte. <0 /> <1 /> N'oubliez pas que vous avez besoin d'au moins deux facteurs pour vous connecter. Si vous n'en avez qu'un, vous perdrez l'accès à votre compte pour toujours."
-
-msgid "Yes I understand"
-msgstr "Oui, je comprends"
-
 msgid "Yes, save it"
 msgstr "Oui, l'enregistrer"
 
@@ -626,7 +626,7 @@ msgstr "Vos Facteurs d'Authentification"
 msgid "Your recovery key can be used to restore your account in place of your backup phrase."
 msgstr "Votre clé de récupération peut être utilisée pour restaurer votre compte à la place de votre phrase de sauvegarde."
 
-msgid "copied !"
+msgid "copied!"
 msgstr "copié !"
 
 msgid "deleted successfully"