diff --git a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountProfileViewModel.kt b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountProfileViewModel.kt
index 72c55e5bf..84fd96677 100644
--- a/app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountProfileViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountProfileViewModel.kt
@@ -353,6 +353,7 @@ class AccountProfileViewModel
             registerEnabled.postValue(account.params.isRegisterEnabled)
 
             if (!core.isNetworkReachable) {
+                Log.w("$TAG Network is not reachable, updating registration state to reflect that")
                 // To reflect the difference between Disabled & Disconnected
                 accountModel.value?.updateRegistrationState()
             }
diff --git a/app/src/main/res/layout/account_profile_fragment.xml b/app/src/main/res/layout/account_profile_fragment.xml
index 2b9934328..497649d3a 100644
--- a/app/src/main/res/layout/account_profile_fragment.xml
+++ b/app/src/main/res/layout/account_profile_fragment.xml
@@ -5,6 +5,7 @@
 
     <data>
         <import type="android.view.View" />
+        <import type="org.linphone.core.RegistrationState" />
         <variable
             name="backClickListener"
             type="View.OnClickListener" />
@@ -376,22 +377,35 @@
 
                     </androidx.constraintlayout.widget.ConstraintLayout>
 
+                    <androidx.appcompat.widget.AppCompatTextView
+                        style="@style/section_header_style"
+                        android:id="@+id/registration_status"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:padding="10dp"
+                        android:layout_marginStart="16dp"
+                        android:layout_marginEnd="16dp"
+                        android:layout_marginTop="20dp"
+                        android:text="@string/manage_account_status_registration_status_title"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/details_content"/>
+
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:id="@+id/connection_content"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="16dp"
                         android:layout_marginEnd="16dp"
-                        android:layout_marginTop="20dp"
                         android:background="@drawable/shape_squircle_white_background"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@id/details_content">
+                        app:layout_constraintTop_toBottomOf="@id/registration_status">
 
                         <com.google.android.material.materialswitch.MaterialSwitch
                             style="@style/material_switch_style"
-                            android:onClick="@{() -> viewModel.toggleRegister()}"
                             android:id="@+id/connected_switch"
+                            android:onClick="@{() -> viewModel.toggleRegister()}"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="16dp"
@@ -405,12 +419,25 @@
                             android:id="@+id/connected_label"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginStart="16dp"
+                            android:layout_marginStart="10dp"
                             android:text="@{viewModel.accountModel.registrationStateLabel, default=@string/drawer_menu_account_connection_status_connected}"
                             app:layout_constraintStart_toEndOf="@id/connected_switch"
                             app:layout_constraintTop_toTopOf="@id/connected_switch"
                             app:layout_constraintBottom_toBottomOf="@id/connected_switch" />
 
+                        <ImageView
+                            android:id="@+id/register_in_progress"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="10dp"
+                            android:src="@drawable/animated_in_progress"
+                            android:contentDescription="@null"
+                            android:visibility="@{viewModel.accountModel.registrationState == RegistrationState.Progress || viewModel.accountModel.registrationState == RegistrationState.Refreshing ? View.VISIBLE : View.GONE, default=gone}"
+                            animatedDrawable="@{true}"
+                            app:layout_constraintTop_toTopOf="@id/connected_label"
+                            app:layout_constraintBottom_toBottomOf="@id/connected_label"
+                            app:layout_constraintStart_toEndOf="@id/connected_label" />
+
                         <androidx.appcompat.widget.AppCompatTextView
                             style="@style/default_text_style"
                             android:id="@+id/connected_summary"
diff --git a/app/src/main/res/layout/meeting_edit_fragment.xml b/app/src/main/res/layout/meeting_edit_fragment.xml
index 46cee06a0..bc8783317 100644
--- a/app/src/main/res/layout/meeting_edit_fragment.xml
+++ b/app/src/main/res/layout/meeting_edit_fragment.xml
@@ -189,6 +189,8 @@
                         android:spinnerMode="dropdown"
                         android:popupBackground="@drawable/shape_squircle_white_background"
                         android:background="@drawable/edit_text_background"
+                        app:layout_constraintHorizontal_bias="0"
+                        app:layout_constraintWidth_max="@dimen/text_input_max_width"
                         app:layout_constraintTop_toBottomOf="@id/timezone_label"
                         app:layout_constraintStart_toStartOf="@id/timezone_label"
                         app:layout_constraintEnd_toEndOf="parent" />
diff --git a/app/src/main/res/layout/meeting_schedule_fragment.xml b/app/src/main/res/layout/meeting_schedule_fragment.xml
index 2fe6d82a2..42e987fc0 100644
--- a/app/src/main/res/layout/meeting_schedule_fragment.xml
+++ b/app/src/main/res/layout/meeting_schedule_fragment.xml
@@ -327,6 +327,8 @@
                         android:spinnerMode="dropdown"
                         android:popupBackground="@drawable/shape_squircle_white_background"
                         android:background="@drawable/edit_text_background"
+                        app:layout_constraintHorizontal_bias="0"
+                        app:layout_constraintWidth_max="@dimen/text_input_max_width"
                         app:layout_constraintTop_toBottomOf="@id/timezone_label"
                         app:layout_constraintStart_toStartOf="@id/timezone_label"
                         app:layout_constraintEnd_toEndOf="parent" />
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 622737479..2cb85ed93 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -347,6 +347,7 @@
     <string name="manage_account_add_picture">Ajouter une image</string>
     <string name="manage_account_edit_picture">Modifier </string>
     <string name="manage_account_remove_picture">Supprimer</string>
+    <string name="manage_account_status_registration_status_title">État de la connexion</string>
     <string name="manage_account_status_connected_summary">Vous êtes en ligne, on peut vous joindre.</string>
     <string name="manage_account_status_disconnected_summary">Vous êtes hors ligne, probablement car vous n\'êtes pas actuellement connecté à internet.</string>
     <string name="manage_account_status_cleared_summary">Compte désactivé, vous ne recevrez ni appel ni message.</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 748021857..195b0565a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -389,6 +389,7 @@
     <string name="manage_account_add_picture">Add a picture</string>
     <string name="manage_account_edit_picture">Edit picture</string>
     <string name="manage_account_remove_picture">Remove picture</string>
+    <string name="manage_account_status_registration_status_title">Connection status</string>
     <string name="manage_account_status_connected_summary">This account in online, everybody can call you.</string>
     <string name="manage_account_status_disconnected_summary">This account in offline, probably because you aren\'t connected to internet right now.</string>
     <string name="manage_account_status_cleared_summary">Account has been disabled, you won\'t receive any call or message.</string>