diff --git a/src/components/EnsureDeviceApp/index.js b/src/components/EnsureDeviceApp/index.js
index f765f392..9c8e7920 100644
--- a/src/components/EnsureDeviceApp/index.js
+++ b/src/components/EnsureDeviceApp/index.js
@@ -11,16 +11,17 @@ import type { State as StoreState } from 'reducers/index'
 import getAddress from 'commands/getAddress'
 
 type OwnProps = {
-  currency: ?CryptoCurrency,
+  currency?: ?CryptoCurrency,
   deviceSelected: ?Device,
-  withGenuineCheck: boolean,
-  account: ?Account,
+  withGenuineCheck?: boolean,
+  account?: ?Account,
   onStatusChange?: (DeviceStatus, AppStatus, ?string) => void,
-  onGenuineCheck: (isGenuine: boolean) => void,
+  onGenuineCheck?: (isGenuine: boolean) => void,
   // TODO prefer children function
   render?: ({
     appStatus: AppStatus,
-    currency: CryptoCurrency,
+    genuineCheckStatus: GenuineCheckStatus,
+    currency: ?CryptoCurrency,
     devices: Device[],
     deviceSelected: ?Device,
     deviceStatus: DeviceStatus,
@@ -36,10 +37,13 @@ type DeviceStatus = 'unconnected' | 'connected'
 
 type AppStatus = 'success' | 'fail' | 'progress'
 
+type GenuineCheckStatus = 'success' | 'fail' | 'progress'
+
 type State = {
   deviceStatus: DeviceStatus,
   appStatus: AppStatus,
   errorMessage: ?string,
+  genuineCheckStatus: GenuineCheckStatus,
 }
 
 const mapStateToProps = (state: StoreState) => ({
@@ -51,6 +55,7 @@ class EnsureDeviceApp extends PureComponent<Props, State> {
     appStatus: 'progress',
     deviceStatus: this.props.deviceSelected ? 'connected' : 'unconnected',
     errorMessage: null,
+    genuineCheckStatus: 'progress',
   }
 
   componentDidMount() {
@@ -159,7 +164,7 @@ class EnsureDeviceApp extends PureComponent<Props, State> {
     await sleep(1)
     if (!this._unmounted) {
       this.setState({ genuineCheckStatus: 'success' })
-      this.props.onGenuineCheck(true)
+      this.props.onGenuineCheck && this.props.onGenuineCheck(true)
     }
   }
 
diff --git a/src/components/Onboarding/helperComponents.js b/src/components/Onboarding/helperComponents.js
index f7d8c312..689358d3 100644
--- a/src/components/Onboarding/helperComponents.js
+++ b/src/components/Onboarding/helperComponents.js
@@ -16,8 +16,6 @@ export const Title = styled(Box).attrs({
 })``
 
 export const Description = styled(Box).attrs({
-  width: 714,
-  height: 48,
   ff: 'Museo Sans|Light',
   fontSize: 5,
   lineHeight: 1.5,
@@ -25,6 +23,7 @@ export const Description = styled(Box).attrs({
   color: 'grey',
 })`
   margin: 10px auto 25px;
+  max-width: 550px;
 `
 export const Inner = styled(Box).attrs({
   horizontal: true,
diff --git a/src/components/Onboarding/index.js b/src/components/Onboarding/index.js
index 5b6ccb3e..1efdff9d 100644
--- a/src/components/Onboarding/index.js
+++ b/src/components/Onboarding/index.js
@@ -19,8 +19,7 @@ import {
 } from 'reducers/onboarding'
 import { getCurrentDevice } from 'reducers/devices'
 
-// TODO: re-write it without auto lock, fixed width of the password modal, not dynamic titles
-import { unlock } from 'reducers/application'
+// import { unlock } from 'reducers/application'
 
 import Box from 'components/base/Box'
 
@@ -31,7 +30,8 @@ import SelectDevice from './steps/SelectDevice'
 import SelectPIN from './steps/SelectPIN'
 import WriteSeed from './steps/WriteSeed'
 import GenuineCheck from './steps/GenuineCheck'
-import SetPassword from './steps/SetPassword'
+// UNTIL IS NEEDED SET PASSWORD IS COMMENTED OUT
+// import SetPassword from './steps/SetPassword'
 import Analytics from './steps/Analytics'
 import Finish from './steps/Finish'
 
@@ -41,7 +41,7 @@ const STEPS = {
   selectPIN: SelectPIN,
   writeSeed: WriteSeed,
   genuineCheck: GenuineCheck,
-  setPassword: SetPassword,
+  // setPassword: SetPassword,
   analytics: Analytics,
   finish: Finish,
   start: Start,
@@ -58,7 +58,7 @@ const mapDispatchToProps = {
   nextStep,
   prevStep,
   jumpStep,
-  unlock,
+  // unlock,
 }
 
 type Props = {
@@ -80,7 +80,7 @@ export type StepProps = {
   nextStep: Function,
   jumpStep: Function,
   finish: Function,
-  savePassword: Function,
+  // savePassword: Function,
   getDeviceInfo: Function,
   setGenuineCheckFail: Function,
   isLedgerNano: Function,
@@ -89,15 +89,15 @@ export type StepProps = {
 class Onboarding extends PureComponent<Props> {
   getDeviceInfo = () => this.props.getCurrentDevice
   finish = () => this.props.saveSettings({ hasCompletedOnboarding: true })
-  savePassword = hash => {
-    this.props.saveSettings({
-      password: {
-        isEnabled: hash !== undefined,
-        value: hash,
-      },
-    })
-    this.props.unlock()
-  }
+  // savePassword = hash => {
+  //   this.props.saveSettings({
+  //     password: {
+  //       isEnabled: hash !== undefined,
+  //       value: hash,
+  //     },
+  //   })
+  //   this.props.unlock()
+  // }
 
   render() {
     const { hasCompletedOnboarding, onboarding, prevStep, nextStep, jumpStep, t } = this.props
@@ -122,7 +122,7 @@ class Onboarding extends PureComponent<Props> {
       nextStep,
       jumpStep,
       finish: this.finish,
-      savePassword: this.savePassword,
+      // savePassword: this.savePassword,
       getDeviceInfo: this.getDeviceInfo,
     }
 
diff --git a/src/components/Onboarding/steps/Analytics.js b/src/components/Onboarding/steps/Analytics.js
index 32ed6d1a..f46e1c76 100644
--- a/src/components/Onboarding/steps/Analytics.js
+++ b/src/components/Onboarding/steps/Analytics.js
@@ -4,7 +4,6 @@ import React from 'react'
 import styled from 'styled-components'
 
 import Box from 'components/base/Box'
-import IconAnalytics from 'icons/onboarding/Analytics'
 import CheckBox from 'components/base/CheckBox'
 import { Title, Description } from '../helperComponents'
 import OnboardingFooter from '../OnboardingFooter'
@@ -17,25 +16,31 @@ export default (props: StepProps) => {
     <Box sticky pt={150}>
       <Box grow alignItems="center">
         <Title>{t('onboarding:analytics.title')}</Title>
-        <Description style={{ maxWidth: 714 }}>{t('onboarding:analytics.desc')}</Description>
-        <DeviceIcon style={{ padding: 15 }}>
-          <IconAnalytics />
-        </DeviceIcon>
-        <Box horizontal flow={2} align="center">
-          <CheckBox isChecked={false} />
-          <AnalyticsText>
-            This is a long text, please replace it with the final wording once it’s done.
-            <br />
-            Lorem ipsum dolor amet ledger lorem dolor ipsum amet
-          </AnalyticsText>
-        </Box>
-        <Box horizontal flow={2} align="center">
-          <CheckBox isChecked={false} />
-          <AnalyticsText>
-            This is a long text, please replace it with the final wording once it’s done.
-            <br />
-            Lorem ipsum dolor amet ledger lorem dolor ipsum amet
-          </AnalyticsText>
+        <Description>{t('onboarding:analytics.desc')}</Description>
+
+        <Box mt={5}>
+          <Container>
+            <Box justify="center">
+              <Box horizontal>
+                <AnalyticsTitle>{t('onboarding:analytics.shareDiagnostics.title')}</AnalyticsTitle>
+              </Box>
+              <AnalyticsText>{t('onboarding:analytics.shareDiagnostics.desc')}</AnalyticsText>
+            </Box>
+            <Box alignItems="center" horizontal mx={5}>
+              <CheckBox isChecked={false} />
+            </Box>
+          </Container>
+          <Container>
+            <Box justify="center">
+              <Box horizontal>
+                <AnalyticsTitle>{t('onboarding:analytics.shareDiagnostics.title')}</AnalyticsTitle>
+              </Box>
+              <AnalyticsText>{t('onboarding:analytics.shareDiagnostics.desc')}</AnalyticsText>
+            </Box>
+            <Box alignItems="center" horizontal mx={5}>
+              <CheckBox isChecked={false} />
+            </Box>
+          </Container>
         </Box>
       </Box>
       <OnboardingFooter
@@ -52,17 +57,23 @@ export default (props: StepProps) => {
 
 export const AnalyticsText = styled(Box).attrs({
   ff: 'Open Sans|Regular',
-  fontSize: 4,
+  fontSize: 3,
   textAlign: 'left',
   color: 'smoke',
 })`
-  margin: 10px auto 25px;
-  padding-left: 10px;
+  max-width: 450px;
+`
+export const AnalyticsTitle = styled(Box).attrs({
+  ff: 'Open Sans|SemiBold',
+  fontSize: 4,
+  textAlign: 'left',
+})`
+  margin-bottom: 5px;
 `
-const DeviceIcon = styled(Box).attrs({
-  alignItems: 'center',
-  justifyContent: 'center',
-  color: 'graphite',
+const Container = styled(Box).attrs({
+  horizontal: true,
+  p: 5,
 })`
-  width: 55px;
+  max-height: 90px;
+  width: 620px;
 `
diff --git a/src/components/Onboarding/steps/GenuineCheck.js b/src/components/Onboarding/steps/GenuineCheck.js
index 907470d6..4ed6fcb5 100644
--- a/src/components/Onboarding/steps/GenuineCheck.js
+++ b/src/components/Onboarding/steps/GenuineCheck.js
@@ -118,7 +118,7 @@ class GenuineCheck extends PureComponent<StepProps, State> {
       <Box sticky pt={150}>
         <Box grow alignItems="center">
           <Title>{t('onboarding:genuineCheck.title')}</Title>
-          <Description style={{ maxWidth: 536 }}>{t('onboarding:genuineCheck.desc')}</Description>
+          <Description>{t('onboarding:genuineCheck.desc')}</Description>
           <Box mt={5}>
             <CardWrapper>
               <Box justify="center">
@@ -291,7 +291,7 @@ const CardWrapper = styled(Card).attrs({
   p: 5,
 })`
   max-height: 97px;
-  min-width: 620px;
+  width: 620px;
   border: ${p => `1px ${p.isDisabled ? 'dashed' : 'solid'} ${p.theme.colors.fog}`};
   pointer-events: ${p => (p.isDisabled ? 'none' : 'auto')};
   background-color: ${p => (p.isDisabled ? p.theme.colors.lightGrey : p.theme.colors.white)};
diff --git a/src/components/Onboarding/steps/SelectDevice.js b/src/components/Onboarding/steps/SelectDevice.js
index 067ddfb9..9d1012e2 100644
--- a/src/components/Onboarding/steps/SelectDevice.js
+++ b/src/components/Onboarding/steps/SelectDevice.js
@@ -28,7 +28,7 @@ class SelectDevice extends PureComponent<StepProps, {}> {
       <Box sticky pt={150}>
         <Box grow alignItems="center">
           <Title>{t('onboarding:selectDevice.title')}</Title>
-          <Description style={{ maxWidth: 536 }}>{t('onboarding:selectDevice.desc')}</Description>
+          <Description>{t('onboarding:selectDevice.desc')}</Description>
           <Box>
             <Inner>
               <DeviceContainer
diff --git a/src/components/Onboarding/steps/SetPassword.js b/src/components/Onboarding/steps/SetPassword.js
index d3ef73ba..b844a4fb 100644
--- a/src/components/Onboarding/steps/SetPassword.js
+++ b/src/components/Onboarding/steps/SetPassword.js
@@ -1,91 +1,93 @@
-// @flow
+// UNTIL IS NEEDED SET PASSWORD STEP IS COMMENTED OUT
 
-import React, { PureComponent } from 'react'
-import bcrypt from 'bcryptjs'
-
-import { setEncryptionKey } from 'helpers/db'
-
-import Box from 'components/base/Box'
-import Button from 'components/base/Button'
-
-import IconSetPassword from 'icons/onboarding/SetPassword'
-import PasswordModal from 'components/SettingsPage/PasswordModal'
-import OnboardingFooter from '../OnboardingFooter'
-
-import type { StepProps } from '..'
-
-import { Title, Description } from '../helperComponents'
-
-type State = {
-  isPasswordModalOpened: boolean,
-  isPasswordEnabled: boolean,
-}
-
-class SetPassword extends PureComponent<StepProps, State> {
-  state = {
-    isPasswordModalOpened: false,
-    isPasswordEnabled: false,
-  }
-
-  handleOpenPasswordModal = () => {
-    this.setState({ isPasswordModalOpened: true })
-  }
-  handleClosePasswordModal = () => {
-    this.setState({ isPasswordModalOpened: false })
-  }
-  handleChangePassword = (password: string) => {
-    window.requestIdleCallback(() => {
-      setEncryptionKey('accounts', password)
-      const hash = password ? bcrypt.hashSync(password, 8) : undefined
-      this.props.savePassword(hash)
-    })
-  }
-
-  handleInputChange = (key: string) => (value: string) => {
-    this.setState({ [key]: value })
-  }
-
-  render() {
-    const { nextStep, prevStep, t } = this.props
-    const { isPasswordModalOpened, isPasswordEnabled } = this.state
-    return (
-      <Box sticky pt={150}>
-        <Box grow alignItems="center">
-          <Title>{t('onboarding:setPassword.title')}</Title>
-          <Description style={{ maxWidth: 714 }}>{t('onboarding:setPassword.desc')}</Description>
-          <IconSetPassword />
-          <Box style={{ paddingTop: 35 }}>
-            <Button small primary onClick={() => this.handleOpenPasswordModal()}>
-              Set Password
-            </Button>
-          </Box>
-          {/* we might not be able to re-use what we have currently without modifications
-            the title and descriptions are not dynamic, we might need deffirent size as well */}
-          {isPasswordModalOpened && (
-            <PasswordModal
-              t={t}
-              isOpened={isPasswordModalOpened}
-              onClose={this.handleClosePasswordModal}
-              onChangePassword={this.handleChangePassword}
-              isPasswordEnabled={isPasswordEnabled}
-              currentPasswordHash=""
-            />
-          )}
-          <Box onClick={() => nextStep()} style={{ padding: 15 }}>
-            <Button>Skip this step</Button>
-          </Box>
-        </Box>
-        <OnboardingFooter
-          horizontal
-          align="center"
-          flow={2}
-          t={t}
-          nextStep={nextStep}
-          prevStep={prevStep}
-        />
-      </Box>
-    )
-  }
-}
-
-export default SetPassword
+// // @flow
+//
+// import React, { PureComponent } from 'react'
+// import bcrypt from 'bcryptjs'
+//
+// import { setEncryptionKey } from 'helpers/db'
+//
+// import Box from 'components/base/Box'
+// import Button from 'components/base/Button'
+//
+// import IconSetPassword from 'icons/onboarding/SetPassword'
+// import PasswordModal from 'components/SettingsPage/PasswordModal'
+// import OnboardingFooter from '../OnboardingFooter'
+//
+// import type { StepProps } from '..'
+//
+// import { Title, Description } from '../helperComponents'
+//
+// type State = {
+//   isPasswordModalOpened: boolean,
+//   isPasswordEnabled: boolean,
+// }
+//
+// class SetPassword extends PureComponent<StepProps, State> {
+//   state = {
+//     isPasswordModalOpened: false,
+//     isPasswordEnabled: false,
+//   }
+//
+//   handleOpenPasswordModal = () => {
+//     this.setState({ isPasswordModalOpened: true })
+//   }
+//   handleClosePasswordModal = () => {
+//     this.setState({ isPasswordModalOpened: false })
+//   }
+//   handleChangePassword = (password: string) => {
+//     window.requestIdleCallback(() => {
+//       setEncryptionKey('accounts', password)
+//       const hash = password ? bcrypt.hashSync(password, 8) : undefined
+//       this.props.savePassword(hash)
+//     })
+//   }
+//
+//   handleInputChange = (key: string) => (value: string) => {
+//     this.setState({ [key]: value })
+//   }
+//
+//   render() {
+//     const { nextStep, prevStep, t } = this.props
+//     const { isPasswordModalOpened, isPasswordEnabled } = this.state
+//     return (
+//       <Box sticky pt={150}>
+//         <Box grow alignItems="center">
+//           <Title>{t('onboarding:setPassword.title')}</Title>
+//           <Description>{t('onboarding:setPassword.desc')}</Description>
+//           <IconSetPassword />
+//           <Box style={{ paddingTop: 35 }}>
+//             <Button small primary onClick={() => this.handleOpenPasswordModal()}>
+//               Set Password
+//             </Button>
+//           </Box>
+//           {/* we might not be able to re-use what we have currently without modifications
+//             the title and descriptions are not dynamic, we might need deffirent size as well */}
+//           {isPasswordModalOpened && (
+//             <PasswordModal
+//               t={t}
+//               isOpened={isPasswordModalOpened}
+//               onClose={this.handleClosePasswordModal}
+//               onChangePassword={this.handleChangePassword}
+//               isPasswordEnabled={isPasswordEnabled}
+//               currentPasswordHash=""
+//             />
+//           )}
+//           <Box onClick={() => nextStep()} style={{ padding: 15 }}>
+//             <Button>Skip this step</Button>
+//           </Box>
+//         </Box>
+//         <OnboardingFooter
+//           horizontal
+//           align="center"
+//           flow={2}
+//           t={t}
+//           nextStep={nextStep}
+//           prevStep={prevStep}
+//         />
+//       </Box>
+//     )
+//   }
+// }
+//
+// export default SetPassword
diff --git a/src/components/Onboarding/steps/WriteSeed.js b/src/components/Onboarding/steps/WriteSeed.js
index d7378458..21828931 100644
--- a/src/components/Onboarding/steps/WriteSeed.js
+++ b/src/components/Onboarding/steps/WriteSeed.js
@@ -60,7 +60,7 @@ export default (props: StepProps) => {
       <Box grow alignItems="center">
         <Box align="center" mb={5}>
           <Title>{t('onboarding:writeSeed.title')}</Title>
-          <Description style={{ maxWidth: 714 }}>{t('onboarding:writeSeed.desc')}</Description>
+          <Description>{t('onboarding:writeSeed.desc')}</Description>
         </Box>
         <Box align="center">
           <Inner style={{ width: 760 }}>
diff --git a/src/components/base/InputPassword/index.js b/src/components/base/InputPassword/index.js
index 84bc6656..f7c83865 100644
--- a/src/components/base/InputPassword/index.js
+++ b/src/components/base/InputPassword/index.js
@@ -106,7 +106,7 @@ class InputPassword extends PureComponent<Props, State> {
         {withStrength && (
           <Fragment>
             <Box flow={1} horizontal>
-              {[0, 1, 2, 3, 4].map(v => (
+              {[0, 1, 2].map(v => (
                 <Strength
                   key={v}
                   warning={passwordStrength <= 1}
diff --git a/src/reducers/onboarding.js b/src/reducers/onboarding.js
index 5990dd9f..86bc857e 100644
--- a/src/reducers/onboarding.js
+++ b/src/reducers/onboarding.js
@@ -81,15 +81,16 @@ const state: OnboardingState = {
         showBreadcrumb: true,
       },
     },
-    {
-      name: 'setPassword',
-      label: 'Set Password',
-      options: {
-        showFooter: false,
-        showBackground: true,
-        showBreadcrumb: true,
-      },
-    },
+    // UNTIL IS NEEDED SET PASSWORD IS COMMENTED OUT
+    // {
+    //   name: 'setPassword',
+    //   label: 'Set Password',
+    //   options: {
+    //     showFooter: false,
+    //     showBackground: true,
+    //     showBreadcrumb: true,
+    //   },
+    // },
     {
       name: 'analytics',
       label: 'Analytics & Bug report',
diff --git a/static/i18n/en/onboarding.yml b/static/i18n/en/onboarding.yml
index ea52a172..bcef3cf3 100644
--- a/static/i18n/en/onboarding.yml
+++ b/static/i18n/en/onboarding.yml
@@ -77,11 +77,17 @@ genuineCheck:
       title: Something is wrong with your Ledger Blue
       desc: A problem occurred with your Ledger Blue. Contact Ledger Support to get assistance or go back to the security check.
 setPassword:
-  title: This is the title of the screen. 1 line is the maximum
-  desc: This is a long text, please replace it with the final wording once it’s done. Lorem ipsum dolor amet ledger lorem dolor ipsum amet
+  title: Choose a password to securely access Ledger Live
+  desc: Use uppercase, lowercase, special characters (#, @, !, ?) and numbers for a stronger password.
 analytics:
-  title: This is the title of the screen. 1 line is the maximum
+  title: Help Ledger to improve its products and services
   desc: This is a long text, please replace it with the final wording once it’s done.
Lorem ipsum dolor amet ledger lorem dolor ipsum amet
+  shareDiagnostics:
+    title: Share analytics
+    desc: Help Ledger improve its products and services by automatically sending diagnostics and usage data.
+  shareData:
+    title: Share analytics
+    desc: Help Ledger improve its products and services by automatically sending diagnostics and usage data.
 finish:
   title: This is the title of the screen. 1 line is the maximum
   desc: This is a long text, please replace it with the final wording once it’s done.
Lorem ipsum dolor amet ledger lorem dolor ipsum amet