From 4d8ab32da7afd8e635b970181b2b7355f829bf52 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 20 Jun 2025 11:30:46 +0200
Subject: [PATCH] Using a style for top bar icons to prevent duplicating code

---
 .../contact_new_or_edit_fragment.xml          |  4 +---
 .../res/layout-land/main_activity_top_bar.xml | 16 ++++-----------
 .../meeting_waiting_room_fragment.xml         |  4 +---
 .../main_activity_top_bar.xml                 | 16 ++++-----------
 app/src/main/res/layout/account_list_cell.xml |  4 +---
 .../res/layout/account_profile_fragment.xml   |  4 +---
 .../account_profile_secure_mode_fragment.xml  |  4 +---
 .../res/layout/account_settings_fragment.xml  |  4 +---
 .../res/layout/assistant_landing_fragment.xml |  3 +--
 .../layout/assistant_permissions_fragment.xml |  5 ++---
 .../assistant_qr_code_scanner_fragment.xml    |  5 ++---
 ...ant_register_confirm_sms_code_fragment.xml |  5 ++---
 .../layout/assistant_register_fragment.xml    |  5 ++---
 ...third_party_sip_account_login_fragment.xml |  5 ++---
 ...ird_party_sip_account_warning_fragment.xml |  5 ++---
 ..._conference_participants_list_fragment.xml | 17 +++++++---------
 .../res/layout/call_transfer_fragment.xml     |  6 ++----
 .../main/res/layout/calls_list_fragment.xml   |  8 ++------
 .../res/layout/chat_conversation_fragment.xml | 20 ++++++-------------
 .../res/layout/chat_documents_fragment.xml    |  4 +---
 .../chat_ephemeral_lifetime_fragment.xml      |  4 +---
 .../main/res/layout/chat_info_fragment.xml    |  4 +---
 .../main/res/layout/chat_media_fragment.xml   |  4 +---
 .../layout/chat_message_forward_fragment.xml  |  4 +---
 .../res/layout/chat_participant_list_cell.xml |  3 +--
 app/src/main/res/layout/contact_fragment.xml  | 11 ++++------
 .../layout/contact_new_or_edit_fragment.xml   |  4 +---
 .../res/layout/file_media_viewer_activity.xml | 12 +++--------
 .../main/res/layout/file_viewer_activity.xml  | 12 +++--------
 .../generic_add_participants_fragment.xml     |  4 +---
 .../main/res/layout/help_debug_fragment.xml   |  4 +---
 app/src/main/res/layout/help_fragment.xml     |  4 +---
 app/src/main/res/layout/history_fragment.xml  |  8 ++------
 .../main/res/layout/main_activity_top_bar.xml | 16 ++++-----------
 .../main/res/layout/meeting_edit_fragment.xml |  4 +---
 app/src/main/res/layout/meeting_fragment.xml  | 12 +++--------
 .../res/layout/meeting_schedule_fragment.xml  |  4 +---
 .../layout/meeting_waiting_room_fragment.xml  |  4 +---
 .../res/layout/recording_player_fragment.xml  | 12 +++--------
 .../res/layout/recordings_list_fragment.xml   | 17 ++++------------
 .../settings_advanced_calls_fragment.xml      |  4 +---
 .../res/layout/settings_advanced_fragment.xml |  4 +---
 .../layout/settings_developer_fragment.xml    |  4 +---
 app/src/main/res/layout/settings_fragment.xml |  4 +---
 .../res/layout/single_sign_on_fragment.xml    |  3 +--
 .../main/res/layout/start_call_fragment.xml   |  4 +---
 .../main/res/layout/start_chat_fragment.xml   |  4 +---
 app/src/main/res/values/styles.xml            |  9 +++++++++
 48 files changed, 99 insertions(+), 228 deletions(-)

diff --git a/app/src/main/res/layout-land/contact_new_or_edit_fragment.xml b/app/src/main/res/layout-land/contact_new_or_edit_fragment.xml
index 99029e728..039c912c1 100644
--- a/app/src/main/res/layout-land/contact_new_or_edit_fragment.xml
+++ b/app/src/main/res/layout-land/contact_new_or_edit_fragment.xml
@@ -25,15 +25,13 @@
         android:background="?attr/color_background_contrast_in_dark_mode">
 
         <ImageView
+            style="@style/icon_top_bar_button_style"
             android:id="@+id/back"
             android:onClick="@{backClickListener}"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
-            android:adjustViewBounds="true"
-            android:padding="15dp"
             android:src="@drawable/caret_left"
             android:contentDescription="@string/content_description_go_back_icon"
-            android:background="@drawable/circle_transparent_button_background"
             app:tint="?attr/color_main1_500"
             app:layout_constraintBottom_toBottomOf="@id/title"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout-land/main_activity_top_bar.xml b/app/src/main/res/layout-land/main_activity_top_bar.xml
index 07a8abe9b..0892801e3 100644
--- a/app/src/main/res/layout-land/main_activity_top_bar.xml
+++ b/app/src/main/res/layout-land/main_activity_top_bar.xml
@@ -75,15 +75,13 @@
             app:layout_constraintBottom_toBottomOf="@id/avatar"/>
 
         <ImageView
+            style="@style/icon_top_bar_button_style"
             android:id="@+id/search_toggle"
             android:onClick="@{() -> viewModel.openSearchBar()}"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:layout_marginEnd="5dp"
-            android:padding="15dp"
             android:src="@drawable/magnifying_glass"
-            android:adjustViewBounds="true"
-            android:background="@drawable/circle_transparent_button_background"
             android:contentDescription="@string/content_description_open_filter"
             app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintBottom_toBottomOf="@id/title"
@@ -92,15 +90,13 @@
             app:tint="?attr/color_on_main" />
 
         <ImageView
+            style="@style/icon_top_bar_button_style"
             android:id="@+id/extra_action"
             android:onClick="@{extraActionClickListener}"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:layout_marginEnd="5dp"
-            android:padding="15dp"
             android:src="@{extraActionIcon, default=@drawable/dots_three_vertical}"
-            android:adjustViewBounds="true"
-            android:background="@drawable/circle_transparent_button_background"
             android:contentDescription="@{extraActionContentDescription}"
             android:visibility="@{!viewModel.searchBarVisible &amp;&amp; enableExtraAction ? View.VISIBLE : View.GONE, default=gone}"
             app:layout_constraintDimensionRatio="1:1"
@@ -110,15 +106,13 @@
             app:tint="?attr/color_on_main" />
 
         <ImageView
+            style="@style/icon_top_bar_button_style"
             android:id="@+id/cancel_search"
             android:onClick="@{() -> viewModel.closeSearchBar()}"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:layout_marginStart="5dp"
-            android:padding="15dp"
             android:src="@drawable/caret_left"
-            android:adjustViewBounds="true"
-            android:background="@drawable/circle_transparent_button_background"
             android:contentDescription="@string/content_description_cancel_filter"
             app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintBottom_toBottomOf="@id/search"
@@ -159,15 +153,13 @@
         </com.google.android.material.textfield.TextInputLayout>
 
         <ImageView
+            style="@style/icon_top_bar_button_style"
             android:id="@+id/clear_field"
             android:onClick="@{() -> viewModel.clearFilter()}"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:layout_marginEnd="5dp"
-            android:padding="15dp"
             android:src="@drawable/x"
-            android:adjustViewBounds="true"
-            android:background="@drawable/circle_transparent_button_background"
             android:contentDescription="@string/content_description_clear_filter"
             app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintBottom_toBottomOf="@id/search"
diff --git a/app/src/main/res/layout-land/meeting_waiting_room_fragment.xml b/app/src/main/res/layout-land/meeting_waiting_room_fragment.xml
index e148e9cc3..cdfa686ff 100644
--- a/app/src/main/res/layout-land/meeting_waiting_room_fragment.xml
+++ b/app/src/main/res/layout-land/meeting_waiting_room_fragment.xml
@@ -26,15 +26,13 @@
             app:layout_constraintGuide_percent="0.50" />
 
         <ImageView
+            style="@style/icon_top_bar_button_style"
             android:id="@+id/back"
             android:onClick="@{backClickListener}"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/top_bar_height"
