diff --git a/app/src/main/java/org/linphone/assistant/AssistantActivity.java b/app/src/main/java/org/linphone/assistant/AssistantActivity.java
index f85b7652a..a04088191 100644
--- a/app/src/main/java/org/linphone/assistant/AssistantActivity.java
+++ b/app/src/main/java/org/linphone/assistant/AssistantActivity.java
@@ -92,7 +92,7 @@ public class AssistantActivity extends Activity
 
     public DialPlan country;
 
-    private ImageView mBack, mCancel;
+    private ImageView mBack /*, mCancel*/;
     private AssistantFragmentsEnum mCurrentFragment;
     private AssistantFragmentsEnum mLastFragment;
     private AssistantFragmentsEnum mFirstFragment;
@@ -280,8 +280,8 @@ public class AssistantActivity extends Activity
     private void initUI() {
         mBack = findViewById(R.id.back);
         mBack.setOnClickListener(this);
-        mCancel = findViewById(R.id.assistant_cancel);
-        mCancel.setOnClickListener(this);
+        // mCancel = findViewById(R.id.assistant_cancel);
+        // mCancel.setOnClickListener(this);
     }
 
     private void changeFragment(Fragment newFragment) {
@@ -296,7 +296,7 @@ public class AssistantActivity extends Activity
         int id = v.getId();
         boolean firstLaunch = LinphonePreferences.instance().isFirstLaunch();
 
-        if (id == R.id.assistant_cancel) {
+        /*if (id == R.id.assistant_cancel) {
             hideKeyboard();
             LinphonePreferences.instance().firstLaunchSuccessful();
             if (getResources().getBoolean(R.bool.assistant_cancel_move_to_back)) {
@@ -305,9 +305,21 @@ public class AssistantActivity extends Activity
                 if (firstLaunch) startActivity(new Intent().setClass(this, LinphoneActivity.class));
                 finish();
             }
-        } else if (id == R.id.back) {
+        } else*/
+        if (id == R.id.back) {
             hideKeyboard();
-            onBackPressed();
+            if (mCurrentFragment == AssistantFragmentsEnum.WELCOME) {
+                LinphonePreferences.instance().firstLaunchSuccessful();
+                if (getResources().getBoolean(R.bool.assistant_cancel_move_to_back)) {
+                    moveTaskToBack(true);
+                } else {
+                    if (firstLaunch)
+                        startActivity(new Intent().setClass(this, LinphoneActivity.class));
+                    finish();
+                }
+            } else {
+                onBackPressed();
+            }
         }
     }
 
@@ -427,7 +439,7 @@ public class AssistantActivity extends Activity
             changeFragment(fragment);
             mCurrentFragment = AssistantFragmentsEnum.ECHO_CANCELLER_CALIBRATION;
             mBack.setVisibility(View.VISIBLE);
-            mCancel.setEnabled(false);
+            mBack.setEnabled(false);
         } else {
             checkAndRequestAudioPermission();
         }
@@ -529,14 +541,12 @@ public class AssistantActivity extends Activity
         changeFragment(mFragment);
         country = null;
         mCurrentFragment = AssistantFragmentsEnum.WELCOME;
-        mBack.setVisibility(View.INVISIBLE);
     }
 
     public void displayLoginGeneric() {
         mFragment = new LoginFragment();
         changeFragment(mFragment);
         mCurrentFragment = AssistantFragmentsEnum.LOGIN;
-        mBack.setVisibility(View.VISIBLE);
     }
 
     public void displayLoginLinphone(String username, String password) {
@@ -549,7 +559,6 @@ public class AssistantActivity extends Activity
         mFragment.setArguments(extras);
         changeFragment(mFragment);
         mCurrentFragment = AssistantFragmentsEnum.LINPHONE_LOGIN;
-        mBack.setVisibility(View.VISIBLE);
     }
 
     public void displayCreateAccount() {
@@ -560,7 +569,6 @@ public class AssistantActivity extends Activity
         mFragment.setArguments(extra);
         changeFragment(mFragment);
         mCurrentFragment = AssistantFragmentsEnum.CREATE_ACCOUNT;
-        mBack.setVisibility(View.VISIBLE);
     }
 
     public void displayRemoteProvisioning(String url) {
@@ -570,7 +578,6 @@ public class AssistantActivity extends Activity
         mFragment.setArguments(extra);
         changeFragment(mFragment);
         mCurrentFragment = AssistantFragmentsEnum.REMOTE_PROVISIONING;
-        mBack.setVisibility(View.VISIBLE);
     }
 
     public void displayQRCodeReader() {
@@ -581,7 +588,6 @@ public class AssistantActivity extends Activity
             mFragment = new QrCodeFragment();
             changeFragment(mFragment);
             mCurrentFragment = AssistantFragmentsEnum.QRCODE_READER;
-            mBack.setVisibility(View.VISIBLE);
         }
     }
 
@@ -590,7 +596,6 @@ public class AssistantActivity extends Activity
         changeFragment(mFragment);
         mLastFragment = mCurrentFragment;
         mCurrentFragment = AssistantFragmentsEnum.COUNTRY_CHOOSER;
