diff --git a/app/src/main/res/layout-sw600dp/assistant_landing_fragment.xml b/app/src/main/res/layout-sw600dp/assistant_landing_fragment.xml
index 78147ea66..58afd27b3 100644
--- a/app/src/main/res/layout-sw600dp/assistant_landing_fragment.xml
+++ b/app/src/main/res/layout-sw600dp/assistant_landing_fragment.xml
@@ -35,6 +35,19 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
+            <ImageView
+                android:id="@+id/logo"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:adjustViewBounds="true"
+                android:scaleType="centerCrop"
+                android:contentDescription="@null"
+                android:src="@drawable/assistant_logo"
+                app:layout_constraintStart_toEndOf="@id/title"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toTopOf="@id/header"
+                app:layout_constraintTop_toBottomOf="@id/register" />
+
             <ImageView
                 android:id="@+id/back"
                 android:onClick="@{backClickListener}"
@@ -255,19 +268,6 @@
                 app:layout_constraintTop_toBottomOf="@id/scan_qr_code"
                 app:layout_constraintBottom_toTopOf="@id/header"/>
 
-            <ImageView
-                android:id="@+id/logo"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:adjustViewBounds="true"
-                android:scaleType="centerCrop"
-                android:contentDescription="@null"
-                android:src="@drawable/assistant_logo"
-                app:layout_constraintStart_toEndOf="@id/title"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintBottom_toTopOf="@id/header"
-                app:layout_constraintTop_toBottomOf="@id/register" />
-
             <ImageView
                 android:id="@+id/header"
                 android:layout_width="0dp"
diff --git a/app/src/main/res/layout-sw600dp/assistant_permissions_fragment.xml b/app/src/main/res/layout-sw600dp/assistant_permissions_fragment.xml
index 807b060f3..f697d9e85 100644
--- a/app/src/main/res/layout-sw600dp/assistant_permissions_fragment.xml
+++ b/app/src/main/res/layout-sw600dp/assistant_permissions_fragment.xml
@@ -89,6 +89,7 @@
                 android:layout_width="56dp"
                 android:layout_height="56dp"
                 android:layout_marginTop="32dp"
+                android:layout_marginStart="16dp"
                 android:background="@drawable/circle_light_blue_button_background"
                 android:padding="12dp"
                 android:src="@drawable/bell_ringing"
@@ -101,7 +102,7 @@
             <androidx.appcompat.widget.AppCompatTextView
                 style="@style/default_text_style"
                 android:id="@+id/post_notifications_title"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp"
@@ -110,6 +111,7 @@
                 android:ellipsize="end"
                 app:layout_constraintTop_toTopOf="@id/post_notifications_icon"
                 app:layout_constraintStart_toEndOf="@id/post_notifications_icon"
+                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintBottom_toBottomOf="@id/post_notifications_icon"/>
 
             <ImageView
@@ -117,6 +119,7 @@
                 android:layout_width="56dp"
                 android:layout_height="56dp"
                 android:layout_marginTop="16dp"
+                android:layout_marginStart="16dp"
                 android:background="@drawable/circle_light_blue_button_background"
                 android:padding="12dp"
                 android:src="@drawable/address_book"
@@ -129,7 +132,7 @@
             <androidx.appcompat.widget.AppCompatTextView
                 style="@style/default_text_style"
                 android:id="@+id/read_contacts_title"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp"
@@ -138,6 +141,7 @@
                 android:ellipsize="end"
                 app:layout_constraintTop_toTopOf="@id/read_contacts_icon"
                 app:layout_constraintStart_toEndOf="@id/read_contacts_icon"
+                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintBottom_toBottomOf="@id/read_contacts_icon"/>
 
             <ImageView
@@ -145,6 +149,7 @@
                 android:layout_width="56dp"
                 android:layout_height="56dp"
                 android:layout_marginTop="16dp"
+                android:layout_marginStart="16dp"
                 android:background="@drawable/circle_light_blue_button_background"
                 android:padding="12dp"
                 android:src="@drawable/microphone"
@@ -157,7 +162,7 @@
             <androidx.appcompat.widget.AppCompatTextView
                 style="@style/default_text_style"
                 android:id="@+id/record_audio_title"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp"
@@ -166,6 +171,7 @@
                 android:ellipsize="end"
                 app:layout_constraintTop_toTopOf="@id/record_audio_icon"
                 app:layout_constraintStart_toEndOf="@id/record_audio_icon"
