diff --git a/src/app/commoncomponents/InfoBox.qml b/src/app/commoncomponents/InfoBox.qml
index e277a0a747a21d35b0080a164e418fc5e96cd740..2006000511afafa1d284552c3bfa5adfe7ba3899 100644
--- a/src/app/commoncomponents/InfoBox.qml
+++ b/src/app/commoncomponents/InfoBox.qml
@@ -21,7 +21,7 @@ import QtQuick.Controls
 import net.jami.Models 1.1
 import net.jami.Constants 1.1
 
-Rectangle {
+Control {
     id: root
 
     property string icoSource: ""
@@ -32,9 +32,7 @@ Rectangle {
     width: 190
     height: infos.implicitHeight
 
-    color: JamiTheme.transparentColor
-
-    ColumnLayout {
+    contentItem: ColumnLayout {
         id: infos
         anchors.fill: parent
 
@@ -79,6 +77,7 @@ Rectangle {
             color: JamiTheme.textColor
             wrapMode: Text.WordWrap
             text: description
+            lineHeight: 1.3
         }
     }
 }
diff --git a/src/app/wizardview/components/CreateAccountPage.qml b/src/app/wizardview/components/CreateAccountPage.qml
index 4c414741856cc70a32264d8f03663a916a5175f8..b478916a1d12cb2b5d1895813c6dac987705d04c 100644
--- a/src/app/wizardview/components/CreateAccountPage.qml
+++ b/src/app/wizardview/components/CreateAccountPage.qml
@@ -289,9 +289,9 @@ Rectangle {
                     text: !enabled ? JamiStrings.creatingAccount : root.isRendezVous ? JamiStrings.chooseName : JamiStrings.joinJami
                     enabled: usernameEdit.nameRegistrationState === UsernameTextEdit.NameRegistrationState.FREE || usernameEdit.nameRegistrationState === UsernameTextEdit.NameRegistrationState.BLANK
 
-                    KeyNavigation.tab: customizeButton
+                    KeyNavigation.tab: encryptButton
                     KeyNavigation.up: usernameEdit
-                    KeyNavigation.down: customizeButton
+                    KeyNavigation.down: encryptButton
 
                     onClicked: {
                         WizardViewStepModel.accountCreationInfo = JamiQmlUtils.setUpAccountCreationInputPara({
@@ -340,6 +340,7 @@ Rectangle {
                         KeyNavigation.tab: customizeButton
                         KeyNavigation.up: chooseUsernameButton
                         KeyNavigation.down: backButton
+                        KeyNavigation.right: customizeButton
 
                         onClicked: {
                             var dlg = viewCoordinator.presentDialog(appWindow, "wizardview/components/EncryptAccountPopup.qml");
@@ -347,6 +348,8 @@ Rectangle {
                                 advancedButtons.chosenPassword = password;
                             });
                         }
+
+
                     }
 
                     MaterialButton {
@@ -369,6 +372,7 @@ Rectangle {
 
                         KeyNavigation.tab: backButton
                         KeyNavigation.up: chooseUsernameButton
+                        KeyNavigation.left: encryptButton
                         KeyNavigation.down: backButton
 
                         onClicked: {
diff --git a/src/app/wizardview/components/EncryptAccountPopup.qml b/src/app/wizardview/components/EncryptAccountPopup.qml
index 597e4670487e1a9da2e3d5b0faab87ac54e883fb..69b9329f193f319f57a33982dfc76f85d5b2115e 100644
--- a/src/app/wizardview/components/EncryptAccountPopup.qml
+++ b/src/app/wizardview/components/EncryptAccountPopup.qml
@@ -18,6 +18,7 @@
 import QtQuick
 import net.jami.Adapters 1.1
 import net.jami.Constants 1.1
+import QtQuick.Controls
 import QtQuick.Layouts
 import "../../commoncomponents"
 
@@ -92,18 +93,19 @@ BaseModalDialog {
             }
         }
 
-        Rectangle {
-            radius: 5
-            color: JamiTheme.infoRectangleColor
-            Layout.fillWidth: true
-            Layout.minimumHeight: infoLayout.height + 35
+        Control {
+            Layout.preferredWidth: 400 - 2 * popupMargins
             Layout.topMargin: 20
+            padding: 14
+
+            background: Rectangle {
+                radius: 5
+                color: JamiTheme.infoRectangleColor
+            }
 
-            RowLayout {
+            contentItem: RowLayout {
                 id: infoLayout
                 anchors.centerIn: parent
-                width: parent.width - 35
-                anchors.margins: 14
                 spacing: 10
 
                 ResponsiveImage{
@@ -121,7 +123,8 @@ BaseModalDialog {
                     color: JamiTheme.textColor
                     wrapMode: Text.WordWrap
                     text: JamiStrings.encryptWarning
-                    font.pixelSize: JamiTheme.headerFontSize
+                    font.pixelSize: JamiTheme.menuFontSize
+                    lineHeight: 1.3
                 }
             }
         }
diff --git a/src/app/wizardview/components/GoodToKnowPopup.qml b/src/app/wizardview/components/GoodToKnowPopup.qml
index 8cfde50ee377bd483c8c34de7da8055461597089..c0f467923843f76d96cc3ba6acf9c78777d12d19 100644
--- a/src/app/wizardview/components/GoodToKnowPopup.qml
+++ b/src/app/wizardview/components/GoodToKnowPopup.qml
@@ -30,7 +30,8 @@ BaseModalDialog {
     onClosed: accepted()
 
     popupContent: Column {
-        spacing: 20
+        spacing: 5
+        width: 400 - 2 * root.popupMargins
 
         InfoBox {
             id: info
diff --git a/src/app/wizardview/components/WelcomePage.qml b/src/app/wizardview/components/WelcomePage.qml
index f2c50b0afe594f529f7a0ef08fceba54751290a9..626f595d01850ac40cb4725fd6d258b8774e4469 100644
--- a/src/app/wizardview/components/WelcomePage.qml
+++ b/src/app/wizardview/components/WelcomePage.qml
@@ -382,11 +382,15 @@ Rectangle {
         }
     }
 
-    BackButton {
+    JamiPushButton {
         id: backButton
 
         objectName: "welcomePageBackButton"
 
+        preferredSize: 36
+        imageContainerWidth: 20
+        source: JamiResources.ic_arrow_back_24dp_svg
+
         anchors.left: parent.left
         anchors.top: parent.top
         anchors.margins: JamiTheme.wizardViewPageBackButtonMargins