-        mBack.setVisibility(View.VISIBLE);
     }
 
     private void launchDownloadCodec() {
@@ -603,8 +608,7 @@ public class AssistantActivity extends Activity
                 CodecDownloaderFragment codecFragment = new CodecDownloaderFragment();
                 changeFragment(codecFragment);
                 mCurrentFragment = AssistantFragmentsEnum.DOWNLOAD_CODEC;
-                mBack.setVisibility(View.VISIBLE);
-                mCancel.setEnabled(false);
+                mBack.setEnabled(false);
             } else goToLinphoneActivity();
         } else {
             goToLinphoneActivity();
@@ -706,7 +710,6 @@ public class AssistantActivity extends Activity
         changeFragment(fragment);
 
         mCurrentFragment = AssistantFragmentsEnum.CREATE_ACCOUNT_ACTIVATION;
-        mBack.setVisibility(View.INVISIBLE);
     }
 
     public void displayAssistantCodeConfirm(
@@ -723,7 +726,6 @@ public class AssistantActivity extends Activity
         changeFragment(fragment);
 
         mCurrentFragment = AssistantFragmentsEnum.CREATE_ACCOUNT_CODE_ACTIVATION;
-        mBack.setVisibility(View.INVISIBLE);
     }
 
     public void displayAssistantLinphoneLogin(String phone, String dialcode) {
@@ -736,7 +738,6 @@ public class AssistantActivity extends Activity
         changeFragment(fragment);
 
         mCurrentFragment = AssistantFragmentsEnum.LINPHONE_LOGIN;
-        mBack.setVisibility(View.VISIBLE);
     }
 
     public void isAccountVerified() {
diff --git a/app/src/main/res/layout-land/main.xml b/app/src/main/res/layout-land/main.xml
index c8739ae38..360487c7b 100644
--- a/app/src/main/res/layout-land/main.xml
+++ b/app/src/main/res/layout-land/main.xml
@@ -44,7 +44,7 @@
                     style="@style/font1"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
-                    android:layout_weight="0.4"
+                    android:layout_weight="0.6"
                     android:gravity="center"
                     android:maxLines="1"
                     android:padding="15dp" />
diff --git a/app/src/main/res/layout-sw533dp-land/main.xml b/app/src/main/res/layout-sw533dp-land/main.xml
index 30f52cdfa..639e5c8e8 100644
--- a/app/src/main/res/layout-sw533dp-land/main.xml
+++ b/app/src/main/res/layout-sw533dp-land/main.xml
@@ -44,7 +44,7 @@
                     style="@style/font1"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
-                    android:layout_weight="0.4"
+                    android:layout_weight="0.6"
                     android:gravity="center"
                     android:maxLines="1"
                     android:padding="15dp" />
diff --git a/app/src/main/res/layout-sw533dp/main.xml b/app/src/main/res/layout-sw533dp/main.xml
index 07d988862..43ffcd0e4 100644
--- a/app/src/main/res/layout-sw533dp/main.xml
+++ b/app/src/main/res/layout-sw533dp/main.xml
@@ -44,7 +44,7 @@
                     style="@style/font1"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
-                    android:layout_weight="0.4"
+                    android:layout_weight="0.6"
                     android:gravity="center"
                     android:maxLines="1"
                     android:padding="15dp" />
diff --git a/app/src/main/res/layout/assistant_topbar.xml b/app/src/main/res/layout/assistant_topbar.xml
index 8c135886b..b572c004b 100644
--- a/app/src/main/res/layout/assistant_topbar.xml
+++ b/app/src/main/res/layout/assistant_topbar.xml
@@ -18,15 +18,21 @@
         android:src="@drawable/back" />
 
     <TextView
-        style="@style/font8"
+        style="@style/font1"
         android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="0.6"
-        android:background="@drawable/toolbar_button"
         android:gravity="center"
-        android:text="@string/assistant" />
+        android:maxLines="1"
+        android:padding="15dp"
+        android:text="@string/assistant"/>
 
-    <ImageView
+    <View
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="0.2" />
+
+    <!--<ImageView
         android:id="@+id/assistant_cancel"
         android:layout_width="0dp"
         android:layout_height="match_parent"
@@ -34,6 +40,6 @@
         android:background="@drawable/toolbar_button"
         android:contentDescription="@string/content_description_dialer_back"
         android:padding="15dp"
-        android:src="@drawable/dialer_back" />
+        android:src="@drawable/dialer_back" />-->
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml
index ee0c731e2..c28e20851 100644
--- a/app/src/main/res/layout/main.xml
+++ b/app/src/main/res/layout/main.xml
@@ -44,7 +44,7 @@
                     style="@style/font1"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
-                    android:layout_weight="0.4"
+                    android:layout_weight="0.6"
                     android:gravity="center"
                     android:maxLines="1"
                     android:padding="15dp" />
diff --git a/app/src/main/res/layout/recordings_list.xml b/app/src/main/res/layout/recordings_list.xml
index da967c9a3..63589d32b 100644
--- a/app/src/main/res/layout/recordings_list.xml
+++ b/app/src/main/res/layout/recordings_list.xml
@@ -22,10 +22,16 @@
             android:padding="18dp"
             android:src="@drawable/back" />
 
-        <View
+        <TextView
+            android:id="@+id/top_bar_title"
+            style="@style/font1"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_weight="0.6" />
+            android:layout_weight="0.6"
+            android:gravity="center"
+            android:maxLines="1"
+            android:padding="15dp"
+            android:text="@string/menu_recordings"/>
 
         <ImageView
             android:id="@+id/edit"