-            android:adjustViewBounds="true"
-            android:padding="15dp"
             android:src="@drawable/caret_left"
             android:contentDescription="@string/content_description_go_back_icon"
-            android:background="@drawable/circle_transparent_button_background"
             app:tint="?attr/color_main1_500"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout-sw600dp-land/main_activity_top_bar.xml b/app/src/main/res/layout-sw600dp-land/main_activity_top_bar.xml
index 30ad0d2ed..24cef6184 100644
--- a/app/src/main/res/layout-sw600dp-land/main_activity_top_bar.xml
+++ b/app/src/main/res/layout-sw600dp-land/main_activity_top_bar.xml
@@ -63,15 +63,13 @@
             app:layout_constraintBottom_toBottomOf="parent"/>
 
         <ImageView
+            style="@style/icon_top_bar_button_style"
             android:id="@+id/search_toggle"
             android:onClick="@{() -> viewModel.openSearchBar()}"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:layout_marginEnd="5dp"
-            android:padding="15dp"
             android:src="@drawable/magnifying_glass"
-            android:adjustViewBounds="true"
-            android:background="@drawable/circle_transparent_button_background"
             android:contentDescription="@string/content_description_open_filter"
             app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintBottom_toBottomOf="@id/title"
@@ -80,15 +78,13 @@
             app:tint="?attr/color_main2_600" />
 
         <ImageView
+            style="@style/icon_top_bar_button_style"
             android:id="@+id/extra_action"
             android:onClick="@{extraActionClickListener}"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:layout_marginEnd="5dp"
-            android:padding="15dp"
             android:src="@{extraActionIcon, default=@drawable/dots_three_vertical}"
-            android:adjustViewBounds="true"
-            android:background="@drawable/circle_transparent_button_background"
             android:contentDescription="@{extraActionContentDescription}"
             android:visibility="@{!viewModel.searchBarVisible &amp;&amp; enableExtraAction ? View.VISIBLE : View.GONE, default=gone}"
             app:layout_constraintDimensionRatio="1:1"
@@ -98,15 +94,13 @@
             app:tint="?attr/color_main2_600" />
 
         <ImageView
+            style="@style/icon_top_bar_button_style"
             android:id="@+id/cancel_search"
             android:onClick="@{() -> viewModel.closeSearchBar()}"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:layout_marginStart="5dp"
-            android:padding="15dp"
             android:src="@drawable/caret_left"
-            android:adjustViewBounds="true"
-            android:background="@drawable/circle_transparent_button_background"
             android:contentDescription="@string/content_description_cancel_filter"
             app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintBottom_toBottomOf="@id/search"
@@ -147,16 +141,14 @@
         </com.google.android.material.textfield.TextInputLayout>
 
         <ImageView
+            style="@style/icon_top_bar_button_style"
             android:id="@+id/clear_field"
             android:onClick="@{() -> viewModel.clearFilter()}"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:layout_marginEnd="5dp"
-            android:padding="15dp"
             android:src="@drawable/x"
-            android:adjustViewBounds="true"
             android:contentDescription="@string/content_description_clear_filter"
-            android:background="@drawable/circle_transparent_button_background"
             app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintBottom_toBottomOf="@id/search"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/account_list_cell.xml b/app/src/main/res/layout/account_list_cell.xml
index d1ce9943b..caab32f67 100644
--- a/app/src/main/res/layout/account_list_cell.xml
+++ b/app/src/main/res/layout/account_list_cell.xml
@@ -123,14 +123,12 @@
             app:layout_constraintEnd_toStartOf="@id/menu"/>
 
         <ImageView
+            style="@style/icon_top_bar_button_style"
             android:onClick="@{() -> model.openMenu(menu)}"
             android:id="@+id/menu"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
-            android:padding="15dp"
-            android:adjustViewBounds="true"
             android:contentDescription="@string/content_description_open_drawer_menu_icon"
-            android:background="@drawable/circle_transparent_button_background"
             android:src="@drawable/dots_three_vertical"
             app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/account_profile_fragment.xml b/app/src/main/res/layout/account_profile_fragment.xml
index da89b35f6..1b6682806 100644
--- a/app/src/main/res/layout/account_profile_fragment.xml
+++ b/app/src/main/res/layout/account_profile_fragment.xml
@@ -43,15 +43,13 @@
         android:background="?attr/color_background_contrast_in_dark_mode">
 
             <ImageView
+                style="@style/icon_top_bar_button_style"
                 android:id="@+id/back"
                 android:onClick="@{backClickListener}"
                 android:layout_width="wrap_content"
                 android:layout_height="0dp"
-                android:adjustViewBounds="true"
-                android:padding="15dp"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
-                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main1_500"
                 app:layout_constraintBottom_toBottomOf="@id/title"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/account_profile_secure_mode_fragment.xml b/app/src/main/res/layout/account_profile_secure_mode_fragment.xml
index ae35b2fb1..ade93a06c 100644
--- a/app/src/main/res/layout/account_profile_secure_mode_fragment.xml
+++ b/app/src/main/res/layout/account_profile_secure_mode_fragment.xml
@@ -28,15 +28,13 @@
         android:background="?attr/color_main2_000">
 
         <ImageView
+            style="@style/icon_top_bar_button_style"
             android:id="@+id/back"
             android:onClick="@{backClickListener}"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
-            android:adjustViewBounds="true"
-            android:padding="15dp"
             android:src="@drawable/caret_left"
             android:contentDescription="@string/content_description_go_back_icon"
-            android:background="@drawable/circle_transparent_button_background"
             app:tint="?attr/color_main1_500"
             app:layout_constraintBottom_toBottomOf="@id/title"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/account_settings_fragment.xml b/app/src/main/res/layout/account_settings_fragment.xml
index e5f0731f1..29a68180c 100644
--- a/app/src/main/res/layout/account_settings_fragment.xml
+++ b/app/src/main/res/layout/account_settings_fragment.xml
@@ -22,15 +22,13 @@
         android:background="?attr/color_background_contrast_in_dark_mode">
 
             <ImageView
+                style="@style/icon_top_bar_button_style"
                 android:id="@+id/back"
                 android:onClick="@{backClickListener}"
                 android:layout_width="wrap_content"
                 android:layout_height="0dp"
-                android:adjustViewBounds="true"
-                android:padding="15dp"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
-                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main1_500"
                 app:layout_constraintBottom_toBottomOf="@id/title"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/assistant_landing_fragment.xml b/app/src/main/res/layout/assistant_landing_fragment.xml
index d94d2af2c..d3be8cda3 100644
--- a/app/src/main/res/layout/assistant_landing_fragment.xml
+++ b/app/src/main/res/layout/assistant_landing_fragment.xml
@@ -36,14 +36,13 @@
             android:layout_height="wrap_content">
 
             <ImageView
+                style="@style/icon_top_bar_button_style"
                 android:id="@+id/back"
                 android:onClick="@{backClickListener}"
                 android:layout_width="@dimen/top_bar_height"
                 android:layout_height="@dimen/top_bar_height"
-                android:padding="15dp"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
-                android:background="@drawable/circle_transparent_button_background"
                 android:visibility="@{viewModel.showBackButton ? View.VISIBLE : View.INVISIBLE, default=invisible}"
                 app:tint="?attr/color_main2_500"
                 app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/assistant_permissions_fragment.xml b/app/src/main/res/layout/assistant_permissions_fragment.xml
index 9a8d079db..f487daf3b 100644
--- a/app/src/main/res/layout/assistant_permissions_fragment.xml
+++ b/app/src/main/res/layout/assistant_permissions_fragment.xml
@@ -39,14 +39,13 @@
             android:layout_height="wrap_content">
 
             <ImageView
-                android:onClick="@{backClickListener}"
+                style="@style/icon_top_bar_button_style"
                 android:id="@+id/back"
+                android:onClick="@{backClickListener}"
                 android:layout_width="@dimen/top_bar_height"
                 android:layout_height="@dimen/top_bar_height"
