From a81973e4cffc843731fc1cbba9777b4a2fae157e Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 16 Jun 2025 14:28:00 +0200
Subject: [PATCH] Using style to factorize popup menus attributes, added hover
 effect (same as pressed) & improved some layouts

---
 CHANGELOG.md                                  |  2 +
 .../main/res/color/icon_color_selector.xml    |  1 +
 .../res/color/icon_primary_color_selector.xml |  1 +
 .../in_call_button_background_tint_color.xml  |  1 +
 .../main/res/color/in_call_button_color.xml   |  2 +
 .../res/color/in_call_button_tint_color.xml   |  1 +
 .../res/color/primary_button_label_color.xml  |  2 +
 .../color/secondary_button_label_color.xml    |  2 +
 .../res/color/tertiary_button_label_color.xml |  1 +
 .../res/drawable/action_background_bottom.xml |  2 +
 .../res/drawable/action_background_full.xml   |  2 +
 .../res/drawable/action_background_middle.xml |  2 +
 .../res/drawable/action_background_top.xml    |  2 +
 .../circle_light_blue_button_background.xml   |  2 +
 .../circle_white_button_background.xml        |  2 +
 .../in_call_button_background_green.xml       |  2 +
 .../in_call_button_background_red.xml         |  2 +
 .../in_call_button_background_transparent.xml | 13 ++++
 .../res/drawable/menu_item_background.xml     |  2 +
 .../drawable/popup_menu_button_background.xml |  9 +++
 .../drawable/primary_button_background.xml    |  2 +
 .../res/drawable/primary_cell_background.xml  |  2 +
 .../drawable/primary_cell_background_alt.xml  |  2 +
 .../drawable/primary_cell_r10_background.xml  |  2 +
 .../drawable/secondary_button_background.xml  |  2 +
 .../drawable/secondary_cell_background.xml    |  2 +
 ...pe_round_popup_menu_pressed_background.xml |  5 ++
 .../shape_round_transparent_background.xml    |  5 ++
 .../squircle_green_button_background.xml      |  2 +
 .../squircle_red_button_background.xml        |  2 +
 .../drawable/tertiary_button_background.xml   |  2 +
 .../main/res/layout/account_popup_menu.xml    | 10 ++-
 .../main/res/layout/call_actions_generic.xml  | 43 ++++--------
 ...onference_participants_list_popup_menu.xml | 11 +---
 app/src/main/res/layout/call_numpad_digit.xml | 14 +---
 .../layout/call_numpad_digit_with_letters.xml | 14 +---
 .../layout/call_numpad_digit_with_plus.xml    | 14 +---
 .../call_numpad_digit_with_voicemail.xml      | 14 +---
 .../layout/chat_bubble_long_press_menu.xml    | 25 ++++---
 .../layout/chat_conversation_popup_menu.xml   | 65 +++----------------
 .../chat_participant_admin_popup_menu.xml     | 56 +++-------------
 app/src/main/res/layout/contact_list_cell.xml | 17 +----
 .../contacts_list_filter_popup_menu.xml       | 20 ++----
 ...neric_address_picker_contact_list_cell.xml | 15 +----
 ..._address_picker_conversation_list_cell.xml | 15 +----
 .../res/layout/history_list_popup_menu.xml    |  8 +--
 .../main/res/layout/history_popup_menu.xml    | 42 +++---------
 .../main/res/layout/meeting_popup_menu.xml    | 36 +++++-----
 .../layout/start_call_numpad_bottom_sheet.xml | 24 +++----
 app/src/main/res/values/dimen.xml             |  3 +-
 app/src/main/res/values/styles.xml            | 31 +++++----
 51 files changed, 208 insertions(+), 350 deletions(-)
 create mode 100644 app/src/main/res/drawable/in_call_button_background_transparent.xml
 create mode 100644 app/src/main/res/drawable/popup_menu_button_background.xml
 create mode 100644 app/src/main/res/drawable/shape_round_popup_menu_pressed_background.xml
 create mode 100644 app/src/main/res/drawable/shape_round_transparent_background.xml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b06d2ba23..2389e5133 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,9 @@ Group changes to describe their impact on the project, as follows:
 ## [6.1.0] - Unreleased
 
 ### Added
+- Added hover effect when using a mouse (useful for tablets or devices with desktop mode)
 - Added toggle speaker action in active call notification
+- Added back increased text size for chat messages that only contains emoji(s)
 - Added a vu meter for recording & playback volumes (disabled by default, must be enabled in CorePreferences)
 - Added a setting for user to choose whether to sort contacts by first name or last name
 - Added a setting to hide contacts that have neither a SIP address nor a phone number
diff --git a/app/src/main/res/color/icon_color_selector.xml b/app/src/main/res/color/icon_color_selector.xml
index 93c5547b1..4e8e23e2a 100644
--- a/app/src/main/res/color/icon_color_selector.xml
+++ b/app/src/main/res/color/icon_color_selector.xml
@@ -2,5 +2,6 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false" android:color="?attr/color_grey_300"/>
     <item android:state_pressed="true" android:color="?attr/color_main1_500"/>
+    <item android:state_hovered="true" android:color="?attr/color_main1_500"/>
     <item android:color="?attr/color_main2_500"/>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/icon_primary_color_selector.xml b/app/src/main/res/color/icon_primary_color_selector.xml
index f05cdbb0e..c13e2e2b2 100644
--- a/app/src/main/res/color/icon_primary_color_selector.xml
+++ b/app/src/main/res/color/icon_primary_color_selector.xml
@@ -2,5 +2,6 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false" android:color="?attr/color_main2_200"/>
     <item android:state_pressed="true" android:color="?attr/color_main2_500"/>
+    <item android:state_hovered="true" android:color="?attr/color_main2_500"/>
     <item android:color="?attr/color_main1_500"/>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/in_call_button_background_tint_color.xml b/app/src/main/res/color/in_call_button_background_tint_color.xml
index 67e4952cb..0becb21f8 100644
--- a/app/src/main/res/color/in_call_button_background_tint_color.xml
+++ b/app/src/main/res/color/in_call_button_background_tint_color.xml
@@ -2,5 +2,6 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false" android:color="@color/gray_700" />
     <item android:state_pressed="true" android:color="@color/gray_main2_400" />
+    <item android:state_hovered="true" android:color="@color/gray_main2_400" />
     <item android:color="@color/gray_500"/>
 </selector>
diff --git a/app/src/main/res/color/in_call_button_color.xml b/app/src/main/res/color/in_call_button_color.xml
index 4fa2d9bb3..92cd270cf 100644
--- a/app/src/main/res/color/in_call_button_color.xml
+++ b/app/src/main/res/color/in_call_button_color.xml
@@ -2,6 +2,8 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true"
         android:color="@color/bc_white" />
+    <item android:state_hovered="true"
+        android:color="@color/bc_white" />
     <item
         android:color="@color/transparent_color"/>
 </selector>
diff --git a/app/src/main/res/color/in_call_button_tint_color.xml b/app/src/main/res/color/in_call_button_tint_color.xml
index 3c8402d0a..898f65ef2 100644
--- a/app/src/main/res/color/in_call_button_tint_color.xml
+++ b/app/src/main/res/color/in_call_button_tint_color.xml
@@ -2,5 +2,6 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false" android:color="@color/gray_400" />
     <item android:state_pressed="true" android:color="@color/bc_white" />
+    <item android:state_hovered="true" android:color="@color/bc_white" />
     <item android:color="@color/bc_white"/>
 </selector>
diff --git a/app/src/main/res/color/primary_button_label_color.xml b/app/src/main/res/color/primary_button_label_color.xml
index 31aa017d9..0a60ac460 100644
--- a/app/src/main/res/color/primary_button_label_color.xml
+++ b/app/src/main/res/color/primary_button_label_color.xml
@@ -4,6 +4,8 @@
         android:color="?attr/color_on_main" />
     <item android:state_pressed="true"
         android:color="?attr/color_on_main" />
+    <item android:state_hovered="true"
+        android:color="?attr/color_on_main" />
     <item
         android:color="?attr/color_on_main"/>
 </selector>
diff --git a/app/src/main/res/color/secondary_button_label_color.xml b/app/src/main/res/color/secondary_button_label_color.xml
index 4788ca05b..beeab10b4 100644
--- a/app/src/main/res/color/secondary_button_label_color.xml
+++ b/app/src/main/res/color/secondary_button_label_color.xml
@@ -4,6 +4,8 @@
         android:color="?attr/color_main1_500" />
     <item android:state_pressed="true"
         android:color="?attr/color_main2_000" />
