diff --git a/app/src/main/res/layout/dialog_attachment.xml b/app/src/main/res/layout/dialog_attachment.xml
index 6a58943d1..b429faf81 100644
--- a/app/src/main/res/layout/dialog_attachment.xml
+++ b/app/src/main/res/layout/dialog_attachment.xml
@@ -55,7 +55,7 @@
             android:layout_height="wrap_content"
             android:contentDescription="@null"
             android:src="@drawable/ic_baseline_person_24"
-            app:tint="@color/colorPrimary" />
+            app:tint="@color/high_emphasis_menu_icon" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/shareContactText"
@@ -86,7 +86,7 @@
             android:layout_height="wrap_content"
             android:contentDescription="@null"
             android:src="@drawable/ic_baseline_location_on_24"
-            app:tint="@color/colorPrimary" />
+            app:tint="@color/high_emphasis_menu_icon" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/txt_share_location"
@@ -117,7 +117,7 @@
             android:layout_height="wrap_content"
             android:contentDescription="@null"
             android:src="@drawable/ic_baseline_photo_camera_24"
-            app:tint="@color/colorPrimary" />
+            app:tint="@color/high_emphasis_menu_icon" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/txt_attach_picture_from_cam"
@@ -148,7 +148,7 @@
             android:layout_height="wrap_content"
             android:contentDescription="@null"
             android:src="@drawable/upload"
-            app:tint="@color/colorPrimary" />
+            app:tint="@color/high_emphasis_menu_icon" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/txt_attach_file_from_local"
@@ -179,7 +179,7 @@
             android:layout_height="wrap_content"
             android:contentDescription="@null"
             android:src="@drawable/ic_share_variant"
-            app:tint="@color/colorPrimary" />
+            app:tint="@color/high_emphasis_menu_icon" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/txt_attach_file_from_cloud"
diff --git a/app/src/main/res/layout/dialog_audio_output.xml b/app/src/main/res/layout/dialog_audio_output.xml
index 9369d840f..6b7a09f78 100644
--- a/app/src/main/res/layout/dialog_audio_output.xml
+++ b/app/src/main/res/layout/dialog_audio_output.xml
@@ -49,11 +49,11 @@
 
         <ImageView
             android:id="@+id/audio_output_bluetooth_icon"
-            android:layout_width="11dp"
-            android:layout_height="12dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:contentDescription="@null"
             android:src="@drawable/ic_baseline_bluetooth_audio_24"
-            app:tint="@color/grey_600" />
+            app:tint="@color/high_emphasis_menu_icon_inverse" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/audio_output_bluetooth_text"
@@ -84,7 +84,7 @@
             android:layout_height="wrap_content"
             android:contentDescription="@null"
             android:src="@drawable/ic_volume_up_white_24dp"
-            app:tint="@color/grey_600" />
+            app:tint="@color/high_emphasis_menu_icon_inverse" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/audio_output_speaker_text"
@@ -115,7 +115,7 @@
             android:layout_height="wrap_content"
             android:contentDescription="@null"
             android:src="@drawable/ic_baseline_phone_in_talk_24"
-            app:tint="@color/grey_600" />
+            app:tint="@color/high_emphasis_menu_icon_inverse" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/audio_output_earspeaker_text"
@@ -146,7 +146,7 @@
             android:layout_height="wrap_content"
             android:contentDescription="@null"
             android:src="@drawable/ic_baseline_headset_mic_24"
-            app:tint="@color/grey_600" />
+            app:tint="@color/high_emphasis_menu_icon_inverse" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/audio_output_wired_headset_text"
diff --git a/app/src/main/res/layout/dialog_conversation_operations.xml b/app/src/main/res/layout/dialog_conversation_operations.xml
index d9c637649..a640c5da7 100644
--- a/app/src/main/res/layout/dialog_conversation_operations.xml
+++ b/app/src/main/res/layout/dialog_conversation_operations.xml
@@ -59,7 +59,7 @@
                 android:layout_height="wrap_content"
                 android:contentDescription="@null"
                 android:src="@drawable/ic_star_border_black_24dp"