-                android:padding="15dp"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
-                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main2_500"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintStart_toStartOf="parent"/>
diff --git a/app/src/main/res/layout/assistant_qr_code_scanner_fragment.xml b/app/src/main/res/layout/assistant_qr_code_scanner_fragment.xml
index 81af2ba80..eb546cdc5 100644
--- a/app/src/main/res/layout/assistant_qr_code_scanner_fragment.xml
+++ b/app/src/main/res/layout/assistant_qr_code_scanner_fragment.xml
@@ -30,14 +30,13 @@
             app:layout_constraintTop_toTopOf="parent" />
 
         <ImageView
-            android:onClick="@{backClickListener}"
+            style="@style/icon_top_bar_button_style"
             android:id="@+id/back"
+            android:onClick="@{backClickListener}"
             android:layout_width="@dimen/top_bar_height"
             android:layout_height="@dimen/top_bar_height"
-            android:padding="15dp"
             android:src="@drawable/caret_left"
             android:contentDescription="@string/content_description_go_back_icon"
-            android:background="@drawable/circle_transparent_button_background"
             app:tint="@color/bc_white"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toStartOf="parent"/>
diff --git a/app/src/main/res/layout/assistant_register_confirm_sms_code_fragment.xml b/app/src/main/res/layout/assistant_register_confirm_sms_code_fragment.xml
index d35e302e3..b36efaf28 100644
--- a/app/src/main/res/layout/assistant_register_confirm_sms_code_fragment.xml
+++ b/app/src/main/res/layout/assistant_register_confirm_sms_code_fragment.xml
@@ -23,14 +23,13 @@
             android:layout_height="match_parent">
 
             <ImageView
-                android:onClick="@{backClickListener}"
+                style="@style/icon_top_bar_button_style"
                 android:id="@+id/back"
+                android:onClick="@{backClickListener}"
                 android:layout_width="@dimen/top_bar_height"
                 android:layout_height="@dimen/top_bar_height"
-                android:padding="15dp"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
-                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main2_500"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintStart_toStartOf="parent"/>
diff --git a/app/src/main/res/layout/assistant_register_fragment.xml b/app/src/main/res/layout/assistant_register_fragment.xml
index 641fffd23..02deb35aa 100644
--- a/app/src/main/res/layout/assistant_register_fragment.xml
+++ b/app/src/main/res/layout/assistant_register_fragment.xml
@@ -57,14 +57,13 @@
                     app:constraint_referenced_ids="create_email_account_label, no_push_label" />
 
                 <ImageView
-                    android:onClick="@{backClickListener}"
+                    style="@style/icon_top_bar_button_style"
                     android:id="@+id/back"
+                    android:onClick="@{backClickListener}"
                     android:layout_width="@dimen/top_bar_height"
                     android:layout_height="@dimen/top_bar_height"
-                    android:padding="15dp"
                     android:src="@drawable/caret_left"
                     android:contentDescription="@string/content_description_go_back_icon"
-                    android:background="@drawable/circle_transparent_button_background"
                     app:tint="?attr/color_main2_500"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintStart_toStartOf="parent"/>
diff --git a/app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml b/app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml
index d425236da..e22b7a4a0 100644
--- a/app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml
+++ b/app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml
@@ -24,14 +24,13 @@
             android:layout_height="wrap_content">
 
             <ImageView
-                android:onClick="@{backClickListener}"
+                style="@style/icon_top_bar_button_style"
                 android:id="@+id/back"
+                android:onClick="@{backClickListener}"
                 android:layout_width="@dimen/top_bar_height"
                 android:layout_height="@dimen/top_bar_height"
-                android:padding="15dp"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
-                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main2_500"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintStart_toStartOf="parent"/>
diff --git a/app/src/main/res/layout/assistant_third_party_sip_account_warning_fragment.xml b/app/src/main/res/layout/assistant_third_party_sip_account_warning_fragment.xml
index b44deeaf0..d0cd132e2 100644
--- a/app/src/main/res/layout/assistant_third_party_sip_account_warning_fragment.xml
+++ b/app/src/main/res/layout/assistant_third_party_sip_account_warning_fragment.xml
@@ -30,14 +30,13 @@
             android:layout_height="wrap_content">
 
             <ImageView
-                android:onClick="@{backClickListener}"
+                style="@style/icon_top_bar_button_style"
                 android:id="@+id/back"
+                android:onClick="@{backClickListener}"
                 android:layout_width="@dimen/top_bar_height"
                 android:layout_height="@dimen/top_bar_height"
-                android:padding="15dp"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
-                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main2_500"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintStart_toStartOf="parent"/>
diff --git a/app/src/main/res/layout/call_conference_participants_list_fragment.xml b/app/src/main/res/layout/call_conference_participants_list_fragment.xml
index bfd143345..dffa03d9b 100644
--- a/app/src/main/res/layout/call_conference_participants_list_fragment.xml
+++ b/app/src/main/res/layout/call_conference_participants_list_fragment.xml
@@ -24,15 +24,13 @@
         android:background="?attr/color_background_contrast_in_dark_mode">
 
         <ImageView
+            style="@style/icon_top_bar_button_style"
             android:id="@+id/back"
+            android:onClick="@{backClickListener}"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
-            android:padding="15dp"
-            android:adjustViewBounds="true"
-            android:onClick="@{backClickListener}"
             android:src="@drawable/caret_left"
             android:contentDescription="@string/content_description_go_back_icon"
-            android:background="@drawable/circle_transparent_button_background"
             app:tint="?attr/color_main1_500"
             app:layout_constraintBottom_toBottomOf="@id/title"
             app:layout_constraintStart_toStartOf="parent"
@@ -46,22 +44,21 @@
             android:layout_marginStart="10dp"
             android:layout_marginEnd="10dp"
             android:text="@{viewModel.conferenceModel.participantsLabel, default=`Participant (1)`}"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/show_menu"
             app:layout_constraintStart_toEndOf="@id/back"
             app:layout_constraintTop_toTopOf="parent"/>
 
         <ImageView
+            style="@style/icon_top_bar_button_style"
             android:id="@+id/show_menu"
             android:onClick="@{showMenuClickListener}"
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/top_bar_height"
-            android:padding="15dp"
-            android:adjustViewBounds="true"
+            android:layout_height="0dp"
             android:src="@drawable/dots_three_vertical"
-            android:background="@drawable/circle_transparent_button_background"
             android:contentDescription="@string/content_description_show_popup_menu"
-            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="@id/title"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@id/title"
             app:tint="?attr/color_main2_500"/>
 
         <View
diff --git a/app/src/main/res/layout/call_transfer_fragment.xml b/app/src/main/res/layout/call_transfer_fragment.xml
index 638c8c72a..86926447c 100644
--- a/app/src/main/res/layout/call_transfer_fragment.xml
+++ b/app/src/main/res/layout/call_transfer_fragment.xml
@@ -32,15 +32,13 @@
             android:background="?attr/color_background_contrast_in_dark_mode">
 
             <ImageView
+                style="@style/icon_top_bar_button_style"
                 android:id="@+id/back"
+                android:onClick="@{backClickListener}"
                 android:layout_width="wrap_content"
                 android:layout_height="@dimen/top_bar_height"
-                android:adjustViewBounds="true"
-                android:onClick="@{backClickListener}"
-                android:padding="15dp"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
-                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main1_500"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/calls_list_fragment.xml b/app/src/main/res/layout/calls_list_fragment.xml
index 796142fd3..697c5fcf6 100644
--- a/app/src/main/res/layout/calls_list_fragment.xml
+++ b/app/src/main/res/layout/calls_list_fragment.xml
@@ -21,15 +21,13 @@
         android:background="?attr/color_background_contrast_in_dark_mode">
 
         <ImageView
+            style="@style/icon_top_bar_button_style"
             android:id="@+id/back"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
-            android:padding="15dp"
-            android:adjustViewBounds="true"
             android:onClick="@{backClickListener}"
             android:src="@drawable/caret_left"
             android:contentDescription="@string/content_description_go_back_icon"
-            android:background="@drawable/circle_transparent_button_background"
             app:tint="?attr/color_main1_500"
             app:layout_constraintBottom_toBottomOf="@id/title"
             app:layout_constraintStart_toStartOf="parent"