+    <item android:state_hovered="true"
+        android:color="?attr/color_main2_000" />
     <item
         android:color="?attr/color_main1_500"/>
 </selector>
diff --git a/app/src/main/res/color/tertiary_button_label_color.xml b/app/src/main/res/color/tertiary_button_label_color.xml
index 0dfdda8ab..5bf48c62c 100644
--- a/app/src/main/res/color/tertiary_button_label_color.xml
+++ b/app/src/main/res/color/tertiary_button_label_color.xml
@@ -2,5 +2,6 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false" android:color="@color/gray_400" />
     <item android:state_pressed="true" android:color="?attr/color_main1_500" />
+    <item android:state_hovered="true" android:color="?attr/color_main1_500" />
     <item android:color="?attr/color_main1_500"/>
 </selector>
diff --git a/app/src/main/res/drawable/action_background_bottom.xml b/app/src/main/res/drawable/action_background_bottom.xml
index f044482aa..1d7579047 100644
--- a/app/src/main/res/drawable/action_background_bottom.xml
+++ b/app/src/main/res/drawable/action_background_bottom.xml
@@ -4,6 +4,8 @@
         android:drawable="@drawable/shape_squircle_main2_100_background_bottom" />
     <item android:state_pressed="true"
         android:drawable="@drawable/shape_squircle_main2_100_background_bottom" />
+    <item android:state_hovered="true"
+        android:drawable="@drawable/shape_squircle_main2_100_background_bottom" />
     <item
         android:drawable="@drawable/shape_squircle_white_background_bottom" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/action_background_full.xml b/app/src/main/res/drawable/action_background_full.xml
index 25ac4f240..45b708991 100644
--- a/app/src/main/res/drawable/action_background_full.xml
+++ b/app/src/main/res/drawable/action_background_full.xml
@@ -4,6 +4,8 @@
         android:drawable="@drawable/shape_squircle_main2_100_r15_background" />
     <item android:state_pressed="true"
         android:drawable="@drawable/shape_squircle_main2_100_r15_background" />
+    <item android:state_hovered="true"
+        android:drawable="@drawable/shape_squircle_main2_100_r15_background" />
     <item
         android:drawable="@drawable/shape_squircle_white_r15_background" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/action_background_middle.xml b/app/src/main/res/drawable/action_background_middle.xml
index fbc9e3cc0..af86707b1 100644
--- a/app/src/main/res/drawable/action_background_middle.xml
+++ b/app/src/main/res/drawable/action_background_middle.xml
@@ -4,6 +4,8 @@
         android:drawable="@drawable/shape_rectangle_gray_background" />
     <item android:state_pressed="true"
         android:drawable="@drawable/shape_rectangle_gray_background" />
+    <item android:state_hovered="true"
+        android:drawable="@drawable/shape_rectangle_gray_background" />
     <item
         android:drawable="@drawable/shape_rectangle_white_background" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/action_background_top.xml b/app/src/main/res/drawable/action_background_top.xml
index 0c2549c10..7aa7926d3 100644
--- a/app/src/main/res/drawable/action_background_top.xml
+++ b/app/src/main/res/drawable/action_background_top.xml
@@ -4,6 +4,8 @@
         android:drawable="@drawable/shape_squircle_main2_100_background_top" />
     <item android:state_pressed="true"
         android:drawable="@drawable/shape_squircle_main2_100_background_top" />
+    <item android:state_hovered="true"
+        android:drawable="@drawable/shape_squircle_main2_100_background_top" />
     <item
         android:drawable="@drawable/shape_squircle_white_background_top" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/circle_light_blue_button_background.xml b/app/src/main/res/drawable/circle_light_blue_button_background.xml
index 88b35c53a..88d1b1574 100644
--- a/app/src/main/res/drawable/circle_light_blue_button_background.xml
+++ b/app/src/main/res/drawable/circle_light_blue_button_background.xml
@@ -4,6 +4,8 @@
         android:drawable="@drawable/shape_circle_light_blue_disabled_background" />
     <item android:state_pressed="true"
         android:drawable="@drawable/shape_circle_light_blue_pressed_background" />
+    <item android:state_hovered="true"
+        android:drawable="@drawable/shape_circle_light_blue_pressed_background" />
     <item
         android:drawable="@drawable/shape_circle_light_blue_background" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/circle_white_button_background.xml b/app/src/main/res/drawable/circle_white_button_background.xml
index 83326874b..5e3a9d11d 100644
--- a/app/src/main/res/drawable/circle_white_button_background.xml
+++ b/app/src/main/res/drawable/circle_white_button_background.xml
@@ -4,6 +4,8 @@
         android:drawable="@drawable/shape_primary_button_disabled_background" />
     <item android:state_pressed="true"
         android:drawable="@drawable/shape_circle_white_pressed_background" />
+    <item android:state_hovered="true"
+        android:drawable="@drawable/shape_circle_white_pressed_background" />
     <item
         android:drawable="@drawable/shape_circle_white_call_background" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/in_call_button_background_green.xml b/app/src/main/res/drawable/in_call_button_background_green.xml
index 4f8efb4b0..10f619917 100644
--- a/app/src/main/res/drawable/in_call_button_background_green.xml
+++ b/app/src/main/res/drawable/in_call_button_background_green.xml
@@ -6,6 +6,8 @@
         android:drawable="@drawable/shape_round_in_call_selected_green_button_background" />
     <item android:state_pressed="true"
         android:drawable="@drawable/shape_round_in_call_pressed_button_background" />
+    <item android:state_hovered="true"
+        android:drawable="@drawable/shape_round_in_call_pressed_button_background" />
     <item
         android:drawable="@drawable/shape_round_in_call_button_background" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/in_call_button_background_red.xml b/app/src/main/res/drawable/in_call_button_background_red.xml
index ae3b842f9..d6bf319d1 100644
--- a/app/src/main/res/drawable/in_call_button_background_red.xml
+++ b/app/src/main/res/drawable/in_call_button_background_red.xml
@@ -6,6 +6,8 @@
         android:drawable="@drawable/shape_round_in_call_selected_red_button_background" />
     <item android:state_pressed="true"
         android:drawable="@drawable/shape_round_in_call_pressed_button_background" />
+    <item android:state_hovered="true"
+        android:drawable="@drawable/shape_round_in_call_pressed_button_background" />
     <item
         android:drawable="@drawable/shape_round_in_call_button_background" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/in_call_button_background_transparent.xml b/app/src/main/res/drawable/in_call_button_background_transparent.xml
new file mode 100644
index 000000000..1096ed16d
--- /dev/null
+++ b/app/src/main/res/drawable/in_call_button_background_transparent.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="false"
+        android:drawable="@drawable/shape_round_in_call_disabled_button_background" />
+    <item android:state_selected="true"
+        android:drawable="@drawable/shape_round_in_call_selected_red_button_background" />
+    <item android:state_pressed="true"
+        android:drawable="@drawable/shape_round_in_call_pressed_button_background" />
+    <item android:state_hovered="true"
+        android:drawable="@drawable/shape_round_in_call_pressed_button_background" />
+    <item
+        android:drawable="@drawable/shape_round_transparent_background" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/menu_item_background.xml b/app/src/main/res/drawable/menu_item_background.xml
index 72c6a78a2..46c287b5c 100644
--- a/app/src/main/res/drawable/menu_item_background.xml
+++ b/app/src/main/res/drawable/menu_item_background.xml
@@ -4,6 +4,8 @@
         android:drawable="@drawable/shape_rectangle_gray_background" />
     <item android:state_pressed="true"
         android:drawable="@drawable/shape_rectangle_gray_background" />
+    <item android:state_hovered="true"
+        android:drawable="@drawable/shape_rectangle_gray_background" />
     <item
         android:drawable="@drawable/shape_menu_item_background" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/popup_menu_button_background.xml b/app/src/main/res/drawable/popup_menu_button_background.xml
new file mode 100644
index 000000000..3d60bd9aa
--- /dev/null
+++ b/app/src/main/res/drawable/popup_menu_button_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true"
+        android:drawable="@drawable/shape_round_popup_menu_pressed_background" />
+    <item android:state_hovered="true"
+        android:drawable="@drawable/shape_round_popup_menu_pressed_background" />
+    <item
+        android:drawable="@drawable/shape_round_popup_menu_background" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/primary_button_background.xml b/app/src/main/res/drawable/primary_button_background.xml
index 69ae79fba..fffc810d2 100644
--- a/app/src/main/res/drawable/primary_button_background.xml
+++ b/app/src/main/res/drawable/primary_button_background.xml
@@ -4,6 +4,8 @@
         android:drawable="@drawable/shape_primary_button_disabled_background" />
     <item android:state_pressed="true"
         android:drawable="@drawable/shape_primary_button_pressed_background" />
