diff --git a/ui/main.qml b/ui/main.qml
index da059300df..414e7c2fe0 100644
--- a/ui/main.qml
+++ b/ui/main.qml
@@ -243,7 +243,7 @@ ApplicationWindow {
 
         DSM.State {
             id: onboardingState
-            initialState: hasAccounts ? stateLogin : stateIntro
+            initialState: hasAccounts ? stateLogin : keysMainState
 
             DSM.State {
                 id: stateIntro
diff --git a/ui/onboarding/EnterSeedPhraseModal.qml b/ui/onboarding/EnterSeedPhraseModal.qml
index e97b7fa628..f7ae7e46f9 100644
--- a/ui/onboarding/EnterSeedPhraseModal.qml
+++ b/ui/onboarding/EnterSeedPhraseModal.qml
@@ -19,7 +19,8 @@ ModalPopup {
     TextArea {
         id: mnemonicTextField
         anchors.top: parent.top
-        anchors.bottom: errorText.top
+        anchors.topMargin: 40
+        height: 100
         anchors.left: parent.left
         anchors.leftMargin: 76
         anchors.right: parent.right
@@ -28,9 +29,13 @@ ModalPopup {
         horizontalAlignment: TextEdit.AlignHCenter
         verticalAlignment: TextEdit.AlignVCenter
         font.pixelSize: 15
-        font.bold: true
+        font.weight: Font.DemiBold
         placeholderText: qsTr("Start with the first word")
         placeholderTextColor: Style.current.secondaryText
+        selectByMouse: true
+        selectByKeyboard: true
+        selectionColor: Style.current.secondaryBackground
+        selectedTextColor: Style.current.secondaryText
         
         color: Style.current.textColor
 
@@ -45,6 +50,8 @@ ModalPopup {
         text: Utils.seedPhraseWordCountText(mnemonicTextField.text)
         anchors.right: parent.right
         anchors.top: mnemonicTextField.bottom
+        anchors.topMargin: Style.current.smallPadding
+        color: Style.current.secondaryText
     }
 
     StyledText {
@@ -53,8 +60,8 @@ ModalPopup {
         color: Style.current.danger
         anchors.left: parent.left
         anchors.right: parent.right
-        anchors.bottom: helpText.top
-        anchors.bottomMargin: Style.current.smallPadding
+        anchors.top: mnemonicTextField.bottom
+        anchors.topMargin: Style.current.smallPadding
         horizontalAlignment: Text.AlignHCenter
     }
 
@@ -65,6 +72,7 @@ ModalPopup {
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.bottom: parent.bottom
         anchors.bottomMargin: 0
+        horizontalAlignment: TextEdit.AlignHCenter
         color: Style.current.secondaryText
         font.pixelSize: 12
     }
diff --git a/ui/onboarding/KeysMain.qml b/ui/onboarding/KeysMain.qml
index a0e0d32004..29e31b842d 100644
--- a/ui/onboarding/KeysMain.qml
+++ b/ui/onboarding/KeysMain.qml
@@ -35,6 +35,8 @@ Page {
             anchors.top: parent.top
             fillMode: Image.PreserveAspectFit
             source: Universal.theme === Universal.Dark ? "img/keys-dark@2x.jpg" : "img/keys@2x.jpg"
+            width: 160
+            height: 160
         }
 
         StyledText {
diff --git a/ui/onboarding/MnemonicRecoverySuccessModal.qml b/ui/onboarding/MnemonicRecoverySuccessModal.qml
index 408b25ea12..1bbfcc8dcb 100644
--- a/ui/onboarding/MnemonicRecoverySuccessModal.qml
+++ b/ui/onboarding/MnemonicRecoverySuccessModal.qml
@@ -8,14 +8,14 @@ import "../shared/status"
 ModalPopup {
     id: popup
     title: qsTr("Your keys have been successfully recovered")
-    height: 500
+    height: 400
 
     signal buttonClicked()
 
     StyledText {
         id: info
         anchors.top: parent.top
-        anchors.topMargin: Style.current.bigPadding*2
+        anchors.topMargin: Style.current.bigPadding
         anchors.left: parent.left
         anchors.right: parent.right
         anchors.leftMargin: Style.current.bigPadding