@@ -48,15 +46,13 @@
             app:layout_constraintTop_toTopOf="parent"/>
 
         <ImageView
+            style="@style/icon_top_bar_button_style"
             android:id="@+id/merge"
             android:onClick="@{mergeCallsClickListener}"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
-            android:padding="15dp"
-            android:adjustViewBounds="true"
             android:src="@drawable/arrows_merge"
             android:contentDescription="@string/content_description_merge_calls_into_conference"
-            android:background="@drawable/circle_transparent_button_background"
             android:visibility="@{viewModel.callsCount > 1 ? View.VISIBLE : View.GONE}"
             app:tint="?attr/color_main1_500"
             app:layout_constraintBottom_toBottomOf="@id/title"
diff --git a/app/src/main/res/layout/chat_conversation_fragment.xml b/app/src/main/res/layout/chat_conversation_fragment.xml
index 04780e676..9605a8231 100644
--- a/app/src/main/res/layout/chat_conversation_fragment.xml
+++ b/app/src/main/res/layout/chat_conversation_fragment.xml
@@ -70,16 +70,14 @@
                     android:visibility="@{viewModel.searchBarVisible ? View.VISIBLE : View.GONE, default=gone}" />
 
                 <ImageView
+                    style="@style/icon_top_bar_button_style"
                     android:id="@+id/back"
                     android:layout_width="wrap_content"
                     android:layout_height="@dimen/top_bar_height"
-                    android:padding="15dp"
-                    android:adjustViewBounds="true"
                     android:onClick="@{backClickListener}"
                     android:visibility="@{viewModel.isCallConversation || viewModel.showBackButton &amp;&amp; !viewModel.searchBarVisible ? View.VISIBLE : View.GONE}"
                     android:src="@drawable/caret_left"
                     android:contentDescription="@string/content_description_go_back_icon"
-                    android:background="@drawable/circle_transparent_button_background"
                     app:tint="?attr/color_main1_500"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"/>
@@ -167,43 +165,39 @@
                     app:layout_constraintBottom_toBottomOf="@id/ephemeral_enabled"/>
 
                 <ImageView
+                    style="@style/icon_top_bar_button_style"
                     android:id="@+id/show_menu"
                     android:onClick="@{showMenuClickListener}"
                     android:layout_width="wrap_content"
                     android:layout_height="@dimen/top_bar_height"
-                    android:padding="15dp"
-                    android:adjustViewBounds="true"
                     android:src="@drawable/dots_three_vertical"
                     android:contentDescription="@string/content_description_show_popup_menu"
-                    android:background="@drawable/circle_transparent_button_background"
                     android:visibility="@{viewModel.isCallConversation ? View.GONE : View.VISIBLE}"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:tint="?attr/color_main2_500"/>
 
                 <ImageView
+                    style="@style/icon_top_bar_button_style"
                     android:id="@+id/start_call"
                     android:onClick="@{() -> viewModel.startCall()}"
                     android:layout_width="wrap_content"
                     android:layout_height="@dimen/top_bar_height"
-                    android:padding="15dp"
                     android:src="@drawable/phone"
                     android:contentDescription="@string/content_description_call_start"
                     android:visibility="@{viewModel.isCallConversation || viewModel.isReadOnly || viewModel.searchBarVisible ? View.GONE : View.VISIBLE}"
-                    android:background="@drawable/circle_transparent_button_background"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintEnd_toStartOf="@id/show_menu"
                     app:tint="?attr/color_main2_500" />
 
                 <ImageView
+                    style="@style/icon_top_bar_button_style"
                     android:id="@+id/cancel_search"
                     android:onClick="@{() -> viewModel.closeSearchBar()}"
                     android:layout_width="wrap_content"
                     android:layout_height="0dp"
-                    android:padding="15dp"
                     android:src="@drawable/caret_left"
                     android:contentDescription="@string/content_description_cancel_filter"
-                    android:background="@drawable/circle_transparent_button_background"
                     app:layout_constraintBottom_toBottomOf="@id/search"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="@id/search"
@@ -240,30 +234,28 @@
                 </com.google.android.material.textfield.TextInputLayout>
 
                 <ImageView
+                    style="@style/icon_top_bar_button_style"
                     android:id="@+id/search_up"
                     android:onClick="@{() -> viewModel.searchUp()}"
                     android:enabled="@{viewModel.searchFilter.length() > 0}"
                     android:layout_width="wrap_content"
                     android:layout_height="0dp"
-                    android:padding="15dp"
                     android:src="@drawable/caret_up"
                     android:contentDescription="@string/content_description_chat_search_message_up"
-                    android:background="@drawable/circle_transparent_button_background"
                     app:layout_constraintBottom_toBottomOf="@id/search"
                     app:layout_constraintEnd_toStartOf="@id/search_down"
                     app:layout_constraintTop_toTopOf="@id/search"
                     app:tint="@color/icon_color_selector" />
 
                 <ImageView
+                    style="@style/icon_top_bar_button_style"
                     android:id="@+id/search_down"
                     android:onClick="@{() -> viewModel.searchDown()}"
                     android:enabled="@{viewModel.searchFilter.length() > 0 &amp;&amp; viewModel.canSearchDown}"
                     android:layout_width="wrap_content"
                     android:layout_height="0dp"
-                    android:padding="15dp"
                     android:src="@drawable/caret_down"
                     android:contentDescription="@string/content_description_chat_search_message_down"
-                    android:background="@drawable/circle_transparent_button_background"
                     app:layout_constraintBottom_toBottomOf="@id/search"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="@id/search"
diff --git a/app/src/main/res/layout/chat_documents_fragment.xml b/app/src/main/res/layout/chat_documents_fragment.xml
index d3a9b9180..98a2b17a4 100644
--- a/app/src/main/res/layout/chat_documents_fragment.xml
+++ b/app/src/main/res/layout/chat_documents_fragment.xml
@@ -23,15 +23,13 @@
             android:background="?attr/color_background_contrast_in_dark_mode">
 
             <ImageView
+                style="@style/icon_top_bar_button_style"
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="0dp"
-                android:adjustViewBounds="true"
-                android:padding="15dp"
                 android:onClick="@{backClickListener}"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
-                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main1_500"
                 app:layout_constraintBottom_toBottomOf="@id/title"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/chat_ephemeral_lifetime_fragment.xml b/app/src/main/res/layout/chat_ephemeral_lifetime_fragment.xml
index 1441ce43d..984ef624e 100644
--- a/app/src/main/res/layout/chat_ephemeral_lifetime_fragment.xml
+++ b/app/src/main/res/layout/chat_ephemeral_lifetime_fragment.xml
@@ -18,15 +18,13 @@
         android:background="?attr/color_background_contrast_in_dark_mode">
 
         <ImageView
+            style="@style/icon_top_bar_button_style"
             android:id="@+id/back"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
-            android:adjustViewBounds="true"
-            android:padding="15dp"
             android:onClick="@{backClickListener}"
             android:src="@drawable/caret_left"
             android:contentDescription="@string/content_description_go_back_icon"
-            android:background="@drawable/circle_transparent_button_background"
             app:tint="?attr/color_main1_500"
             app:layout_constraintBottom_toBottomOf="@id/title"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/chat_info_fragment.xml b/app/src/main/res/layout/chat_info_fragment.xml
index c5b287e5f..b7c58293f 100644
--- a/app/src/main/res/layout/chat_info_fragment.xml
+++ b/app/src/main/res/layout/chat_info_fragment.xml
@@ -50,15 +50,13 @@
         android:background="?attr/color_background_contrast_in_dark_mode">
 
         <ImageView
+            style="@style/icon_top_bar_button_style"
             android:id="@+id/back"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
-            android:adjustViewBounds="true"
-            android:padding="15dp"
             android:onClick="@{backClickListener}"
             android:src="@drawable/caret_left"
             android:contentDescription="@string/content_description_go_back_icon"
