diff --git a/app/src/main/res/layout/account_profile_fragment.xml b/app/src/main/res/layout/account_profile_fragment.xml
index 24b73b1f4..d20632bbf 100644
--- a/app/src/main/res/layout/account_profile_fragment.xml
+++ b/app/src/main/res/layout/account_profile_fragment.xml
@@ -31,10 +31,9 @@
                 android:id="@+id/back"
                 android:onClick="@{backClickListener}"
                 android:layout_width="wrap_content"
-                android:layout_height="35dp"
-                android:layout_marginStart="10dp"
+                android:layout_height="0dp"
                 android:adjustViewBounds="true"
-                android:padding="5dp"
+                android:padding="15dp"
                 android:src="@drawable/caret_left"
                 app:tint="@color/gray_main2_500"
                 app:layout_constraintBottom_toBottomOf="@id/title"
diff --git a/app/src/main/res/layout/account_profile_secure_mode_fragment.xml b/app/src/main/res/layout/account_profile_secure_mode_fragment.xml
index e4db0bf7d..a2bef6980 100644
--- a/app/src/main/res/layout/account_profile_secure_mode_fragment.xml
+++ b/app/src/main/res/layout/account_profile_secure_mode_fragment.xml
@@ -28,10 +28,9 @@
             android:id="@+id/back"
             android:onClick="@{backClickListener}"
             android:layout_width="wrap_content"
-            android:layout_height="35dp"
-            android:layout_marginStart="10dp"
+            android:layout_height="0dp"
             android:adjustViewBounds="true"
-            android:padding="5dp"
+            android:padding="15dp"
             android:src="@drawable/caret_left"
             app:tint="@color/gray_main2_500"
             app:layout_constraintBottom_toBottomOf="@id/title"
diff --git a/app/src/main/res/layout/assistant_login_fragment.xml b/app/src/main/res/layout/assistant_login_fragment.xml
index 456e8717d..05332fc85 100644
--- a/app/src/main/res/layout/assistant_login_fragment.xml
+++ b/app/src/main/res/layout/assistant_login_fragment.xml
@@ -38,10 +38,9 @@
             <ImageView
                 android:onClick="@{backClickListener}"
                 android:id="@+id/back"
-                android:layout_width="@dimen/icon_size"
-                android:layout_height="@dimen/icon_size"
-                android:layout_marginTop="7dp"
-                android:layout_marginStart="15dp"
+                android:layout_width="@dimen/top_bar_height"
+                android:layout_height="@dimen/top_bar_height"
+                android:padding="15dp"
                 android:src="@drawable/caret_left"
                 app:tint="@color/gray_main2_500"
                 app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/assistant_qr_code_scanner_fragment.xml b/app/src/main/res/layout/assistant_qr_code_scanner_fragment.xml
index d4a88b666..519539e3d 100644
--- a/app/src/main/res/layout/assistant_qr_code_scanner_fragment.xml
+++ b/app/src/main/res/layout/assistant_qr_code_scanner_fragment.xml
@@ -32,10 +32,9 @@
         <ImageView
             android:onClick="@{backClickListener}"
             android:id="@+id/back"
-            android:layout_width="@dimen/icon_size"
-            android:layout_height="@dimen/icon_size"
-            android:layout_marginTop="7dp"
-            android:layout_marginStart="15dp"
+            android:layout_width="@dimen/top_bar_height"
+            android:layout_height="@dimen/top_bar_height"
+            android:padding="15dp"
             android:src="@drawable/caret_left"
             app:tint="@color/white"
             app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/assistant_register_confirm_sms_code_fragment.xml b/app/src/main/res/layout/assistant_register_confirm_sms_code_fragment.xml
index f496def4a..ae5c57fca 100644
--- a/app/src/main/res/layout/assistant_register_confirm_sms_code_fragment.xml
+++ b/app/src/main/res/layout/assistant_register_confirm_sms_code_fragment.xml
@@ -25,10 +25,9 @@
             <ImageView
                 android:onClick="@{backClickListener}"
                 android:id="@+id/back"
-                android:layout_width="@dimen/icon_size"
-                android:layout_height="@dimen/icon_size"
-                android:layout_marginTop="7dp"
-                android:layout_marginStart="15dp"
+                android:layout_width="@dimen/top_bar_height"
+                android:layout_height="@dimen/top_bar_height"
+                android:padding="15dp"
                 android:src="@drawable/caret_left"
                 app:tint="@color/gray_main2_500"
                 app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/assistant_register_fragment.xml b/app/src/main/res/layout/assistant_register_fragment.xml
index f2f266949..ab41bd72a 100644
--- a/app/src/main/res/layout/assistant_register_fragment.xml
+++ b/app/src/main/res/layout/assistant_register_fragment.xml
@@ -43,10 +43,9 @@
                 <ImageView
                     android:onClick="@{backClickListener}"
                     android:id="@+id/back"