+    <item android:state_hovered="true"
+        android:drawable="@drawable/shape_primary_button_pressed_background" />
     <item
         android:drawable="@drawable/shape_primary_button_background" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/primary_cell_background.xml b/app/src/main/res/drawable/primary_cell_background.xml
index 2f9a9ca58..45386dfcb 100644
--- a/app/src/main/res/drawable/primary_cell_background.xml
+++ b/app/src/main/res/drawable/primary_cell_background.xml
@@ -4,6 +4,8 @@
         android:drawable="@drawable/color_main2_100" />
     <item android:state_pressed="true"
         android:drawable="@drawable/color_main2_100" />
+    <item android:state_hovered="true"
+        android:drawable="@drawable/color_main2_100" />
     <item
         android:drawable="@drawable/color_main2_000" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/primary_cell_background_alt.xml b/app/src/main/res/drawable/primary_cell_background_alt.xml
index 0625945d0..f012c7c4c 100644
--- a/app/src/main/res/drawable/primary_cell_background_alt.xml
+++ b/app/src/main/res/drawable/primary_cell_background_alt.xml
@@ -4,6 +4,8 @@
         android:drawable="@drawable/color_main2_100" />
     <item android:state_pressed="true"
         android:drawable="@drawable/color_main2_100" />
+    <item android:state_hovered="true"
+        android:drawable="@drawable/color_main2_100" />
     <item
         android:drawable="@drawable/color_background_contrast" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/primary_cell_r10_background.xml b/app/src/main/res/drawable/primary_cell_r10_background.xml
index e3a99d27e..7b96644e5 100644
--- a/app/src/main/res/drawable/primary_cell_r10_background.xml
+++ b/app/src/main/res/drawable/primary_cell_r10_background.xml
@@ -4,6 +4,8 @@
         android:drawable="@drawable/shape_squircle_gray_main2_100_r10_background" />
     <item android:state_pressed="true"
         android:drawable="@drawable/shape_squircle_gray_main2_100_r10_background" />
+    <item android:state_hovered="true"
+        android:drawable="@drawable/shape_squircle_gray_main2_100_r10_background" />
     <item
         android:drawable="@drawable/shape_squircle_white_r10_background" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/secondary_button_background.xml b/app/src/main/res/drawable/secondary_button_background.xml
index d002e4e5c..10ac3e62b 100644
--- a/app/src/main/res/drawable/secondary_button_background.xml
+++ b/app/src/main/res/drawable/secondary_button_background.xml
@@ -4,6 +4,8 @@
         android:drawable="@drawable/shape_secondary_button_disabled_background" />
     <item android:state_pressed="true"
         android:drawable="@drawable/shape_secondary_button_pressed_background" />
+    <item android:state_hovered="true"
+        android:drawable="@drawable/shape_secondary_button_pressed_background" />
     <item
         android:drawable="@drawable/shape_secondary_button_background" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/secondary_cell_background.xml b/app/src/main/res/drawable/secondary_cell_background.xml
index 8d2657fce..ea60a6ac2 100644
--- a/app/src/main/res/drawable/secondary_cell_background.xml
+++ b/app/src/main/res/drawable/secondary_cell_background.xml
@@ -4,6 +4,8 @@
         android:drawable="@drawable/color_main2_100" />
     <item android:state_pressed="true"
         android:drawable="@drawable/color_main2_100" />
+    <item android:state_hovered="true"
+        android:drawable="@drawable/color_main2_100" />
     <item
         android:drawable="@color/transparent_color" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_round_popup_menu_pressed_background.xml b/app/src/main/res/drawable/shape_round_popup_menu_pressed_background.xml
new file mode 100644
index 000000000..6a04a3d9f
--- /dev/null
+++ b/app/src/main/res/drawable/shape_round_popup_menu_pressed_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <corners android:radius="16dp" />
+    <solid android:color="?attr/color_main2_100"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_round_transparent_background.xml b/app/src/main/res/drawable/shape_round_transparent_background.xml
new file mode 100644
index 000000000..b9942d93e
--- /dev/null
+++ b/app/src/main/res/drawable/shape_round_transparent_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+    <size android:width="55dp" android:height="55dp" />
+    <solid android:color="@color/transparent_color"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/squircle_green_button_background.xml b/app/src/main/res/drawable/squircle_green_button_background.xml
index 34552986e..d002cf8dc 100644
--- a/app/src/main/res/drawable/squircle_green_button_background.xml
+++ b/app/src/main/res/drawable/squircle_green_button_background.xml
@@ -4,6 +4,8 @@
         android:drawable="@drawable/shape_squircle_green_disabled_background" />
     <item android:state_pressed="true"
         android:drawable="@drawable/shape_squircle_green_pressed_background" />
+    <item android:state_hovered="true"
+        android:drawable="@drawable/shape_squircle_green_pressed_background" />
     <item
         android:drawable="@drawable/shape_squircle_green_background" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/squircle_red_button_background.xml b/app/src/main/res/drawable/squircle_red_button_background.xml
index 0669a1a3e..a7a250075 100644
--- a/app/src/main/res/drawable/squircle_red_button_background.xml
+++ b/app/src/main/res/drawable/squircle_red_button_background.xml
@@ -4,6 +4,8 @@
         android:drawable="@drawable/shape_squircle_red_disabled_background" />
     <item android:state_pressed="true"
         android:drawable="@drawable/shape_squircle_red_pressed_background" />
+    <item android:state_hovered="true"
+        android:drawable="@drawable/shape_squircle_red_pressed_background" />
     <item
         android:drawable="@drawable/shape_squircle_red_background" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/tertiary_button_background.xml b/app/src/main/res/drawable/tertiary_button_background.xml
index 2c40a0d99..9f96c0943 100644
--- a/app/src/main/res/drawable/tertiary_button_background.xml
+++ b/app/src/main/res/drawable/tertiary_button_background.xml
@@ -4,6 +4,8 @@
         android:drawable="@drawable/shape_tertiary_button_disabled_background" />
     <item android:state_pressed="true"
         android:drawable="@drawable/shape_tertiary_button_pressed_background" />
+    <item android:state_hovered="true"
+        android:drawable="@drawable/shape_tertiary_button_pressed_background" />
     <item
         android:drawable="@drawable/shape_tertiary_button_background" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/account_popup_menu.xml b/app/src/main/res/layout/account_popup_menu.xml
index 7892928b0..e5aef5e2e 100644
--- a/app/src/main/res/layout/account_popup_menu.xml
+++ b/app/src/main/res/layout/account_popup_menu.xml
@@ -16,18 +16,16 @@
         android:background="@drawable/shape_round_popup_menu_background">
 
         <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
+            style="@style/popup_menu_item"
             android:id="@+id/manage_profile"
             android:onClick="@{manageProfileClickListener}"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_margin="@dimen/popup_menu_padding"
+            android:layout_marginBottom="@dimen/popup_menu_padding"
+            android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:text="@string/drawer_menu_manage_account"
-            android:textSize="14sp"
-            android:textColor="?attr/color_main2_500"
             android:drawableStart="@drawable/user_circle_gear"
-            android:drawablePadding="5dp"
-            app:drawableTint="?attr/color_main2_700"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/call_actions_generic.xml b/app/src/main/res/layout/call_actions_generic.xml
index 771d99bda..19b1915c2 100644
--- a/app/src/main/res/layout/call_actions_generic.xml
+++ b/app/src/main/res/layout/call_actions_generic.xml
@@ -77,27 +77,16 @@
             app:layout_constraintStart_toStartOf="@id/toggle_video"
             app:layout_constraintEnd_toEndOf="@id/toggle_video"/>
 
-        <ImageView
-            android:id="@+id/toggle_mute_mic_background"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:selected="@{viewModel.isMicrophoneMuted}"
-            android:background="@drawable/in_call_button_background_red"
-            android:contentDescription="@null"
-            app:layout_constraintTop_toTopOf="@id/toggle_mute_mic"
-            app:layout_constraintBottom_toBottomOf="@id/toggle_mute_mic"
-            app:layout_constraintStart_toStartOf="@id/toggle_mute_mic"
-            app:layout_constraintEnd_toEndOf="@id/toggle_mute_mic" />
-
         <org.linphone.ui.call.view.VuMeterView
             android:id="@+id/record_volume_vu_meter"
             android:layout_width="0dp"
             android:layout_height="0dp"
+            android:background="@drawable/in_call_button_background_red"
             vuMeterPercentage="@{viewModel.microphoneRecordingVolume}"