-            android:background="@drawable/circle_transparent_button_background"
             app:tint="?attr/color_main1_500"
             app:layout_constraintBottom_toBottomOf="@id/invisible_title"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/chat_media_fragment.xml b/app/src/main/res/layout/chat_media_fragment.xml
index bd3b56dbc..1ea8cf683 100644
--- a/app/src/main/res/layout/chat_media_fragment.xml
+++ b/app/src/main/res/layout/chat_media_fragment.xml
@@ -23,15 +23,13 @@
             android:background="?attr/color_background_contrast_in_dark_mode">
 
             <ImageView
+                style="@style/icon_top_bar_button_style"
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="0dp"
-                android:adjustViewBounds="true"
-                android:padding="15dp"
                 android:onClick="@{backClickListener}"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
-                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main1_500"
                 app:layout_constraintBottom_toBottomOf="@id/title"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/chat_message_forward_fragment.xml b/app/src/main/res/layout/chat_message_forward_fragment.xml
index d3eb801bc..e9c69ba0b 100644
--- a/app/src/main/res/layout/chat_message_forward_fragment.xml
+++ b/app/src/main/res/layout/chat_message_forward_fragment.xml
@@ -23,15 +23,13 @@
             android:background="?attr/color_background_contrast_in_dark_mode">
 
             <ImageView
+                style="@style/icon_top_bar_button_style"
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="@dimen/top_bar_height"
-                android:padding="15dp"
-                android:adjustViewBounds="true"
                 android:onClick="@{backClickListener}"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
-                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main1_500"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"/>
diff --git a/app/src/main/res/layout/chat_participant_list_cell.xml b/app/src/main/res/layout/chat_participant_list_cell.xml
index 70649b09c..a1d22ea1f 100644
--- a/app/src/main/res/layout/chat_participant_list_cell.xml
+++ b/app/src/main/res/layout/chat_participant_list_cell.xml
@@ -76,15 +76,14 @@
             app:layout_constraintBottom_toBottomOf="parent" />
 
         <ImageView
+            style="@style/icon_top_bar_button_style"
             android:id="@+id/participant_menu"
             android:onClick="@{() -> model.openMenu(participantMenu)}"
             android:layout_width="@dimen/big_icon_size"
             android:layout_height="@dimen/big_icon_size"
             android:src="@drawable/dots_three_vertical"
             android:padding="10dp"
-            android:adjustViewBounds="true"
             android:contentDescription="@string/content_description_show_popup_menu"
-            android:background="@drawable/circle_transparent_button_background"
             android:visibility="@{model.showMenu ? View.VISIBLE : View.GONE}"
             app:tint="?attr/color_grey_800"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/contact_fragment.xml b/app/src/main/res/layout/contact_fragment.xml
index 501e1f7c6..797de7965 100644
--- a/app/src/main/res/layout/contact_fragment.xml
+++ b/app/src/main/res/layout/contact_fragment.xml
@@ -30,16 +30,14 @@
             android:background="?attr/color_background_contrast_in_dark_mode">
 
             <ImageView
+                style="@style/icon_top_bar_button_style"
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="0dp"
-                android:adjustViewBounds="true"
-                android:padding="15dp"
                 android:onClick="@{backClickListener}"
                 android:visibility="@{viewModel.showBackButton ? View.VISIBLE : View.GONE}"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
-                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main1_500"
                 app:layout_constraintBottom_toBottomOf="@id/invisible_title"
                 app:layout_constraintStart_toStartOf="parent"
@@ -57,16 +55,15 @@
                 app:layout_constraintStart_toEndOf="@id/back"
                 app:layout_constraintTop_toTopOf="parent"/>
 
-            <ImageView
+
+           <ImageView
+               style="@style/icon_top_bar_button_style"
                 android:onClick="@{() -> viewModel.editContact()}"
                 android:id="@+id/edit"
                 android:layout_width="wrap_content"
                 android:layout_height="0dp"
-                android:padding="15dp"
-                android:adjustViewBounds="true"
                 android:src="@drawable/pencil_simple"
                 android:contentDescription="@string/content_description_contact_edit"
-                android:background="@drawable/circle_transparent_button_background"
                 android:visibility="@{viewModel.isStored ? View.VISIBLE : View.GONE}"
                 app:tint="?attr/color_main2_500"
                 app:layout_constraintBottom_toBottomOf="@id/invisible_title"
diff --git a/app/src/main/res/layout/contact_new_or_edit_fragment.xml b/app/src/main/res/layout/contact_new_or_edit_fragment.xml
index 5f9387e90..b32845023 100644
--- a/app/src/main/res/layout/contact_new_or_edit_fragment.xml
+++ b/app/src/main/res/layout/contact_new_or_edit_fragment.xml
@@ -25,15 +25,13 @@
         android:background="?attr/color_background_contrast_in_dark_mode">
 
         <ImageView
+            style="@style/icon_top_bar_button_style"
             android:id="@+id/back"
             android:onClick="@{backClickListener}"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
-            android:adjustViewBounds="true"
-            android:padding="15dp"
             android:src="@drawable/caret_left"
             android:contentDescription="@string/content_description_go_back_icon"
-            android:background="@drawable/circle_transparent_button_background"
             app:tint="?attr/color_main1_500"
             app:layout_constraintBottom_toBottomOf="@id/title"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/file_media_viewer_activity.xml b/app/src/main/res/layout/file_media_viewer_activity.xml
index 912fabb16..ace7d7b33 100644
--- a/app/src/main/res/layout/file_media_viewer_activity.xml
+++ b/app/src/main/res/layout/file_media_viewer_activity.xml
@@ -56,15 +56,13 @@
             app:layout_constraintEnd_toEndOf="parent" />
 
         <ImageView
+            style="@style/icon_top_bar_button_style"
             android:id="@+id/back"
             android:onClick="@{backClickListener}"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/top_bar_height"
-            android:adjustViewBounds="true"
-            android:padding="15dp"
             android:src="@drawable/caret_left"
             android:contentDescription="@string/content_description_go_back_icon"
-            android:background="@drawable/circle_transparent_button_background"
             app:tint="?attr/color_main1_500"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -105,30 +103,26 @@
             app:layout_constraintStart_toEndOf="@id/back"/>
 
         <ImageView
+            style="@style/icon_top_bar_button_style"
             android:id="@+id/share"
             android:onClick="@{shareClickListener}"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/top_bar_height"
-            android:adjustViewBounds="true"
-            android:padding="15dp"
             android:src="@drawable/share_network"
             android:contentDescription="@string/content_description_share_file"
-            android:background="@drawable/circle_transparent_button_background"
             android:visibility="@{sharedViewModel.mediaViewerFullScreenMode || viewModel.isCurrentlyDisplayedFileFromEphemeralMessage ? View.GONE : View.VISIBLE}"
             app:tint="@color/gray_main2_500"
             app:layout_constraintEnd_toStartOf="@id/save"
             app:layout_constraintTop_toTopOf="parent" />
 
         <ImageView
+            style="@style/icon_top_bar_button_style"
             android:id="@+id/save"
             android:onClick="@{exportClickListener}"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/top_bar_height"
-            android:adjustViewBounds="true"
-            android:padding="15dp"
             android:src="@drawable/download_simple"
             android:contentDescription="@string/content_description_save_file"
-            android:background="@drawable/circle_transparent_button_background"
             android:visibility="@{sharedViewModel.mediaViewerFullScreenMode || viewModel.isCurrentlyDisplayedFileFromEphemeralMessage ? View.GONE : View.VISIBLE}"
             app:tint="@color/gray_main2_500"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/file_viewer_activity.xml b/app/src/main/res/layout/file_viewer_activity.xml
index 5c85c81be..5f6490465 100644
--- a/app/src/main/res/layout/file_viewer_activity.xml
+++ b/app/src/main/res/layout/file_viewer_activity.xml
@@ -94,15 +94,13 @@
             app:layout_constraintEnd_toEndOf="parent" />
 
         <ImageView
+            style="@style/icon_top_bar_button_style"
             android:id="@+id/back"
             android:onClick="@{backClickListener}"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/top_bar_height"
-            android:adjustViewBounds="true"
-            android:padding="15dp"
             android:src="@drawable/caret_left"
             android:contentDescription="@string/content_description_go_back_icon"