+                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintBottom_toBottomOf="@id/record_audio_icon"/>
 
             <ImageView
@@ -173,6 +179,7 @@
                 android:layout_width="56dp"
                 android:layout_height="56dp"
                 android:layout_marginTop="16dp"
+                android:layout_marginStart="16dp"
                 android:background="@drawable/circle_light_blue_button_background"
                 android:padding="12dp"
                 android:src="@drawable/video_camera"
@@ -185,7 +192,7 @@
             <androidx.appcompat.widget.AppCompatTextView
                 style="@style/default_text_style"
                 android:id="@+id/access_camera_title"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp"
@@ -194,6 +201,7 @@
                 android:ellipsize="end"
                 app:layout_constraintTop_toTopOf="@id/access_camera_icon"
                 app:layout_constraintStart_toEndOf="@id/access_camera_icon"
+                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintBottom_toBottomOf="@id/access_camera_icon"/>
 
             <androidx.appcompat.widget.AppCompatTextView
diff --git a/app/src/main/res/layout-sw600dp/assistant_register_confirm_sms_code_fragment.xml b/app/src/main/res/layout-sw600dp/assistant_register_confirm_sms_code_fragment.xml
index 4155f69bb..d369c2cee 100644
--- a/app/src/main/res/layout-sw600dp/assistant_register_confirm_sms_code_fragment.xml
+++ b/app/src/main/res/layout-sw600dp/assistant_register_confirm_sms_code_fragment.xml
@@ -22,6 +22,19 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
+            <ImageView
+                android:id="@+id/logo"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:adjustViewBounds="true"
+                android:scaleType="centerCrop"
+                android:contentDescription="@null"
+                android:src="@drawable/confirm_sms_code_logo"
+                app:layout_constraintStart_toEndOf="@id/message"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toTopOf="@id/header"
+                app:layout_constraintTop_toBottomOf="@id/title" />
+
             <ImageView
                 android:id="@+id/back"
                 android:onClick="@{backClickListener}"
@@ -180,19 +193,6 @@
                 app:layout_constraintTop_toBottomOf="@id/code_first_digit"
                 app:layout_constraintBottom_toTopOf="@id/header"/>
 
-            <ImageView
-                android:id="@+id/logo"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:adjustViewBounds="true"
-                android:scaleType="centerCrop"
-                android:contentDescription="@null"
-                android:src="@drawable/confirm_sms_code_logo"
-                app:layout_constraintStart_toEndOf="@id/message"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintBottom_toTopOf="@id/header"
-                app:layout_constraintTop_toBottomOf="@id/title" />
-
             <ImageView
                 android:id="@+id/header"
                 android:layout_width="0dp"
diff --git a/app/src/main/res/layout-sw600dp/assistant_register_fragment.xml b/app/src/main/res/layout-sw600dp/assistant_register_fragment.xml
index 01782c0eb..16b5dae49 100644
--- a/app/src/main/res/layout-sw600dp/assistant_register_fragment.xml
+++ b/app/src/main/res/layout-sw600dp/assistant_register_fragment.xml
@@ -37,6 +37,19 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
+                <ImageView
+                    android:id="@+id/logo"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:adjustViewBounds="true"
+                    android:scaleType="centerCrop"
+                    android:contentDescription="@null"
+                    android:src="@drawable/assistant_logo"
+                    app:layout_constraintStart_toEndOf="@id/title"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintBottom_toTopOf="@id/header"
+                    app:layout_constraintTop_toBottomOf="@id/login" />
+
                 <ImageView
                     android:id="@+id/back"
                     android:onClick="@{backClickListener}"
@@ -351,19 +364,6 @@
                     app:layout_constraintTop_toTopOf="@id/title"
                     app:layout_constraintBottom_toBottomOf="@id/title"/>
 
-                <ImageView
-                    android:id="@+id/logo"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:adjustViewBounds="true"
-                    android:scaleType="centerCrop"
-                    android:contentDescription="@null"
-                    android:src="@drawable/assistant_logo"
-                    app:layout_constraintStart_toEndOf="@id/title"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintBottom_toTopOf="@id/header"
-                    app:layout_constraintTop_toBottomOf="@id/login" />
-
                 <ImageView
                     android:id="@+id/header"
                     android:layout_width="0dp"