-                    android:layout_width="@dimen/icon_size"
-                    android:layout_height="@dimen/icon_size"
-                    android:layout_marginTop="7dp"
-                    android:layout_marginStart="15dp"
+                    android:layout_width="@dimen/top_bar_height"
+                    android:layout_height="@dimen/top_bar_height"
+                    android:padding="15dp"
                     android:src="@drawable/caret_left"
                     app:tint="@color/gray_main2_500"
                     app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/assistant_secure_mode_fragment.xml b/app/src/main/res/layout/assistant_secure_mode_fragment.xml
index b6c770b83..47fd5a816 100644
--- a/app/src/main/res/layout/assistant_secure_mode_fragment.xml
+++ b/app/src/main/res/layout/assistant_secure_mode_fragment.xml
@@ -33,10 +33,9 @@
                 android:onClick="@{backClickListener}"
                 android:id="@+id/back"
                 android:visibility="invisible"
-                android:layout_width="@dimen/icon_size"
-                android:layout_height="@dimen/icon_size"
-                android:layout_marginTop="7dp"
-                android:layout_marginStart="15dp"
+                android:layout_width="@dimen/top_bar_height"
+                android:layout_height="@dimen/top_bar_height"
+                android:padding="15dp"
                 android:src="@drawable/caret_left"
                 app:tint="@color/gray_main2_500"
                 app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml b/app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml
index 0f7e0251c..15f833eae 100644
--- a/app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml
+++ b/app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml
@@ -26,10 +26,9 @@
             <ImageView
                 android:onClick="@{backClickListener}"
                 android:id="@+id/back"
-                android:layout_width="@dimen/icon_size"
-                android:layout_height="@dimen/icon_size"
-                android:layout_marginTop="7dp"
-                android:layout_marginStart="15dp"
+                android:layout_width="@dimen/top_bar_height"
+                android:layout_height="@dimen/top_bar_height"
+                android:padding="15dp"
                 android:src="@drawable/caret_left"
                 app:tint="@color/gray_main2_500"
                 app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/assistant_third_party_sip_account_warning_fragment.xml b/app/src/main/res/layout/assistant_third_party_sip_account_warning_fragment.xml
index 4bc6c9edc..ed7f1177e 100644
--- a/app/src/main/res/layout/assistant_third_party_sip_account_warning_fragment.xml
+++ b/app/src/main/res/layout/assistant_third_party_sip_account_warning_fragment.xml
@@ -33,10 +33,9 @@
             <ImageView
                 android:onClick="@{backClickListener}"
                 android:id="@+id/back"
-                android:layout_width="@dimen/icon_size"
-                android:layout_height="@dimen/icon_size"
-                android:layout_marginTop="7dp"
-                android:layout_marginStart="15dp"
+                android:layout_width="@dimen/top_bar_height"
+                android:layout_height="@dimen/top_bar_height"
+                android:padding="15dp"
                 android:src="@drawable/caret_left"
                 app:tint="@color/gray_main2_500"
                 app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/call_fragment.xml b/app/src/main/res/layout/call_fragment.xml
index 6cc77967c..fe8aed355 100644
--- a/app/src/main/res/layout/call_fragment.xml
+++ b/app/src/main/res/layout/call_fragment.xml
@@ -24,9 +24,9 @@
 
         <ImageView
             android:id="@+id/back"
-            android:layout_width="@dimen/icon_size"
+            android:layout_width="wrap_content"
             android:layout_height="0dp"
-            android:layout_marginStart="10dp"
+            android:padding="15dp"
             android:adjustViewBounds="true"
             android:onClick="@{backClickListener}"
             android:visibility="@{viewModel.showBackButton ? View.VISIBLE : View.GONE}"
diff --git a/app/src/main/res/layout/call_start_fragment.xml b/app/src/main/res/layout/call_start_fragment.xml
index c34b939c8..e43ffac66 100644
--- a/app/src/main/res/layout/call_start_fragment.xml
+++ b/app/src/main/res/layout/call_start_fragment.xml
@@ -31,11 +31,10 @@
             <ImageView
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
-                android:layout_height="35dp"
-                android:layout_marginStart="10dp"
+                android:layout_height="0dp"
                 android:adjustViewBounds="true"
                 android:onClick="@{backClickListener}"
-                android:padding="5dp"
+                android:padding="15dp"
                 android:src="@drawable/caret_left"
                 app:tint="@color/gray_main2_500"
                 app:layout_constraintBottom_toBottomOf="@id/title"