-            android:background="@drawable/circle_transparent_button_background"
             app:tint="?attr/color_main1_500"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -143,30 +141,26 @@
             app:layout_constraintStart_toEndOf="@id/back"/>
 
         <ImageView
+            style="@style/icon_top_bar_button_style"
             android:id="@+id/share"
             android:onClick="@{shareClickListener}"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/top_bar_height"
-            android:adjustViewBounds="true"
-            android:padding="15dp"
             android:src="@drawable/share_network"
             android:contentDescription="@string/content_description_share_file"
-            android:background="@drawable/circle_transparent_button_background"
             android:visibility="@{viewModel.fullScreenMode || viewModel.isFromEphemeralMessage ? View.GONE : View.VISIBLE}"
             app:tint="@color/gray_main2_500"
             app:layout_constraintEnd_toStartOf="@id/save"
             app:layout_constraintTop_toTopOf="parent" />
 
         <ImageView
+            style="@style/icon_top_bar_button_style"
             android:id="@+id/save"
             android:onClick="@{() -> viewModel.exportToMediaStore()}"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/top_bar_height"
-            android:adjustViewBounds="true"
-            android:padding="15dp"
             android:src="@drawable/download_simple"
             android:contentDescription="@string/content_description_save_file"
-            android:background="@drawable/circle_transparent_button_background"
             android:visibility="@{viewModel.fullScreenMode || viewModel.isFromEphemeralMessage ? View.GONE : View.VISIBLE}"
             app:tint="@color/gray_main2_500"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/generic_add_participants_fragment.xml b/app/src/main/res/layout/generic_add_participants_fragment.xml
index bc8c93891..828f3697c 100644
--- a/app/src/main/res/layout/generic_add_participants_fragment.xml
+++ b/app/src/main/res/layout/generic_add_participants_fragment.xml
@@ -22,15 +22,13 @@
             android:background="?attr/color_main2_000">
 
             <ImageView
+                style="@style/icon_top_bar_button_style"
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="@dimen/top_bar_height"
-                android:adjustViewBounds="true"
                 android:onClick="@{backClickListener}"
-                android:padding="15dp"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
-                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main1_500"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/help_debug_fragment.xml b/app/src/main/res/layout/help_debug_fragment.xml
index ec24c5840..33f4e7ab3 100644
--- a/app/src/main/res/layout/help_debug_fragment.xml
+++ b/app/src/main/res/layout/help_debug_fragment.xml
@@ -29,15 +29,13 @@
             android:background="?attr/color_background_contrast_in_dark_mode">
 
             <ImageView
+                style="@style/icon_top_bar_button_style"
                 android:id="@+id/back"
                 android:onClick="@{backClickListener}"
                 android:layout_width="wrap_content"
                 android:layout_height="0dp"
-                android:adjustViewBounds="true"
-                android:padding="15dp"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
-                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main1_500"
                 app:layout_constraintBottom_toBottomOf="@id/title"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/help_fragment.xml b/app/src/main/res/layout/help_fragment.xml
index ae5b0af53..6692c8e17 100644
--- a/app/src/main/res/layout/help_fragment.xml
+++ b/app/src/main/res/layout/help_fragment.xml
@@ -38,15 +38,13 @@
             android:background="?attr/color_background_contrast_in_dark_mode">
 
             <ImageView
+                style="@style/icon_top_bar_button_style"
                 android:id="@+id/back"
                 android:onClick="@{backClickListener}"
                 android:layout_width="wrap_content"
                 android:layout_height="0dp"
-                android:adjustViewBounds="true"
-                android:padding="15dp"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
-                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main1_500"
                 app:layout_constraintBottom_toBottomOf="@id/title"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/history_fragment.xml b/app/src/main/res/layout/history_fragment.xml
index 3e0d0a32e..8d98ce3b6 100644
--- a/app/src/main/res/layout/history_fragment.xml
+++ b/app/src/main/res/layout/history_fragment.xml
@@ -30,16 +30,14 @@
             android:background="?attr/color_background_contrast_in_dark_mode">
 
             <ImageView
+                style="@style/icon_top_bar_button_style"
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="0dp"
-                android:padding="15dp"
-                android:adjustViewBounds="true"
                 android:onClick="@{backClickListener}"
                 android:visibility="@{viewModel.showBackButton ? View.VISIBLE : View.GONE}"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
-                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main1_500"
                 app:layout_constraintBottom_toBottomOf="@id/invisible_title"
                 app:layout_constraintStart_toStartOf="parent"
@@ -58,15 +56,13 @@
                 app:layout_constraintTop_toTopOf="parent"/>
 
             <ImageView
+                style="@style/icon_top_bar_button_style"
                 android:onClick="@{menuClickListener}"
                 android:id="@+id/menu"
                 android:layout_width="wrap_content"
                 android:layout_height="0dp"
-                android:padding="15dp"
-                android:adjustViewBounds="true"
                 android:src="@drawable/dots_three_vertical"
                 android:contentDescription="@string/content_description_show_popup_menu"
-                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main2_500"
                 app:layout_constraintBottom_toBottomOf="@id/invisible_title"
                 app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/main_activity_top_bar.xml b/app/src/main/res/layout/main_activity_top_bar.xml
index c4bb333cb..1f3a3689c 100644
--- a/app/src/main/res/layout/main_activity_top_bar.xml
+++ b/app/src/main/res/layout/main_activity_top_bar.xml
@@ -75,15 +75,13 @@
             app:layout_constraintBottom_toBottomOf="@id/avatar"/>
 
         <ImageView
+            style="@style/icon_top_bar_button_style"
             android:id="@+id/search_toggle"
             android:onClick="@{() -> viewModel.openSearchBar()}"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:layout_marginEnd="5dp"
-            android:padding="15dp"
             android:src="@drawable/magnifying_glass"
-            android:adjustViewBounds="true"
-            android:background="@drawable/circle_transparent_button_background"
             android:contentDescription="@string/content_description_open_filter"
             app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintBottom_toBottomOf="@id/title"
@@ -92,15 +90,13 @@
             app:tint="?attr/color_on_main" />
 
         <ImageView
+            style="@style/icon_top_bar_button_style"
             android:id="@+id/extra_action"
             android:onClick="@{extraActionClickListener}"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:layout_marginEnd="5dp"
-            android:padding="15dp"
             android:src="@{extraActionIcon, default=@drawable/dots_three_vertical}"
-            android:adjustViewBounds="true"
-            android:background="@drawable/circle_transparent_button_background"
             android:contentDescription="@{extraActionContentDescription}"
             android:visibility="@{!viewModel.searchBarVisible &amp;&amp; enableExtraAction ? View.VISIBLE : View.GONE, default=gone}"
             app:layout_constraintDimensionRatio="1:1"
@@ -110,15 +106,13 @@
             app:tint="?attr/color_on_main" />
 
         <ImageView
+            style="@style/icon_top_bar_button_style"
             android:id="@+id/cancel_search"
             android:onClick="@{() -> viewModel.closeSearchBar()}"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:layout_marginStart="5dp"
-            android:padding="15dp"
             android:src="@drawable/caret_left"
-            android:adjustViewBounds="true"
-            android:background="@drawable/circle_transparent_button_background"
             android:contentDescription="@string/content_description_cancel_filter"
             app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintBottom_toBottomOf="@id/search"
@@ -159,15 +153,13 @@
         </com.google.android.material.textfield.TextInputLayout>
 
         <ImageView
+            style="@style/icon_top_bar_button_style"
             android:id="@+id/clear_field"
             android:onClick="@{() -> viewModel.clearFilter()}"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:layout_marginEnd="5dp"
-            android:padding="15dp"
             android:src="@drawable/x"
-            android:adjustViewBounds="true"
-            android:background="@drawable/circle_transparent_button_background"
             android:contentDescription="@string/content_description_clear_filter"
             app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintBottom_toBottomOf="@id/search"