-            app:layout_constraintTop_toTopOf="@id/toggle_mute_mic_background"
-            app:layout_constraintBottom_toBottomOf="@id/toggle_mute_mic_background"
-            app:layout_constraintStart_toStartOf="@id/toggle_mute_mic_background"
-            app:layout_constraintEnd_toEndOf="@id/toggle_mute_mic_background" />
+            app:layout_constraintTop_toTopOf="@id/toggle_mute_mic"
+            app:layout_constraintBottom_toBottomOf="@id/toggle_mute_mic"
+            app:layout_constraintStart_toStartOf="@id/toggle_mute_mic"
+            app:layout_constraintEnd_toEndOf="@id/toggle_mute_mic" />
 
         <ImageView
             android:onClick="@{() -> viewModel.toggleMuteMicrophone()}"
@@ -108,32 +97,23 @@
             android:padding="@dimen/call_button_icon_padding"
             android:src="@{viewModel.isMicrophoneMuted ? @drawable/microphone_slash : @drawable/microphone, default=@drawable/microphone}"
             android:contentDescription="@string/content_description_toggle_microphone"
+            android:background="@drawable/in_call_button_background_transparent"
             app:tint="@color/in_call_button_tint_color"
             app:layout_constraintTop_toBottomOf="@id/call_actions_handle"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toEndOf="@id/toggle_video"
             app:layout_constraintEnd_toStartOf="@id/change_audio_output" />
 
-        <ImageView
-            android:id="@+id/change_audio_output_background"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:background="@drawable/in_call_button_background_red"
-            android:contentDescription="@null"
-            app:layout_constraintTop_toTopOf="@id/change_audio_output"
-            app:layout_constraintBottom_toBottomOf="@id/change_audio_output"
-            app:layout_constraintStart_toStartOf="@id/change_audio_output"
-            app:layout_constraintEnd_toEndOf="@id/change_audio_output" />
-
         <org.linphone.ui.call.view.VuMeterView
             android:id="@+id/playback_volume_vu_meter"
             android:layout_width="0dp"
             android:layout_height="0dp"
+            android:background="@drawable/in_call_button_background_red"
             vuMeterPercentage="@{viewModel.playbackVolume}"
-            app:layout_constraintTop_toTopOf="@id/change_audio_output_background"
-            app:layout_constraintBottom_toBottomOf="@id/change_audio_output_background"
-            app:layout_constraintStart_toStartOf="@id/change_audio_output_background"
-            app:layout_constraintEnd_toEndOf="@id/change_audio_output_background" />
+            app:layout_constraintTop_toTopOf="@id/change_audio_output"
+            app:layout_constraintBottom_toBottomOf="@id/change_audio_output"
+            app:layout_constraintStart_toStartOf="@id/change_audio_output"
+            app:layout_constraintEnd_toEndOf="@id/change_audio_output" />
 
         <ImageView
             android:onClick="@{() -> viewModel.changeAudioOutputDevice()}"
@@ -144,6 +124,7 @@
             android:padding="@dimen/call_button_icon_padding"
             android:src="@{viewModel.isHearingAidEnabled ? @drawable/ear : viewModel.isHeadsetEnabled ? @drawable/headset : viewModel.isBluetoothEnabled ? @drawable/bluetooth : viewModel.isSpeakerEnabled ? @drawable/speaker_high : @drawable/speaker_slash, default=@drawable/speaker_slash}"
             android:contentDescription="@string/content_description_change_output_audio_device"
+            android:background="@drawable/in_call_button_background_transparent"
             app:tint="@color/in_call_button_tint_color"
             app:layout_constraintTop_toBottomOf="@id/call_actions_handle"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/call_conference_participants_list_popup_menu.xml b/app/src/main/res/layout/call_conference_participants_list_popup_menu.xml
index cab8a321c..3e560630e 100644
--- a/app/src/main/res/layout/call_conference_participants_list_popup_menu.xml
+++ b/app/src/main/res/layout/call_conference_participants_list_popup_menu.xml
@@ -18,20 +18,13 @@
         android:background="@drawable/shape_round_popup_menu_background">
 
         <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
+            style="@style/popup_menu_item"
             android:id="@+id/share_invitation"
             android:onClick="@{shareInvitationClickListener}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/popup_menu_item_top_margin"
             android:text="@string/conference_share_link_title"
-            android:textSize="14sp"
-            android:textColor="?attr/color_main2_500"
-            android:maxLines="1"
-            android:ellipsize="end"
-            android:drawablePadding="5dp"
             android:drawableStart="@drawable/share_network"
-            app:drawableTint="?attr/color_main2_700"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -41,7 +34,7 @@
             android:id="@+id/bottom_anchor"
             android:layout_width="wrap_content"
             android:layout_height="1dp"
-            android:layout_marginBottom="@dimen/popup_menu_item_top_margin"
+            android:layout_marginBottom="@dimen/popup_menu_padding"
             app:layout_constraintWidth_max="@dimen/popup_menu_width"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/call_numpad_digit.xml b/app/src/main/res/layout/call_numpad_digit.xml
index 36761d722..9dc680600 100644
--- a/app/src/main/res/layout/call_numpad_digit.xml
+++ b/app/src/main/res/layout/call_numpad_digit.xml
@@ -14,18 +14,8 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:onClick="@{() -> model.onDigitClicked(digit)}"
         android:layout_width="@dimen/call_dtmf_button_size"
-        android:layout_height="@dimen/call_dtmf_button_size">
-
-        <ImageView
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:contentDescription="@null"
-            android:src="@drawable/in_call_button_background_red"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
+        android:layout_height="@dimen/call_dtmf_button_size"
+        android:background="@drawable/in_call_button_background_red">
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style"
diff --git a/app/src/main/res/layout/call_numpad_digit_with_letters.xml b/app/src/main/res/layout/call_numpad_digit_with_letters.xml
index e72ea7533..8bba443ee 100644
--- a/app/src/main/res/layout/call_numpad_digit_with_letters.xml
+++ b/app/src/main/res/layout/call_numpad_digit_with_letters.xml
@@ -19,18 +19,8 @@
         android:onClick="@{() -> model.onDigitClicked(digit)}"
         android:onLongClick="@{() -> model.onDigitLongClicked(digit)}"
         android:layout_width="@dimen/call_dtmf_button_size"
-        android:layout_height="@dimen/call_dtmf_button_size">
-
-        <ImageView
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:contentDescription="@null"
-            android:src="@drawable/in_call_button_background_red"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
+        android:layout_height="@dimen/call_dtmf_button_size"
+        android:background="@drawable/in_call_button_background_red">
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style"
diff --git a/app/src/main/res/layout/call_numpad_digit_with_plus.xml b/app/src/main/res/layout/call_numpad_digit_with_plus.xml
index e0548ff46..dcc8a25c5 100644
--- a/app/src/main/res/layout/call_numpad_digit_with_plus.xml
+++ b/app/src/main/res/layout/call_numpad_digit_with_plus.xml
@@ -17,18 +17,8 @@
         android:onClick="@{() -> model.onDigitClicked(digit)}"
         android:onLongClick="@{() -> model.onDigitLongClicked(digit)}"
         android:layout_width="@dimen/call_dtmf_button_size"
-        android:layout_height="@dimen/call_dtmf_button_size">
-
-        <ImageView
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:contentDescription="@null"
-            android:src="@drawable/in_call_button_background_red"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
+        android:layout_height="@dimen/call_dtmf_button_size"
+        android:background="@drawable/in_call_button_background_red">
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style"
diff --git a/app/src/main/res/layout/call_numpad_digit_with_voicemail.xml b/app/src/main/res/layout/call_numpad_digit_with_voicemail.xml
index 1ad9112da..71108c24d 100644
--- a/app/src/main/res/layout/call_numpad_digit_with_voicemail.xml
+++ b/app/src/main/res/layout/call_numpad_digit_with_voicemail.xml
@@ -19,18 +19,8 @@
         android:onClick="@{() -> model.onDigitClicked(digit)}"
         android:onLongClick="@{() -> model.onVoicemailLongClicked()}"
         android:layout_width="@dimen/call_dtmf_button_size"
-        android:layout_height="@dimen/call_dtmf_button_size">
-
-        <ImageView
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:contentDescription="@null"
-            android:src="@drawable/in_call_button_background_red"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
+        android:layout_height="@dimen/call_dtmf_button_size"
+        android:background="@drawable/in_call_button_background_red">
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style"
diff --git a/app/src/main/res/layout/chat_bubble_long_press_menu.xml b/app/src/main/res/layout/chat_bubble_long_press_menu.xml
index 4df2e93b7..d1e209e40 100644
--- a/app/src/main/res/layout/chat_bubble_long_press_menu.xml
+++ b/app/src/main/res/layout/chat_bubble_long_press_menu.xml
@@ -89,7 +89,6 @@
                 android:layout_marginStart="10dp"
                 android:layout_marginEnd="10dp"
                 android:layout_marginBottom="@dimen/screen_bottom_margin"
