diff --git a/app/src/main/res/layout/drawer_menu.xml b/app/src/main/res/layout/drawer_menu.xml
index 270006459..6dc05b324 100644
--- a/app/src/main/res/layout/drawer_menu.xml
+++ b/app/src/main/res/layout/drawer_menu.xml
@@ -31,7 +31,7 @@
             android:layout_width="32dp"
             android:layout_height="32dp"
             android:layout_marginStart="26dp"
-            android:layout_marginTop="30dp"
+            android:layout_marginTop="15dp"
             android:src="@drawable/linphone_notification"
             android:contentDescription="@string/app_name"
             app:layout_constraintTop_toTopOf="parent"
@@ -44,8 +44,6 @@
             android:onClick="@{() -> viewModel.closeDrawerMenu()}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="30dp"
-            android:layout_marginTop="30dp"
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
             android:text="@string/app_name"
@@ -53,15 +51,16 @@
             android:drawableEnd="@drawable/x"
             android:drawablePadding="15dp"
             app:drawableTint="?attr/color_main2_600"
-            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintTop_toTopOf="@id/brand_icon"
             app:layout_constraintStart_toEndOf="@id/brand_icon"
+            app:layout_constraintBottom_toBottomOf="@id/brand_icon"
             app:layout_constraintEnd_toEndOf="parent" />
 
         <ScrollView
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_marginTop="20dp"
-            android:layout_marginBottom="20dp"
+            android:layout_marginTop="15dp"
+            android:layout_marginBottom="15dp"
             android:fillViewport="true"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -113,7 +112,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
-            android:layout_marginBottom="30dp"
+            android:layout_marginBottom="15dp"
             android:paddingStart="20dp"
             android:paddingEnd="20dp"
             android:text="@string/drawer_menu_add_account"
@@ -130,7 +129,7 @@
             android:id="@+id/separator"
             android:layout_width="0dp"
             android:layout_height="1dp"
-            android:layout_marginBottom="30dp"
+            android:layout_marginBottom="15dp"
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
             android:background="?attr/color_main2_200"
@@ -182,7 +181,7 @@
             android:id="@+id/help"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="20dp"
+            android:layout_marginBottom="15dp"
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
             android:text="@string/help_title"
diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml
index 64be89aef..87cf08324 100644
--- a/app/src/main/res/layout/main_activity.xml
+++ b/app/src/main/res/layout/main_activity.xml
@@ -53,7 +53,7 @@
                 android:layout_marginStart="15dp"
                 android:layout_marginEnd="15dp"
                 app:layout_constraintWidth_max="@dimen/toast_max_width"
-                app:layout_constraintTop_toBottomOf="@id/in_call_top_bar"
+                app:layout_constraintTop_toTopOf="@id/main_nav_container"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent" />
 
diff --git a/app/src/main/res/layout/main_activity_notification_top_bar.xml b/app/src/main/res/layout/main_activity_notification_top_bar.xml
index 5d0df28b3..4762630eb 100644
--- a/app/src/main/res/layout/main_activity_notification_top_bar.xml
+++ b/app/src/main/res/layout/main_activity_notification_top_bar.xml
@@ -13,7 +13,6 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:minHeight="40dp"
         android:background="@{viewModel.maxAlertLevel >= 20 ? @drawable/color_success_500 : viewModel.maxAlertLevel >= 10 ? @drawable/color_danger_500 : viewModel.maxAlertLevel > 0 ? @drawable/color_main2_500 : @drawable/color_main1_500, default=@drawable/color_main1_500}"
         android:onClick="@{() -> viewModel.onTopBarClicked()}">
 
@@ -24,9 +23,9 @@
             android:layout_marginStart="16dp"
             android:layout_marginTop="5dp"
             android:layout_marginBottom="5dp"
+            android:visibility="@{viewModel.showAlert ? View.VISIBLE : View.GONE, default=gone}"
             android:src="@{viewModel.alertIcon, default=@drawable/bell_simple}"
             android:contentDescription="@null"
-            android:visibility="@{viewModel.showAlert ? View.VISIBLE : View.GONE, default=gone}"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -36,7 +35,7 @@
             style="@style/default_text_style_300"
             android:id="@+id/label"
             android:layout_width="0dp"
-            android:layout_height="wrap_content"
+            android:layout_height="30dp"
             android:layout_marginStart="5dp"
             android:layout_marginEnd="10dp"
             android:layout_marginTop="5dp"
diff --git a/app/src/main/res/layout/main_activity_top_bar.xml b/app/src/main/res/layout/main_activity_top_bar.xml
index 290f8a93e..f00b28732 100644
--- a/app/src/main/res/layout/main_activity_top_bar.xml
+++ b/app/src/main/res/layout/main_activity_top_bar.xml
@@ -54,15 +54,15 @@
             android:layout_marginStart="15dp"
             layout="@layout/contact_avatar"
             bind:model="@{viewModel.account}"
-            app:layout_constraintBottom_toBottomOf="@id/title"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/title" />
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"/>
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style_800"
             android:id="@+id/title"
             android:layout_width="0dp"
-            android:layout_height="match_parent"
+            android:layout_height="0dp"
             android:layout_marginStart="10dp"
             android:layout_marginEnd="10dp"
             android:gravity="center_vertical"
@@ -71,14 +71,17 @@
             android:textSize="20sp"
             app:layout_constraintEnd_toStartOf="@id/search_toggle"
             app:layout_constraintStart_toEndOf="@id/avatar"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="@id/avatar"
+            app:layout_constraintBottom_toBottomOf="@id/avatar"/>
 
         <ImageView
             android:id="@+id/search_toggle"
             android:onClick="@{() -> viewModel.openSearchBar()}"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
-            android:padding="15dp"
+            android:layout_marginEnd="5dp"
+            android:paddingStart="15dp"
+            android:paddingEnd="15dp"
             android:src="@drawable/magnifying_glass"
             android:contentDescription="@string/content_description_open_filter"
             app:layout_constraintBottom_toBottomOf="@id/title"
@@ -91,7 +94,9 @@
             android:onClick="@{extraActionClickListener}"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
-            android:padding="15dp"
+            android:layout_marginEnd="5dp"
+            android:paddingStart="15dp"
+            android:paddingEnd="15dp"
             android:src="@{extraActionIcon, default=@drawable/dots_three_vertical}"
             android:contentDescription="@{extraActionContentDescription}"
             android:visibility="@{enableExtraAction ? View.VISIBLE : View.GONE, default=gone}"
@@ -105,7 +110,9 @@
             android:onClick="@{() -> viewModel.closeSearchBar()}"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
-            android:padding="15dp"
+            android:layout_marginStart="5dp"
+            android:paddingStart="15dp"
+            android:paddingEnd="15dp"
             android:src="@drawable/caret_left"
             android:contentDescription="@string/content_description_cancel_filter"
             app:layout_constraintBottom_toBottomOf="@id/search"
@@ -148,7 +155,9 @@
             android:onClick="@{() -> viewModel.clearFilter()}"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
-            android:padding="15dp"
+            android:layout_marginEnd="5dp"
+            android:paddingStart="15dp"
+            android:paddingEnd="15dp"
             android:src="@drawable/x"
             android:contentDescription="@string/content_description_clear_filter"
             app:layout_constraintBottom_toBottomOf="@id/search"