-                app:tint="@color/grey_600" />
+                app:tint="@color/high_emphasis_menu_icon" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="match_parent"
@@ -86,7 +86,7 @@
                 android:layout_height="wrap_content"
                 android:contentDescription="@null"
                 android:src="@drawable/ic_star_black_24dp"
-                app:tint="@color/grey_600" />
+                app:tint="@color/high_emphasis_menu_icon" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="match_parent"
@@ -113,7 +113,7 @@
                 android:layout_height="wrap_content"
                 android:contentDescription="@null"
                 android:src="@drawable/ic_eye"
-                app:tint="@color/grey_600" />
+                app:tint="@color/high_emphasis_menu_icon" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="match_parent"
@@ -140,7 +140,7 @@
                 android:layout_height="wrap_content"
                 android:contentDescription="@null"
                 android:src="@drawable/ic_pencil_grey600_24dp"
-                app:tint="@color/grey_600" />
+                app:tint="@color/high_emphasis_menu_icon" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="match_parent"
@@ -167,7 +167,7 @@
                 android:layout_height="wrap_content"
                 android:contentDescription="@null"
                 android:src="@drawable/ic_link_grey600_24px"
-                app:tint="@color/grey_600" />
+                app:tint="@color/high_emphasis_menu_icon" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="match_parent"
@@ -194,7 +194,7 @@
                 android:layout_height="wrap_content"
                 android:contentDescription="@null"
                 android:src="@drawable/ic_lock_grey600_24px"
-                app:tint="@color/grey_600" />
+                app:tint="@color/high_emphasis_menu_icon" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="match_parent"
@@ -221,7 +221,7 @@
                 android:layout_height="wrap_content"
                 android:contentDescription="@null"
                 android:src="@drawable/ic_lock_open_grey600_24dp"
-                app:tint="@color/grey_600" />
+                app:tint="@color/high_emphasis_menu_icon" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="match_parent"
@@ -248,7 +248,7 @@
                 android:layout_height="wrap_content"
                 android:contentDescription="@null"
                 android:src="@drawable/ic_lock_plus_grey600_24dp"
-                app:tint="@color/grey_600" />
+                app:tint="@color/high_emphasis_menu_icon" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="match_parent"
@@ -275,7 +275,7 @@
                 android:layout_height="wrap_content"
                 android:contentDescription="@null"
                 android:src="@drawable/ic_delete_grey600_24dp"
-                app:tint="@color/grey_600" />
+                app:tint="@color/high_emphasis_menu_icon" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="match_parent"
@@ -302,7 +302,7 @@
                 android:layout_height="wrap_content"
                 android:contentDescription="@null"
                 android:src="@drawable/ic_link_grey600_24px"
-                app:tint="@color/grey_600" />
+                app:tint="@color/high_emphasis_menu_icon" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="match_parent"
@@ -329,7 +329,7 @@
                 android:layout_height="wrap_content"
                 android:contentDescription="@null"
                 android:src="@drawable/ic_group_grey600_24px"
-                app:tint="@color/grey_600" />
+                app:tint="@color/high_emphasis_menu_icon" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="match_parent"
@@ -356,7 +356,7 @@
                 android:layout_height="wrap_content"
                 android:contentDescription="@null"
                 android:src="@drawable/ic_exit_to_app_black_24dp"
-                app:tint="@color/grey_600" />
+                app:tint="@color/high_emphasis_menu_icon" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index d61be9770..a721a3c27 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -46,6 +46,7 @@
     <color name="medium_emphasis_text_dark_background">#99ffffff</color>
 
     <!-- bottom sheet specific icon default color -->
+    <color name="high_emphasis_menu_icon_inverse">#8Affffff</color>
     <color name="high_emphasis_menu_icon">#8A000000</color>
 
     <!-- Text color of sent messages -->