-                android:background="@drawable/shape_squircle_white_background"
                 app:layout_constraintWidth_max="250dp"
                 app:layout_constraintHorizontal_bias="@{viewModel.horizontalBias, default=0}"
                 app:layout_constraintBottom_toBottomOf="parent"
@@ -97,12 +96,13 @@
                 app:layout_constraintEnd_toEndOf="parent">
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/popup_menu_action_label_style"
+                    style="@style/chat_bubble_popup_menu_style"
                     android:id="@+id/action_resend"
                     android:onClick="@{() -> viewModel.resend()}"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/menu_resend_chat_message"
+                    android:background="@drawable/action_background_top"
                     android:drawableEnd="@drawable/paper_plane_right"
                     android:visibility="@{viewModel.isMessageInError &amp;&amp; viewModel.isMessageOutgoing ? View.VISIBLE : View.GONE, default=gone}" />
 
@@ -113,13 +113,14 @@
                     android:visibility="@{viewModel.isMessageInError &amp;&amp; viewModel.isMessageOutgoing ? View.VISIBLE : View.GONE, default=gone}"/>
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/popup_menu_action_label_style"
+                    style="@style/chat_bubble_popup_menu_style"
                     android:id="@+id/action_info"
                     android:onClick="@{() -> viewModel.showInfo()}"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/menu_show_imdn"
-                    android:drawableEnd="@drawable/info" />
+                    android:background="@{viewModel.isMessageInError &amp;&amp; viewModel.isMessageOutgoing ? @drawable/action_background_middle : @drawable/action_background_top, default=@drawable/action_background_top}"
+                    android:drawableEnd="@drawable/info"/>
 
                 <View
                     android:layout_width="match_parent"
@@ -127,12 +128,13 @@
                     android:background="?attr/color_separator"/>
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/popup_menu_action_label_style"
+                    style="@style/chat_bubble_popup_menu_style"
                     android:id="@+id/action_reply"
                     android:onClick="@{() -> viewModel.reply()}"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/menu_reply_to_chat_message"
+                    android:background="@drawable/action_background_middle"
                     android:visibility="@{viewModel.isChatRoomReadOnly ? View.GONE : View.VISIBLE}"
                     android:drawableEnd="@drawable/reply" />
 
@@ -143,12 +145,13 @@
                     android:visibility="@{viewModel.isChatRoomReadOnly ? View.GONE : View.VISIBLE}" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/popup_menu_action_label_style"
+                    style="@style/chat_bubble_popup_menu_style"
                     android:id="@+id/action_copy"
                     android:onClick="@{() -> viewModel.copyClickListener()}"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/menu_copy_chat_message"
+                    android:background="@drawable/action_background_middle"
                     android:visibility="@{viewModel.hideCopyTextToClipboard ? View.GONE : View.VISIBLE}"
                     android:drawableEnd="@drawable/copy"/>
 
@@ -159,12 +162,13 @@
                     android:visibility="@{viewModel.hideCopyTextToClipboard ? View.GONE : View.VISIBLE}"/>
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/popup_menu_action_label_style"
+                    style="@style/chat_bubble_popup_menu_style"
                     android:id="@+id/action_forward"
                     android:onClick="@{() -> viewModel.forwardClickListener()}"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/menu_forward_chat_message"
+                    android:background="@drawable/action_background_middle"
                     android:drawableEnd="@drawable/forward"
                     android:visibility="@{viewModel.hideForward ? View.GONE : View.VISIBLE}" />
 
@@ -175,13 +179,16 @@
                     android:visibility="@{viewModel.hideForward ? View.GONE : View.VISIBLE}" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/popup_menu_danger_action_label_style"
+                    style="@style/chat_bubble_popup_menu_style"
                     android:id="@+id/action_delete"
                     android:onClick="@{() -> viewModel.deleteClickListener()}"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text="@string/menu_delete_selected_item"
-                    android:drawableEnd="@drawable/trash_simple" />
+                    android:textColor="?attr/color_danger_500"
+                    android:background="@drawable/action_background_bottom"
+                    android:drawableEnd="@drawable/trash_simple"
+                    app:drawableTint="?attr/color_danger_500"/>
 
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/chat_conversation_popup_menu.xml b/app/src/main/res/layout/chat_conversation_popup_menu.xml
index 47276a09b..45c9f5f72 100644
--- a/app/src/main/res/layout/chat_conversation_popup_menu.xml
+++ b/app/src/main/res/layout/chat_conversation_popup_menu.xml
@@ -45,143 +45,94 @@
         android:background="@drawable/shape_round_popup_menu_background">
 
         <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
+            style="@style/popup_menu_item"
             android:id="@+id/info"
             android:onClick="@{goToInfoClickListener}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/popup_menu_item_top_margin"
             android:text="@string/conversation_menu_go_to_info"
-            android:textSize="14sp"
-            android:textColor="?attr/color_main2_500"
-            android:maxLines="1"
-            android:ellipsize="end"
             android:drawableStart="@drawable/info"
-            android:drawablePadding="5dp"
-            app:drawableTint="?attr/color_main2_700"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toTopOf="@id/search"/>
 
         <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
+            style="@style/popup_menu_item"
             android:id="@+id/search"
             android:onClick="@{searchClickListener}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/popup_menu_item_top_margin"
             android:text="@string/conversation_menu_search_in_messages"
-            android:textSize="14sp"
-            android:textColor="?attr/color_main2_500"
-            android:maxLines="1"
-            android:ellipsize="end"
             android:drawableStart="@drawable/magnifying_glass"
-            android:drawablePadding="5dp"
-            app:drawableTint="?attr/color_main2_700"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/info"
             app:layout_constraintBottom_toTopOf="@id/mute"/>
 
         <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
+            style="@style/popup_menu_item"
             android:id="@+id/mute"
             android:onClick="@{muteClickListener}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/popup_menu_item_top_margin"
             android:text="@string/conversation_action_mute"
-            android:textSize="14sp"
-            android:textColor="?attr/color_main2_500"
-            android:maxLines="1"
-            android:ellipsize="end"
             android:drawableStart="@drawable/bell_simple_slash"
-            android:drawablePadding="5dp"
             android:visibility="@{conversationMuted || readOnlyConversation ? View.GONE : View.VISIBLE}"
-            app:drawableTint="?attr/color_main2_700"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/search"
             app:layout_constraintBottom_toTopOf="@id/unmute"/>
 
         <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
+            style="@style/popup_menu_item"
             android:id="@+id/unmute"
             android:onClick="@{unmuteClickListener}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/popup_menu_item_top_margin"
             android:text="@string/conversation_action_unmute"
-            android:textSize="14sp"
-            android:textColor="?attr/color_main2_500"
-            android:maxLines="1"
-            android:ellipsize="end"
             android:drawableStart="@drawable/bell_simple"
-            android:drawablePadding="5dp"
             android:visibility="@{conversationMuted &amp;&amp; !readOnlyConversation ? View.VISIBLE : View.GONE, default=gone}"
-            app:drawableTint="?attr/color_main2_700"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/mute"
             app:layout_constraintBottom_toTopOf="@id/ephemeral"/>
 
         <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
+            style="@style/popup_menu_item"
             android:id="@+id/ephemeral"
             android:onClick="@{configureEphemeralMessagesClickListener}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/popup_menu_item_top_margin"
             android:text="@string/conversation_menu_configure_ephemeral_messages"
-            android:textSize="14sp"
-            android:textColor="?attr/color_main2_500"
-            android:maxLines="1"
-            android:ellipsize="end"
             android:drawableStart="@drawable/clock_countdown"
-            android:drawablePadding="5dp"
             android:visibility="@{ephemeralMessagesAvailable &amp;&amp; !readOnlyConversation ? View.VISIBLE : View.GONE}"
-            app:drawableTint="?attr/color_main2_700"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/unmute"
             app:layout_constraintBottom_toTopOf="@id/media"/>
 
         <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
+            style="@style/popup_menu_item"
             android:id="@+id/media"
             android:onClick="@{mediaClickListener}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/popup_menu_item_top_margin"
             android:text="@string/conversation_menu_media_files"
-            android:textSize="14sp"
-            android:textColor="?attr/color_main2_500"
-            android:maxLines="1"
-            android:ellipsize="end"
             android:drawableStart="@drawable/image"