diff --git a/app/src/main/res/layout/meeting_edit_fragment.xml b/app/src/main/res/layout/meeting_edit_fragment.xml
index 94670daf6..3f7d7bd11 100644
--- a/app/src/main/res/layout/meeting_edit_fragment.xml
+++ b/app/src/main/res/layout/meeting_edit_fragment.xml
@@ -35,15 +35,13 @@
             android:background="?attr/color_background_contrast_in_dark_mode">
 
             <ImageView
+                style="@style/icon_top_bar_button_style"
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="0dp"
-                android:padding="15dp"
-                android:adjustViewBounds="true"
                 android:onClick="@{backClickListener}"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
-                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main1_500"
                 app:layout_constraintBottom_toBottomOf="@id/title"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/meeting_fragment.xml b/app/src/main/res/layout/meeting_fragment.xml
index 4f6c2c79e..366d64973 100644
--- a/app/src/main/res/layout/meeting_fragment.xml
+++ b/app/src/main/res/layout/meeting_fragment.xml
@@ -35,15 +35,13 @@
             android:background="?attr/color_background_contrast_in_dark_mode">
 
             <ImageView
+                style="@style/icon_top_bar_button_style"
                 android:id="@+id/back"
                 android:onClick="@{backClickListener}"
                 android:layout_width="wrap_content"
                 android:layout_height="0dp"
-                android:adjustViewBounds="true"
-                android:padding="15dp"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
-                android:background="@drawable/circle_transparent_button_background"
                 android:visibility="@{viewModel.showBackButton ? View.VISIBLE : View.GONE}"
                 app:tint="?attr/color_main1_500"
                 app:layout_constraintBottom_toBottomOf="@id/title"
@@ -62,15 +60,13 @@
                 app:layout_constraintTop_toTopOf="parent"/>
 
             <ImageView
+                style="@style/icon_top_bar_button_style"
                 android:id="@+id/edit"
                 android:onClick="@{editClickListener}"
                 android:layout_width="wrap_content"
                 android:layout_height="0dp"
-                android:padding="15dp"
-                android:adjustViewBounds="true"
                 android:src="@drawable/pencil_simple"
                 android:contentDescription="@string/content_description_meeting_edit"
-                android:background="@drawable/circle_transparent_button_background"
                 android:visibility="@{viewModel.isEditable ? View.VISIBLE : View.GONE}"
                 app:tint="?attr/color_main2_500"
                 app:layout_constraintStart_toEndOf="@id/title"
@@ -79,15 +75,13 @@
                 app:layout_constraintTop_toTopOf="@id/title" />
 
             <ImageView
+                style="@style/icon_top_bar_button_style"
                 android:id="@+id/menu"
                 android:onClick="@{menuClickListener}"
                 android:layout_width="wrap_content"
                 android:layout_height="0dp"
-                android:padding="15dp"
-                android:adjustViewBounds="true"
                 android:src="@drawable/dots_three_vertical"
                 android:contentDescription="@string/content_description_show_popup_menu"
-                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main2_500"
                 app:layout_constraintStart_toEndOf="@id/edit"
                 app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/meeting_schedule_fragment.xml b/app/src/main/res/layout/meeting_schedule_fragment.xml
index a1b82e81f..3c547d32c 100644
--- a/app/src/main/res/layout/meeting_schedule_fragment.xml
+++ b/app/src/main/res/layout/meeting_schedule_fragment.xml
@@ -35,15 +35,13 @@
             android:background="?attr/color_background_contrast_in_dark_mode">
 
             <ImageView
+                style="@style/icon_top_bar_button_style"
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="0dp"
-                android:padding="15dp"
-                android:adjustViewBounds="true"
                 android:onClick="@{backClickListener}"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
-                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main1_500"
                 app:layout_constraintBottom_toBottomOf="@id/title"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/meeting_waiting_room_fragment.xml b/app/src/main/res/layout/meeting_waiting_room_fragment.xml
index ae2c223ec..640309a79 100644
--- a/app/src/main/res/layout/meeting_waiting_room_fragment.xml
+++ b/app/src/main/res/layout/meeting_waiting_room_fragment.xml
@@ -19,15 +19,13 @@
         android:background="@color/gray_900">
 
         <ImageView
+            style="@style/icon_top_bar_button_style"
             android:id="@+id/back"
             android:onClick="@{backClickListener}"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/top_bar_height"
-            android:adjustViewBounds="true"
-            android:padding="15dp"
             android:src="@drawable/caret_left"
             android:contentDescription="@string/content_description_go_back_icon"
-            android:background="@drawable/circle_transparent_button_background"
             app:tint="?attr/color_main1_500"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/recording_player_fragment.xml b/app/src/main/res/layout/recording_player_fragment.xml
index 5dac491ff..fcc6e2ab2 100644
--- a/app/src/main/res/layout/recording_player_fragment.xml
+++ b/app/src/main/res/layout/recording_player_fragment.xml
@@ -112,15 +112,13 @@
             app:layout_constraintEnd_toEndOf="parent" />
 
         <ImageView
+            style="@style/icon_top_bar_button_style"
             android:id="@+id/back"
             android:onClick="@{backClickListener}"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/top_bar_height"
-            android:adjustViewBounds="true"
-            android:padding="15dp"
             android:src="@drawable/caret_left"
             android:contentDescription="@string/content_description_go_back_icon"
-            android:background="@drawable/circle_transparent_button_background"
             app:tint="?attr/color_main1_500"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -161,30 +159,26 @@
             app:layout_constraintStart_toEndOf="@id/back"/>
 
         <ImageView
+            style="@style/icon_top_bar_button_style"
             android:id="@+id/share"
             android:onClick="@{shareClickListener}"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/top_bar_height"
-            android:adjustViewBounds="true"
-            android:padding="15dp"
             android:src="@drawable/share_network"
             android:contentDescription="@string/content_description_share_file"
-            android:background="@drawable/circle_transparent_button_background"
             android:visibility="@{viewModel.isUsingSmffFileFormat ? View.GONE : View.VISIBLE}"
             app:tint="@color/gray_main2_500"
             app:layout_constraintEnd_toStartOf="@id/save"
             app:layout_constraintTop_toTopOf="parent" />
 
         <ImageView
+            style="@style/icon_top_bar_button_style"
             android:id="@+id/save"
             android:onClick="@{exportClickListener}"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/top_bar_height"
-            android:adjustViewBounds="true"
-            android:padding="15dp"
             android:src="@drawable/download_simple"
             android:contentDescription="@string/content_description_save_file"
-            android:background="@drawable/circle_transparent_button_background"
             android:visibility="@{viewModel.isUsingSmffFileFormat ? View.GONE : View.VISIBLE}"
             app:tint="@color/gray_main2_500"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/recordings_list_fragment.xml b/app/src/main/res/layout/recordings_list_fragment.xml
index b3a7938f5..bdef7fe8b 100644
--- a/app/src/main/res/layout/recordings_list_fragment.xml
+++ b/app/src/main/res/layout/recordings_list_fragment.xml
@@ -33,15 +33,13 @@
             app:constraint_referenced_ids="cancel_search, search, clear_field" />
 
         <ImageView
+            style="@style/icon_top_bar_button_style"
             android:id="@+id/back"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
-            android:adjustViewBounds="true"
             android:onClick="@{backClickListener}"
-            android:padding="15dp"
             android:src="@drawable/caret_left"
             android:contentDescription="@string/content_description_go_back_icon"
-            android:background="@drawable/circle_transparent_button_background"
             app:layout_constraintBottom_toBottomOf="@id/title"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/title"
@@ -61,16 +59,14 @@
             app:layout_constraintTop_toTopOf="parent" />
 
         <ImageView
+            style="@style/icon_top_bar_button_style"
             android:id="@+id/search_toggle"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:layout_marginEnd="5dp"
             android:onClick="@{() -> viewModel.openSearchBar()}"
-            android:padding="15dp"
             android:src="@drawable/magnifying_glass"
-            android:adjustViewBounds="true"
             android:contentDescription="@string/content_description_open_filter"
-            android:background="@drawable/circle_transparent_button_background"
             android:visibility="@{viewModel.searchBarVisible ? View.GONE : View.VISIBLE}"
             app:layout_constraintBottom_toBottomOf="@id/title"
             app:layout_constraintEnd_toEndOf="parent"