diff --git a/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_login_fragment.xml b/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_login_fragment.xml
index c194179c4..d2b765e20 100644
--- a/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_login_fragment.xml
+++ b/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_login_fragment.xml
@@ -23,6 +23,19 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
+            <ImageView
+                android:id="@+id/logo"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:adjustViewBounds="true"
+                android:scaleType="centerCrop"
+                android:contentDescription="@null"
+                android:src="@drawable/assistant_logo"
+                app:layout_constraintStart_toEndOf="@id/advanced_settings"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toTopOf="@id/header"
+                app:layout_constraintTop_toBottomOf="@id/title" />
+
             <ImageView
                 android:id="@+id/back"
                 android:onClick="@{backClickListener}"
@@ -355,19 +368,6 @@
                 app:layout_constraintStart_toStartOf="@id/advanced_settings"
                 app:layout_constraintEnd_toEndOf="@id/advanced_settings"/>
 
-            <ImageView
-                android:id="@+id/logo"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:adjustViewBounds="true"
-                android:scaleType="centerCrop"
-                android:contentDescription="@null"
-                android:src="@drawable/assistant_logo"
-                app:layout_constraintStart_toEndOf="@id/advanced_settings"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintBottom_toTopOf="@id/header"
-                app:layout_constraintTop_toBottomOf="@id/title" />
-
             <ImageView
                 android:id="@+id/header"
                 android:layout_width="0dp"
diff --git a/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_warning_fragment.xml b/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_warning_fragment.xml
index 372236b57..e2d37b772 100644
--- a/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_warning_fragment.xml
+++ b/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_warning_fragment.xml
@@ -29,6 +29,19 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
+            <ImageView
+                android:id="@+id/logo"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:adjustViewBounds="true"
+                android:scaleType="centerCrop"
+                android:contentDescription="@null"
+                android:src="@drawable/assistant_logo"
+                app:layout_constraintStart_toEndOf="@id/message"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toTopOf="@id/header"
+                app:layout_constraintTop_toBottomOf="@id/title" />
+
             <ImageView
                 android:id="@+id/back"
                 android:onClick="@{backClickListener}"
@@ -162,19 +175,6 @@
                 app:layout_constraintStart_toStartOf="@id/title"
                 app:layout_constraintEnd_toEndOf="@id/message" />
 
-            <ImageView
-                android:id="@+id/logo"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:adjustViewBounds="true"
-                android:scaleType="centerCrop"
-                android:contentDescription="@null"
-                android:src="@drawable/assistant_logo"
-                app:layout_constraintStart_toEndOf="@id/message"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintBottom_toTopOf="@id/header"
-                app:layout_constraintTop_toBottomOf="@id/title" />
-
             <ImageView
                 android:id="@+id/header"
                 android:layout_width="0dp"
diff --git a/app/src/main/res/layout-sw600dp/welcome_page_1.xml b/app/src/main/res/layout-sw600dp/welcome_page_1.xml
index 9686448f6..27b6de054 100644
--- a/app/src/main/res/layout-sw600dp/welcome_page_1.xml
+++ b/app/src/main/res/layout-sw600dp/welcome_page_1.xml
@@ -39,7 +39,7 @@
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style"
             android:id="@+id/message"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginEnd="32dp"
             android:layout_marginTop="16dp"
diff --git a/app/src/main/res/layout-sw600dp/welcome_page_2.xml b/app/src/main/res/layout-sw600dp/welcome_page_2.xml
index 88abf58c4..5c6a7c067 100644
--- a/app/src/main/res/layout-sw600dp/welcome_page_2.xml
+++ b/app/src/main/res/layout-sw600dp/welcome_page_2.xml
@@ -39,7 +39,7 @@
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style"
             android:id="@+id/message"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginEnd="32dp"
             android:layout_marginTop="16dp"
diff --git a/app/src/main/res/layout-sw600dp/welcome_page_3.xml b/app/src/main/res/layout-sw600dp/welcome_page_3.xml
index f680b344e..15d8b92a9 100644
--- a/app/src/main/res/layout-sw600dp/welcome_page_3.xml
+++ b/app/src/main/res/layout-sw600dp/welcome_page_3.xml
@@ -39,7 +39,7 @@
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style"
             android:id="@+id/message"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginEnd="32dp"
             android:layout_marginTop="16dp"