-            android:drawablePadding="5dp"
-            app:drawableTint="?attr/color_main2_700"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/ephemeral"
             app:layout_constraintBottom_toTopOf="@id/documents"/>
 
         <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
+            style="@style/popup_menu_item"
             android:id="@+id/documents"
             android:onClick="@{documentsClickListener}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/popup_menu_item_top_margin"
             android:text="@string/conversation_menu_documents_files"
-            android:textSize="14sp"
-            android:textColor="?attr/color_main2_500"
-            android:maxLines="1"
-            android:ellipsize="end"
             android:drawableStart="@drawable/file_pdf"
-            android:drawablePadding="5dp"
-            app:drawableTint="?attr/color_main2_700"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/media"
@@ -191,7 +142,7 @@
             android:id="@+id/bottom_anchor"
             android:layout_width="wrap_content"
             android:layout_height="1dp"
-            android:layout_marginBottom="@dimen/popup_menu_item_top_margin"
+            android:layout_marginBottom="@dimen/popup_menu_padding"
             app:layout_constraintWidth_max="@dimen/popup_menu_width"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/chat_participant_admin_popup_menu.xml b/app/src/main/res/layout/chat_participant_admin_popup_menu.xml
index 813bd3de4..ae2c6f110 100644
--- a/app/src/main/res/layout/chat_participant_admin_popup_menu.xml
+++ b/app/src/main/res/layout/chat_participant_admin_popup_menu.xml
@@ -42,21 +42,14 @@
         android:background="@drawable/shape_round_popup_menu_background">
 
         <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
+            style="@style/popup_menu_item"
             android:id="@+id/show_contact"
             android:onClick="@{seeContactProfileClickListener}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/popup_menu_item_top_margin"
             android:visibility="@{isParticipantContact ? View.VISIBLE : View.GONE}"
             android:text="@string/conversation_info_menu_go_to_contact"
-            android:textSize="14sp"
-            android:textColor="?attr/color_main2_500"
-            android:maxLines="1"
-            android:ellipsize="end"
             android:drawableStart="@drawable/address_book"
-            android:drawablePadding="5dp"
-            app:drawableTint="?attr/color_main2_700"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -64,21 +57,14 @@
             app:layout_constraintBottom_toTopOf="@id/add_to_contacts"/>
 
         <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
+            style="@style/popup_menu_item"
             android:id="@+id/add_to_contacts"
             android:onClick="@{addToContactsClickListener}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/popup_menu_item_top_margin"
             android:visibility="@{isParticipantContact ? View.GONE : View.VISIBLE, default=gone}"
             android:text="@string/conversation_info_menu_add_to_contacts"
-            android:textSize="14sp"
-            android:textColor="?attr/color_main2_500"
-            android:maxLines="1"
-            android:ellipsize="end"
             android:drawableStart="@drawable/user_plus"
-            android:drawablePadding="5dp"
-            app:drawableTint="?attr/color_main2_700"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -86,21 +72,14 @@
             app:layout_constraintBottom_toTopOf="@id/set_admin"/>
 
         <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
+            style="@style/popup_menu_item"
             android:id="@+id/set_admin"
             android:onClick="@{setAdminClickListener}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/popup_menu_item_top_margin"
             android:visibility="@{isParticipantAdmin || !isMeAdmin ? View.GONE : View.VISIBLE}"
             android:text="@string/conversation_info_admin_menu_set_participant_admin"
-            android:textSize="14sp"
-            android:textColor="?attr/color_main2_500"
-            android:maxLines="1"
-            android:ellipsize="end"
             android:drawableStart="@drawable/user_circle"
-            android:drawablePadding="5dp"
-            app:drawableTint="?attr/color_main2_700"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -108,21 +87,14 @@
             app:layout_constraintBottom_toTopOf="@id/unset_admin"/>
 
         <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
+            style="@style/popup_menu_item"
             android:id="@+id/unset_admin"
             android:onClick="@{unsetAdminClickListener}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/popup_menu_item_top_margin"
             android:visibility="@{isParticipantAdmin &amp;&amp; isMeAdmin ? View.VISIBLE : View.GONE, default=gone}"
             android:text="@string/conversation_info_admin_menu_unset_participant_admin"
-            android:textSize="14sp"
-            android:textColor="?attr/color_main2_500"
-            android:maxLines="1"
-            android:ellipsize="end"
             android:drawableStart="@drawable/user_circle"
-            android:drawablePadding="5dp"
-            app:drawableTint="?attr/color_main2_700"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -130,20 +102,13 @@
             app:layout_constraintBottom_toTopOf="@id/copy_sip_uri"/>
 
         <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
+            style="@style/popup_menu_item"
             android:id="@+id/copy_sip_uri"
             android:onClick="@{copySipUriClickListener}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/popup_menu_item_top_margin"
             android:text="@string/menu_copy_sip_address"
-            android:textSize="14sp"
-            android:textColor="?attr/color_main2_500"
-            android:maxLines="1"
-            android:ellipsize="end"
             android:drawableStart="@drawable/copy"
-            android:drawablePadding="5dp"
-            app:drawableTint="?attr/color_main2_700"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -154,7 +119,7 @@
             android:id="@+id/separator"
             android:layout_width="0dp"
             android:layout_height="1dp"
-            android:layout_marginTop="@dimen/popup_menu_item_top_margin"
+            android:layout_marginTop="@dimen/popup_menu_padding"
             android:background="?attr/color_main2_400"
             android:visibility="@{isMeAdmin ? View.VISIBLE : View.GONE}"
             app:layout_constraintStart_toStartOf="parent"
@@ -163,20 +128,15 @@
             app:layout_constraintBottom_toTopOf="@id/remove_participant" />
 
         <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
+            style="@style/popup_menu_item"
             android:id="@+id/remove_participant"
             android:onClick="@{removeParticipantClickListener}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/popup_menu_item_top_margin"
             android:text="@string/conversation_info_admin_menu_remove_participant"
-            android:textSize="14sp"
             android:textColor="?attr/color_danger_500"
-            android:maxLines="1"
-            android:ellipsize="end"
             android:visibility="@{isMeAdmin ? View.VISIBLE : View.GONE}"
             android:drawableStart="@drawable/trash_simple"
-            android:drawablePadding="5dp"
             app:drawableTint="?attr/color_danger_500"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
@@ -188,7 +148,7 @@
             android:id="@+id/bottom_anchor"
             android:layout_width="wrap_content"
             android:layout_height="1dp"
-            android:layout_marginBottom="@dimen/popup_menu_item_top_margin"
+            android:layout_marginBottom="@dimen/popup_menu_padding"
             app:layout_constraintWidth_max="@dimen/popup_menu_width"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/contact_list_cell.xml b/app/src/main/res/layout/contact_list_cell.xml
index 1bcb29491..5bb804ee5 100644
--- a/app/src/main/res/layout/contact_list_cell.xml
+++ b/app/src/main/res/layout/contact_list_cell.xml
@@ -24,22 +24,11 @@
         android:onLongClick="@{onLongClickListener}"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginStart="4dp"
+        android:layout_marginEnd="16dp"
         android:paddingTop="5dp"
         android:paddingBottom="5dp"
-        android:layout_marginStart="4dp"
-        android:layout_marginEnd="16dp">
-
-        <ImageView
-            android:id="@+id/background"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginStart="5dp"
-            android:src="@drawable/primary_cell_background"
-            android:contentDescription="@null"
-            app:layout_constraintStart_toEndOf="@id/header"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"/>
+        android:background="@drawable/primary_cell_background">
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style_500"
diff --git a/app/src/main/res/layout/contacts_list_filter_popup_menu.xml b/app/src/main/res/layout/contacts_list_filter_popup_menu.xml
index 788aefcda..202225e6c 100644
--- a/app/src/main/res/layout/contacts_list_filter_popup_menu.xml
+++ b/app/src/main/res/layout/contacts_list_filter_popup_menu.xml
@@ -30,16 +30,12 @@
         android:background="@drawable/shape_round_popup_menu_background">
 
         <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
+            style="@style/popup_menu_item"
             android:id="@+id/no_filter"
             android:onClick="@{noFilterClickListener}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/popup_menu_item_top_margin"
             android:text="@string/contacts_list_filter_popup_see_all"
-            android:textSize="14sp"
-            android:textColor="?attr/color_main2_500"
-            android:drawablePadding="5dp"
             android:drawableEnd="@drawable/check"
             android:drawableTint="@{seeAllSelected ? @color/green_success_500 : @color/transparent_color, default=@color/transparent_color}"
             app:layout_constraintStart_toStartOf="parent"