@@ -78,16 +74,13 @@
             app:tint="?attr/color_main2_500" />
 
         <ImageView
+            style="@style/icon_top_bar_button_style"
             android:id="@+id/cancel_search"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
-            android:layout_marginStart="5dp"
             android:onClick="@{() -> viewModel.closeSearchBar()}"
-            android:padding="15dp"
             android:src="@drawable/caret_left"
-            android:adjustViewBounds="true"
             android:contentDescription="@string/content_description_cancel_filter"
-            android:background="@drawable/circle_transparent_button_background"
             app:layout_constraintBottom_toBottomOf="@id/search"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/search"
@@ -122,16 +115,14 @@
         </com.google.android.material.textfield.TextInputLayout>
 
         <ImageView
+            style="@style/icon_top_bar_button_style"
             android:id="@+id/clear_field"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:layout_marginEnd="5dp"
             android:onClick="@{() -> viewModel.clearFilter()}"
-            android:padding="15dp"
             android:src="@drawable/x"
-            android:adjustViewBounds="true"
             android:contentDescription="@string/content_description_clear_filter"
-            android:background="@drawable/circle_transparent_button_background"
             app:layout_constraintBottom_toBottomOf="@id/search"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/search"
diff --git a/app/src/main/res/layout/settings_advanced_calls_fragment.xml b/app/src/main/res/layout/settings_advanced_calls_fragment.xml
index cbcd4b910..b111607c8 100644
--- a/app/src/main/res/layout/settings_advanced_calls_fragment.xml
+++ b/app/src/main/res/layout/settings_advanced_calls_fragment.xml
@@ -19,15 +19,13 @@
         android:background="?attr/color_background_contrast_in_dark_mode">
 
         <ImageView
+            style="@style/icon_top_bar_button_style"
             android:id="@+id/back"
             android:onClick="@{backClickListener}"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
-            android:adjustViewBounds="true"
-            android:padding="15dp"
             android:src="@drawable/caret_left"
             android:contentDescription="@string/content_description_go_back_icon"
-            android:background="@drawable/circle_transparent_button_background"
             app:tint="?attr/color_main1_500"
             app:layout_constraintBottom_toBottomOf="@id/title"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/settings_advanced_fragment.xml b/app/src/main/res/layout/settings_advanced_fragment.xml
index 9921b38a5..fa2e4ec8d 100644
--- a/app/src/main/res/layout/settings_advanced_fragment.xml
+++ b/app/src/main/res/layout/settings_advanced_fragment.xml
@@ -21,15 +21,13 @@
         android:background="?attr/color_background_contrast_in_dark_mode">
 
         <ImageView
+            style="@style/icon_top_bar_button_style"
             android:id="@+id/back"
             android:onClick="@{backClickListener}"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
-            android:adjustViewBounds="true"
-            android:padding="15dp"
             android:src="@drawable/caret_left"
             android:contentDescription="@string/content_description_go_back_icon"
-            android:background="@drawable/circle_transparent_button_background"
             app:tint="?attr/color_main1_500"
             app:layout_constraintBottom_toBottomOf="@id/title"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/settings_developer_fragment.xml b/app/src/main/res/layout/settings_developer_fragment.xml
index c495e43b6..e37fea975 100644
--- a/app/src/main/res/layout/settings_developer_fragment.xml
+++ b/app/src/main/res/layout/settings_developer_fragment.xml
@@ -18,15 +18,13 @@
         android:background="?attr/color_background_contrast_in_dark_mode">
 
         <ImageView
+            style="@style/icon_top_bar_button_style"
             android:id="@+id/back"
             android:onClick="@{backClickListener}"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
-            android:adjustViewBounds="true"
-            android:padding="15dp"
             android:src="@drawable/caret_left"
             android:contentDescription="@string/content_description_go_back_icon"
-            android:background="@drawable/circle_transparent_button_background"
             app:tint="?attr/color_main1_500"
             app:layout_constraintBottom_toBottomOf="@id/title"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/settings_fragment.xml b/app/src/main/res/layout/settings_fragment.xml
index 621ef075c..aeaa10d6b 100644
--- a/app/src/main/res/layout/settings_fragment.xml
+++ b/app/src/main/res/layout/settings_fragment.xml
@@ -31,15 +31,13 @@
         android:background="?attr/color_background_contrast_in_dark_mode">
 
         <ImageView
+            style="@style/icon_top_bar_button_style"
             android:id="@+id/back"
             android:onClick="@{backClickListener}"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
-            android:adjustViewBounds="true"
-            android:padding="15dp"
             android:src="@drawable/caret_left"
             android:contentDescription="@string/content_description_go_back_icon"
-            android:background="@drawable/circle_transparent_button_background"
             app:tint="?attr/color_main1_500"
             app:layout_constraintBottom_toBottomOf="@id/title"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/single_sign_on_fragment.xml b/app/src/main/res/layout/single_sign_on_fragment.xml
index 70e91d6fa..b3c002bfd 100644
--- a/app/src/main/res/layout/single_sign_on_fragment.xml
+++ b/app/src/main/res/layout/single_sign_on_fragment.xml
@@ -19,14 +19,13 @@
             android:layout_height="match_parent">
 
             <ImageView
+                style="@style/icon_top_bar_button_style"
                 android:id="@+id/back"
                 android:layout_width="@dimen/top_bar_height"
                 android:layout_height="@dimen/top_bar_height"
-                android:padding="15dp"
                 android:src="@drawable/caret_left"
                 android:visibility="invisible"
                 android:contentDescription="@string/content_description_go_back_icon"
-                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main2_500"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintStart_toStartOf="parent"/>
diff --git a/app/src/main/res/layout/start_call_fragment.xml b/app/src/main/res/layout/start_call_fragment.xml
index aa56fa669..977145dab 100644
--- a/app/src/main/res/layout/start_call_fragment.xml
+++ b/app/src/main/res/layout/start_call_fragment.xml
@@ -36,15 +36,13 @@
                 android:visibility="@{viewModel.multipleSelectionMode ? View.VISIBLE : View.GONE, default=gone}" />
 
             <ImageView
+                style="@style/icon_top_bar_button_style"
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="@dimen/top_bar_height"
-                android:adjustViewBounds="true"
                 android:onClick="@{backClickListener}"
-                android:padding="15dp"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
-                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main1_500"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/start_chat_fragment.xml b/app/src/main/res/layout/start_chat_fragment.xml
index ef66d6f94..37721e1e8 100644
--- a/app/src/main/res/layout/start_chat_fragment.xml
+++ b/app/src/main/res/layout/start_chat_fragment.xml
@@ -33,15 +33,13 @@
                 android:visibility="@{viewModel.multipleSelectionMode ? View.VISIBLE : View.GONE, default=gone}" />
 
             <ImageView
+                style="@style/icon_top_bar_button_style"
                 android:id="@+id/back"
                 android:layout_width="wrap_content"
                 android:layout_height="@dimen/top_bar_height"
-                android:adjustViewBounds="true"
                 android:onClick="@{backClickListener}"
-                android:padding="15dp"
                 android:src="@drawable/caret_left"
                 android:contentDescription="@string/content_description_go_back_icon"
-                android:background="@drawable/circle_transparent_button_background"
                 app:tint="?attr/color_main1_500"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index e6ca83e1d..055e3a1ff 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -127,6 +127,15 @@
         <item name="android:maxLines">1</item>
         <item name="android:ellipsize">end</item>
     </style>
+    <style name="icon_top_bar_button_style">
+        <item name="android:layout_marginTop">2dp</item>
+        <item name="android:layout_marginBottom">2dp</item>
+        <item name="android:layout_marginStart">2dp</item>
+        <item name="android:layout_marginEnd">2dp</item>
+        <item name="android:padding">15dp</item>
+        <item name="android:adjustViewBounds">true</item>
+        <item name="android:background">@drawable/circle_transparent_button_background</item>
+    </style>
     <style name="context_menu_action_label_style">
         <item name="android:fontFamily">@font/noto_sans</item>
         <item name="android:textSize">14sp</item>