diff --git a/app/src/main/res/layout/contact_fragment.xml b/app/src/main/res/layout/contact_fragment.xml
index 043b8e75a..c8ed9f5aa 100644
--- a/app/src/main/res/layout/contact_fragment.xml
+++ b/app/src/main/res/layout/contact_fragment.xml
@@ -28,10 +28,9 @@
         <ImageView
             android:id="@+id/back"
             android:layout_width="wrap_content"
-            android:layout_height="35dp"
-            android:layout_marginStart="10dp"
+            android:layout_height="0dp"
             android:adjustViewBounds="true"
-            android:padding="5dp"
+            android:padding="15dp"
             android:onClick="@{backClickListener}"
             android:visibility="@{viewModel.showBackButton ? View.VISIBLE : View.GONE}"
             android:src="@drawable/caret_left"
diff --git a/app/src/main/res/layout/contact_new_or_edit_fragment.xml b/app/src/main/res/layout/contact_new_or_edit_fragment.xml
index e270b1740..ee21db3dd 100644
--- a/app/src/main/res/layout/contact_new_or_edit_fragment.xml
+++ b/app/src/main/res/layout/contact_new_or_edit_fragment.xml
@@ -25,10 +25,9 @@
             android:id="@+id/back"
             android:onClick="@{backClickListener}"
             android:layout_width="wrap_content"
-            android:layout_height="35dp"
-            android:layout_marginStart="10dp"
+            android:layout_height="0dp"
             android:adjustViewBounds="true"
-            android:padding="5dp"
+            android:padding="15dp"
             android:src="@drawable/caret_left"
             app:tint="@color/gray_main2_500"
             app:layout_constraintBottom_toBottomOf="@id/title"
diff --git a/app/src/main/res/layout/help_debug_fragment.xml b/app/src/main/res/layout/help_debug_fragment.xml
index eb9621e1d..042e68d18 100644
--- a/app/src/main/res/layout/help_debug_fragment.xml
+++ b/app/src/main/res/layout/help_debug_fragment.xml
@@ -22,10 +22,9 @@
             android:id="@+id/back"
             android:onClick="@{backClickListener}"
             android:layout_width="wrap_content"
-            android:layout_height="35dp"
-            android:layout_marginStart="10dp"
+            android:layout_height="0dp"
             android:adjustViewBounds="true"
-            android:padding="5dp"
+            android:padding="15dp"
             android:src="@drawable/caret_left"
             app:tint="@color/gray_main2_500"
             app:layout_constraintBottom_toBottomOf="@id/title"
diff --git a/app/src/main/res/layout/help_fragment.xml b/app/src/main/res/layout/help_fragment.xml
index ed994d51c..5d7d4efa8 100644
--- a/app/src/main/res/layout/help_fragment.xml
+++ b/app/src/main/res/layout/help_fragment.xml
@@ -39,10 +39,9 @@
                 android:id="@+id/back"
                 android:onClick="@{backClickListener}"
                 android:layout_width="wrap_content"
-                android:layout_height="35dp"
-                android:layout_marginStart="10dp"
+                android:layout_height="0dp"
                 android:adjustViewBounds="true"
-                android:padding="5dp"
+                android:padding="15dp"
                 android:src="@drawable/caret_left"
                 app:tint="@color/gray_main2_500"
                 app:layout_constraintBottom_toBottomOf="@id/title"
diff --git a/app/src/main/res/layout/recordings_fragment.xml b/app/src/main/res/layout/recordings_fragment.xml
index ed3e472e0..bc2cca3f1 100644
--- a/app/src/main/res/layout/recordings_fragment.xml
+++ b/app/src/main/res/layout/recordings_fragment.xml
@@ -19,10 +19,9 @@
             android:id="@+id/back"
             android:onClick="@{backClickListener}"
             android:layout_width="wrap_content"
-            android:layout_height="35dp"
-            android:layout_marginStart="10dp"
+            android:layout_height="0dp"
             android:adjustViewBounds="true"
-            android:padding="5dp"
+            android:padding="15dp"
             android:src="@drawable/caret_left"
             app:tint="@color/gray_main2_500"
             app:layout_constraintBottom_toBottomOf="@id/title"
diff --git a/app/src/main/res/layout/settings_fragment.xml b/app/src/main/res/layout/settings_fragment.xml
index 81d598936..45f59c6d1 100644
--- a/app/src/main/res/layout/settings_fragment.xml
+++ b/app/src/main/res/layout/settings_fragment.xml
@@ -21,10 +21,9 @@
             android:id="@+id/back"
             android:onClick="@{backClickListener}"
             android:layout_width="wrap_content"
-            android:layout_height="35dp"
-            android:layout_marginStart="10dp"
+            android:layout_height="0dp"
             android:adjustViewBounds="true"
-            android:padding="5dp"
+            android:padding="15dp"
             android:src="@drawable/caret_left"
             app:tint="@color/gray_main2_500"
             app:layout_constraintBottom_toBottomOf="@id/title"