@@ -48,17 +44,13 @@
             app:layout_constraintBottom_toTopOf="@id/linphone_filter"/>
 
         <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
+            style="@style/popup_menu_item"
             android:id="@+id/linphone_filter"
             android:onClick="@{linphoneOnlyClickListener}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/popup_menu_item_top_margin"
             android:text="@string/contacts_list_filter_popup_see_linphone_only"
-            android:textSize="14sp"
-            android:textColor="?attr/color_main2_500"
             android:visibility="@{showLinphoneFilter ? View.VISIBLE : View.GONE}"
-            android:drawablePadding="5dp"
             android:drawableEnd="@drawable/check"
             android:drawableTint="@{seeAllSelected ? @color/transparent_color : @color/green_success_500, default=@color/green_success_500}"
             app:layout_constraintStart_toStartOf="parent"
@@ -67,17 +59,13 @@
             app:layout_constraintBottom_toTopOf="@id/sip_filter"/>
 
         <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
+            style="@style/popup_menu_item"
             android:id="@+id/sip_filter"
             android:onClick="@{sipOnlyClickListener}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/popup_menu_item_top_margin"
             android:text="@string/contacts_list_filter_popup_see_sip_only"
-            android:textSize="14sp"
-            android:textColor="?attr/color_main2_500"
             android:visibility="@{showLinphoneFilter ? View.GONE : View.VISIBLE}"
-            android:drawablePadding="5dp"
             android:drawableEnd="@drawable/check"
             android:drawableTint="@{seeAllSelected ? @color/transparent_color : @color/green_success_500, default=@color/green_success_500}"
             app:layout_constraintStart_toStartOf="parent"
@@ -89,7 +77,7 @@
             android:id="@+id/bottom_anchor"
             android:layout_width="wrap_content"
             android:layout_height="1dp"
-            android:layout_marginBottom="@dimen/popup_menu_item_top_margin"
+            android:layout_marginBottom="@dimen/popup_menu_padding"
             app:layout_constraintWidth_max="@dimen/popup_menu_width"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/generic_address_picker_contact_list_cell.xml b/app/src/main/res/layout/generic_address_picker_contact_list_cell.xml
index aa028c959..36f43db08 100644
--- a/app/src/main/res/layout/generic_address_picker_contact_list_cell.xml
+++ b/app/src/main/res/layout/generic_address_picker_contact_list_cell.xml
@@ -23,19 +23,8 @@
         android:layout_marginStart="4dp"
         android:layout_marginEnd="16dp"
         android:paddingTop="5dp"
-        android:paddingBottom="5dp">
-
-        <ImageView
-            android:id="@+id/background"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginStart="5dp"
-            android:src="@drawable/primary_cell_background"
-            android:contentDescription="@null"
-            app:layout_constraintStart_toEndOf="@id/header"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"/>
+        android:paddingBottom="5dp"
+        android:background="@drawable/primary_cell_background">
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/default_text_style_500"
diff --git a/app/src/main/res/layout/generic_address_picker_conversation_list_cell.xml b/app/src/main/res/layout/generic_address_picker_conversation_list_cell.xml
index 481e3ff9d..6c6d67810 100644
--- a/app/src/main/res/layout/generic_address_picker_conversation_list_cell.xml
+++ b/app/src/main/res/layout/generic_address_picker_conversation_list_cell.xml
@@ -20,19 +20,8 @@
         android:layout_marginStart="4dp"
         android:layout_marginEnd="16dp"
         android:paddingTop="5dp"
-        android:paddingBottom="5dp">
-
-        <ImageView
-            android:id="@+id/background"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginStart="5dp"
-            android:src="@drawable/primary_cell_background"
-            android:contentDescription="@null"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"/>
+        android:paddingBottom="5dp"
+        android:background="@drawable/primary_cell_background">
 
         <include
             android:id="@+id/avatar"
diff --git a/app/src/main/res/layout/history_list_popup_menu.xml b/app/src/main/res/layout/history_list_popup_menu.xml
index b3bb4db13..f95340dcd 100644
--- a/app/src/main/res/layout/history_list_popup_menu.xml
+++ b/app/src/main/res/layout/history_list_popup_menu.xml
@@ -18,19 +18,15 @@
         android:background="@drawable/shape_round_popup_menu_background">
 
         <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
+            style="@style/popup_menu_item"
             android:id="@+id/delete"
             android:onClick="@{deleteAllHistoryClickListener}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/popup_menu_item_top_margin"
             android:text="@string/menu_delete_history"
-            android:textSize="14sp"
             android:textColor="?attr/color_danger_500"
             android:drawableStart="@drawable/trash_simple"
-            android:drawablePadding="5dp"
             app:drawableTint="?attr/color_danger_500"
-            app:layout_constraintWidth_max="@dimen/popup_menu_width"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -40,7 +36,7 @@
             android:id="@+id/bottom_anchor"
             android:layout_width="wrap_content"
             android:layout_height="1dp"
-            android:layout_marginBottom="@dimen/popup_menu_item_top_margin"
+            android:layout_marginBottom="@dimen/popup_menu_padding"
             app:layout_constraintWidth_max="@dimen/popup_menu_width"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/history_popup_menu.xml b/app/src/main/res/layout/history_popup_menu.xml
index c220c5a9a..182a28497 100644
--- a/app/src/main/res/layout/history_popup_menu.xml
+++ b/app/src/main/res/layout/history_popup_menu.xml
@@ -33,20 +33,14 @@
         android:background="@drawable/shape_round_popup_menu_background">
 
         <androidx.appcompat.widget.AppCompatTextView
+            style="@style/popup_menu_item"
+            android:id="@+id/add_to_contact"
             android:onClick="@{addToContactsListener}"
             android:visibility="@{contactExists || isConferenceCallLog ? View.GONE : View.VISIBLE, default=gone}"
-            style="@style/default_text_style"
-            android:id="@+id/add_to_contact"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/popup_menu_item_top_margin"
-            android:gravity="start|center_vertical"
             android:text="@string/menu_add_address_to_contacts"
-            android:textSize="14sp"
-            android:textColor="?attr/color_main2_500"
             android:drawableStart="@drawable/plus_circle"
-            android:drawablePadding="5dp"
-            app:drawableTint="?attr/color_main2_700"
             app:layout_constraintVertical_chainStyle="packed"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -54,68 +48,52 @@
             app:layout_constraintBottom_toTopOf="@id/go_to_contact"/>
 
         <androidx.appcompat.widget.AppCompatTextView
+            style="@style/popup_menu_item"
+            android:id="@+id/go_to_contact"
             android:onClick="@{goToContactListener}"
             android:visibility="@{contactExists &amp;&amp; !isConferenceCallLog ? View.VISIBLE : View.GONE}"
-            style="@style/default_text_style"
-            android:id="@+id/go_to_contact"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/popup_menu_item_top_margin"
-            android:gravity="start|center_vertical"
             android:text="@string/menu_see_existing_contact"
-            android:textSize="14sp"
-            android:textColor="?attr/color_main2_500"
             android:drawableStart="@drawable/user_circle"
-            android:drawablePadding="5dp"
-            app:drawableTint="?attr/color_main2_700"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/add_to_contact"
             app:layout_constraintBottom_toTopOf="@id/copy_number"/>
 
         <androidx.appcompat.widget.AppCompatTextView
-            android:onClick="@{copyNumberClickListener}"
-            style="@style/default_text_style"
+            style="@style/popup_menu_item"
             android:id="@+id/copy_number"
+            android:onClick="@{copyNumberClickListener}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:gravity="start|center_vertical"
             android:text="@string/menu_copy_sip_address"
-            android:textSize="14sp"
-            android:textColor="?attr/color_main2_500"
             android:drawableStart="@drawable/copy"
-            android:drawablePadding="5dp"
-            app:drawableTint="?attr/color_main2_700"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/go_to_contact"
             app:layout_constraintBottom_toTopOf="@id/delete_history"/>
 
         <androidx.appcompat.widget.AppCompatTextView
-            android:onClick="@{deleteAllHistoryClickListener}"
-            style="@style/default_text_style"
+            style="@style/popup_menu_item"
             android:id="@+id/delete_history"
+            android:onClick="@{deleteAllHistoryClickListener}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/popup_menu_item_top_margin"
-            android:gravity="start|center_vertical"
             android:text="@string/menu_delete_history"
-            android:textSize="14sp"
             android:textColor="?attr/color_danger_500"
             android:drawableStart="@drawable/trash_simple"
-            android:drawablePadding="5dp"
             app:drawableTint="?attr/color_danger_500"
