diff --git a/app/src/main/res/layout/bottom_nav_bar.xml b/app/src/main/res/layout/bottom_nav_bar.xml
index f77472237..d8f82ffee 100644
--- a/app/src/main/res/layout/bottom_nav_bar.xml
+++ b/app/src/main/res/layout/bottom_nav_bar.xml
@@ -14,7 +14,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/bottom_nav_bar"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/portrait_nav_bar_height"
+        android:layout_height="wrap_content"
         android:elevation="16dp"
         android:background="?attr/color_background_contrast_in_dark_mode">
 
@@ -24,8 +24,10 @@
             android:onClick="@{() -> viewModel.navigateToContacts()}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:layout_marginBottom="12dp"
             android:drawableTop="@drawable/address_book"
-            android:drawablePadding="10dp"
+            android:drawablePadding="4dp"
             android:drawableTint="@{viewModel.contactsSelected ? @color/main1_500 : @color/main2_600, default=@color/main2_600}"
             android:text="@string/bottom_navigation_contacts_label"
             textFont="@{viewModel.contactsSelected ? NotoSansFont.NotoSansBold : NotoSansFont.NotoSansRegular}"
@@ -40,9 +42,10 @@
             android:onClick="@{() -> viewModel.navigateToHistory()}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="18dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginBottom="12dp"
             android:drawableTop="@drawable/phone"
-            android:drawablePadding="10dp"
+            android:drawablePadding="4dp"
             android:drawableTint="@{viewModel.callsSelected ? @color/main1_500 : @color/main2_600, default=@color/main2_600}"
             android:text="@string/bottom_navigation_calls_label"
             textFont="@{viewModel.callsSelected ? NotoSansFont.NotoSansBold : NotoSansFont.NotoSansRegular}"
@@ -57,10 +60,10 @@
             android:layout_width="@dimen/unread_count_indicator_size"
             android:layout_height="@dimen/unread_count_indicator_size"
             android:layout_marginStart="50dp"
-            android:layout_marginTop="5dp"
+            android:layout_marginTop="2dp"
             android:text="@{String.valueOf(viewModel.missedCallsCount), default=`1`}"
             android:visibility="@{viewModel.missedCallsCount > 0 ? View.VISIBLE : View.GONE}"
-            app:layout_constraintTop_toTopOf="@id/calls"
+            app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toStartOf="@id/calls"
             app:layout_constraintEnd_toEndOf="@id/calls"/>
 
@@ -70,9 +73,10 @@
             android:onClick="@{() -> viewModel.navigateToConversations()}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="18dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginBottom="12dp"
             android:drawableTop="@drawable/chat_teardrop_text"
-            android:drawablePadding="10dp"
+            android:drawablePadding="4dp"
             android:drawableTint="@{viewModel.conversationsSelected ? @color/main1_500 : @color/main2_600, default=@color/main2_600}"
             android:text="@string/bottom_navigation_conversations_label"
             android:visibility="@{viewModel.hideConversations ? View.GONE : View.VISIBLE}"
@@ -88,10 +92,10 @@
             android:layout_width="@dimen/unread_count_indicator_size"
             android:layout_height="@dimen/unread_count_indicator_size"
             android:layout_marginStart="50dp"
-            android:layout_marginTop="5dp"
+            android:layout_marginTop="2dp"
             android:text="@{String.valueOf(viewModel.unreadMessages), default=`1`}"
             android:visibility="@{viewModel.unreadMessages > 0 &amp;&amp; !viewModel.hideConversations ? View.VISIBLE : View.GONE}"
-            app:layout_constraintTop_toTopOf="@id/conversations"
+            app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toStartOf="@id/conversations"
             app:layout_constraintEnd_toEndOf="@id/conversations"/>
 
@@ -101,9 +105,10 @@
             android:onClick="@{() -> viewModel.navigateToMeetings()}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="18dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginBottom="12dp"
             android:drawableTop="@drawable/video_conference"
-            android:drawablePadding="10dp"
+            android:drawablePadding="4dp"
             android:drawableTint="@{viewModel.meetingsSelected ? @color/main1_500 : @color/main2_600, default=@color/main2_600}"
             android:text="@string/bottom_navigation_meetings_label"
             android:visibility="@{viewModel.hideMeetings ? View.GONE : View.VISIBLE}"
diff --git a/app/src/main/res/layout/chat_list_fragment.xml b/app/src/main/res/layout/chat_list_fragment.xml
index ccee01ac3..7e6dfcc3c 100644
--- a/app/src/main/res/layout/chat_list_fragment.xml
+++ b/app/src/main/res/layout/chat_list_fragment.xml
@@ -126,7 +126,7 @@
                 <include
                     android:id="@+id/bottom_nav_bar"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/portrait_nav_bar_height"
+                    android:layout_height="wrap_content"
                     layout="@layout/bottom_nav_bar"
                     bind:viewModel="@{viewModel}"
                     app:layout_constraintBottom_toBottomOf="parent" />
diff --git a/app/src/main/res/layout/contacts_list_fragment.xml b/app/src/main/res/layout/contacts_list_fragment.xml
index 9597bf2a4..4dc30a0b6 100644
--- a/app/src/main/res/layout/contacts_list_fragment.xml
+++ b/app/src/main/res/layout/contacts_list_fragment.xml
@@ -174,7 +174,7 @@
                 <include
                     android:id="@+id/bottom_nav_bar"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/portrait_nav_bar_height"
+                    android:layout_height="wrap_content"
                     layout="@layout/bottom_nav_bar"
                     bind:viewModel="@{viewModel}"
                     app:layout_constraintBottom_toBottomOf="parent" />
diff --git a/app/src/main/res/layout/history_list_fragment.xml b/app/src/main/res/layout/history_list_fragment.xml
index b331ac434..f13b1c3e3 100644
--- a/app/src/main/res/layout/history_list_fragment.xml
+++ b/app/src/main/res/layout/history_list_fragment.xml
@@ -136,7 +136,7 @@
                 <include
                     android:id="@+id/bottom_nav_bar"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/portrait_nav_bar_height"
+                    android:layout_height="wrap_content"
                     layout="@layout/bottom_nav_bar"
                     bind:viewModel="@{viewModel}"
                     app:layout_constraintBottom_toBottomOf="parent" />
diff --git a/app/src/main/res/layout/meetings_list_fragment.xml b/app/src/main/res/layout/meetings_list_fragment.xml
index ad654234f..c789d793a 100644
--- a/app/src/main/res/layout/meetings_list_fragment.xml
+++ b/app/src/main/res/layout/meetings_list_fragment.xml
@@ -79,7 +79,7 @@
                 <include
                     android:id="@+id/bottom_nav_bar"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/portrait_nav_bar_height"
+                    android:layout_height="wrap_content"
                     layout="@layout/bottom_nav_bar"
                     bind:viewModel="@{viewModel}"
                     app:layout_constraintBottom_toBottomOf="parent" />
diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
index f44b6a412..5acd61d93 100644
--- a/app/src/main/res/values/dimen.xml
+++ b/app/src/main/res/values/dimen.xml
@@ -5,7 +5,6 @@
 
     <dimen name="screen_bottom_margin">10dp</dimen>
 
-    <dimen name="portrait_nav_bar_height">85dp</dimen>
     <dimen name="landscape_nav_bar_width">75dp</dimen>
     <dimen name="sliding_pane_left_fragment_width">350dp</dimen>
     <dimen name="sliding_pane_right_fragment_width">300dp</dimen>