-            app:layout_constraintWidth_min="170dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/copy_number"
-            app:layout_constraintBottom_toBottomOf="parent"/>
+            app:layout_constraintBottom_toTopOf="@id/bottom_anchor"/>
 
         <View
             android:id="@+id/bottom_anchor"
             android:layout_width="wrap_content"
             android:layout_height="1dp"
-            android:layout_marginBottom="@dimen/popup_menu_item_top_margin"
+            android:layout_marginBottom="@dimen/popup_menu_padding"
             app:layout_constraintWidth_max="@dimen/popup_menu_width"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/meeting_popup_menu.xml b/app/src/main/res/layout/meeting_popup_menu.xml
index d94aaa109..66826f07d 100644
--- a/app/src/main/res/layout/meeting_popup_menu.xml
+++ b/app/src/main/res/layout/meeting_popup_menu.xml
@@ -19,23 +19,18 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:paddingEnd="@dimen/popup_menu_padding"
+        android:paddingStart="@dimen/popup_menu_padding"
         android:background="@drawable/shape_round_popup_menu_background">
 
         <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
+            style="@style/popup_menu_item"
             android:id="@+id/export_as_calendar"
             android:onClick="@{createCalendarEventListener}"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:layout_marginStart="20dp"
-            android:layout_marginEnd="20dp"
             android:text="@string/meeting_info_export_as_calendar_event"
-            android:textSize="14sp"
-            android:textColor="?attr/color_main2_500"
             android:drawableStart="@drawable/calendar_blank"
-            android:drawablePadding="5dp"
-            app:drawableTint="?attr/color_main2_500"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -43,26 +38,31 @@
             app:layout_constraintBottom_toTopOf="@id/delete_meeting"/>
 
         <androidx.appcompat.widget.AppCompatTextView
-            style="@style/default_text_style"
+            style="@style/popup_menu_item"
             android:id="@+id/delete_meeting"
             android:onClick="@{deleteClickListener}"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="15dp"
-            android:layout_marginBottom="20dp"
-            android:layout_marginStart="20dp"
-            android:layout_marginEnd="20dp"
             android:text="@{cancelInsteadOfDelete ? @string/meeting_cancel_action_label : @string/meeting_delete_action_label, default=@string/meeting_delete_action_label}"
-            android:textSize="14sp"
             android:textColor="?attr/color_danger_500"
             android:drawableStart="@drawable/trash_simple"
-            android:drawablePadding="5dp"
             app:drawableTint="?attr/color_danger_500"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/export_as_calendar"
-            app:layout_constraintBottom_toBottomOf="parent"/>
+            app:layout_constraintBottom_toTopOf="@id/bottom_anchor"/>
+
+        <View
+            android:id="@+id/bottom_anchor"
+            android:layout_width="wrap_content"
+            android:layout_height="1dp"
+            android:layout_marginBottom="@dimen/popup_menu_padding"
+            app:layout_constraintWidth_max="@dimen/popup_menu_width"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/delete_meeting"
+            app:layout_constraintBottom_toBottomOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/start_call_numpad_bottom_sheet.xml b/app/src/main/res/layout/start_call_numpad_bottom_sheet.xml
index dc7b51ec7..cbfb75447 100644
--- a/app/src/main/res/layout/start_call_numpad_bottom_sheet.xml
+++ b/app/src/main/res/layout/start_call_numpad_bottom_sheet.xml
@@ -61,7 +61,7 @@
 
         <include
             android:id="@+id/digit_1"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/call_dtmf_button_size"
             android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_voicemail"
             bind:digit="@{`1`}"
@@ -71,7 +71,7 @@
 
         <include
             android:id="@+id/digit_2"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/call_dtmf_button_size"
             android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`2`}"
@@ -82,7 +82,7 @@
 
         <include
             android:id="@+id/digit_3"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/call_dtmf_button_size"
             android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`3`}"
@@ -93,7 +93,7 @@
 
         <include
             android:id="@+id/digit_4"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/call_dtmf_button_size"
             android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`4`}"
@@ -104,7 +104,7 @@
 
         <include
             android:id="@+id/digit_5"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/call_dtmf_button_size"
             android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`5`}"
@@ -115,7 +115,7 @@
 
         <include
             android:id="@+id/digit_6"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/call_dtmf_button_size"
             android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`6`}"
@@ -126,7 +126,7 @@
 
         <include
             android:id="@+id/digit_7"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/call_dtmf_button_size"
             android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`7`}"
@@ -137,7 +137,7 @@
 
         <include
             android:id="@+id/digit_8"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/call_dtmf_button_size"
             android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`8`}"
@@ -148,7 +148,7 @@
 
         <include
             android:id="@+id/digit_9"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/call_dtmf_button_size"
             android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_letters"
             bind:digit="@{`9`}"
@@ -159,7 +159,7 @@
 
         <include
             android:id="@+id/digit_star"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/call_dtmf_button_size"
             android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit"
             bind:digit="@{`*`}"
@@ -169,7 +169,7 @@
 
         <include
             android:id="@+id/digit_0"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/call_dtmf_button_size"
             android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit_with_plus"
             bind:digit="@{`0`}"
@@ -179,7 +179,7 @@
 
         <include
             android:id="@+id/digit_sharp"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/call_dtmf_button_size"
             android:layout_height="@dimen/call_dtmf_button_size"
             layout="@layout/call_numpad_digit"
             bind:digit="@{`#`}"
diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
index 2adc47c2e..5c1da0257 100644
--- a/app/src/main/res/values/dimen.xml
+++ b/app/src/main/res/values/dimen.xml
@@ -56,8 +56,7 @@
     <dimen name="text_input_max_width">400dp</dimen>
     <dimen name="emoji_list_max_width">400dp</dimen>
     <dimen name="popup_menu_width">250dp</dimen>
-    <dimen name="popup_menu_padding">15dp</dimen>
-    <dimen name="popup_menu_item_top_margin">20dp</dimen>
+    <dimen name="popup_menu_padding">10dp</dimen>
 
     <dimen name="call_remote_video_top_margin">70dp</dimen> <!-- Size of top text + top & bottom margins -->
     <dimen name="call_main_actions_menu_height">110dp</dimen>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index c57fecce3..fd4c25142 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -99,7 +99,7 @@
     </style>
     <style name="bottom_nav_bar_label_style">
         <item name="android:fontFamily">@font/noto_sans</item>
-        <item name="android:textSize">@dimen/bottom_nav_bar_text_size</item>
+        <item name="android:textSize">11sp</item>
         <item name="android:textColor">?attr/color_text</item>
         <item name="android:gravity">center</item>
         <item name="android:maxLines">1</item>
@@ -123,7 +123,20 @@
         <item name="android:drawableTint">?attr/color_danger_500</item>
         <item name="android:drawablePadding">8dp</item>
     </style>
-    <style name="popup_menu_action_label_style">
+    <style name="popup_menu_item">
+        <item name="android:fontFamily">@font/noto_sans</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:textColor">?attr/color_main2_500</item>
+        <item name="android:layout_marginTop">@dimen/popup_menu_padding</item>
+        <item name="android:maxLines">1</item>
+        <item name="android:ellipsize">end</item>
+        <item name="android:padding">5dp</item>
+        <item name="android:background">@drawable/popup_menu_button_background</item>
+        <item name="android:drawablePadding">5dp</item>
+        <item name="drawableTint">?attr/color_main2_700</item>
+        <item name="android:gravity">start|center_vertical</item>
+    </style>
+    <style name="chat_bubble_popup_menu_style">
         <item name="android:fontFamily">@font/noto_sans</item>
         <item name="android:textSize">12sp</item>
         <item name="android:textColor">?attr/color_main2_500</item>
@@ -136,20 +149,6 @@
         <item name="android:drawableTint">?attr/color_main2_500</item>
         <item name="android:drawablePadding">8dp</item>
     </style>
-    <style name="popup_menu_danger_action_label_style">
-        <item name="android:fontFamily">@font/noto_sans</item>
-        <item name="android:textSize">12sp</item>
-        <item name="android:textColor">?attr/color_danger_500</item>
-        <item name="android:maxLines">1</item>
-        <item name="android:ellipsize">end</item>
-        <item name="android:paddingStart">15dp</item>
-        <item name="android:paddingEnd">15dp</item>
-        <item name="android:paddingTop">10dp</item>
-        <item name="android:paddingBottom">10dp</item>
-        <item name="android:drawableTint">?attr/color_danger_500</item>
-        <item name="android:drawablePadding">8dp</item>
-    </style>
-
     <style name="message_reaction_style">
         <item name="android:fontFamily">@font/noto_sans</item>
         <item name="android:textColor">?attr/color_text</item>