diff --git a/src/main/res/layout/activity_choose_contact.xml b/src/main/res/layout/activity_choose_contact.xml
index da8059719f..bdddbefea6 100644
--- a/src/main/res/layout/activity_choose_contact.xml
+++ b/src/main/res/layout/activity_choose_contact.xml
@@ -31,8 +31,7 @@
                 android:layout_margin="16dp"
                 android:src="@drawable/ic_person_add_white_24dp"
                 android:visibility="gone"
-                app:backgroundTint="?attr/colorAccent"
-                app:tint="?attr/icon_tint" />
+                app:backgroundTint="?attr/colorAccent" />
         </FrameLayout>
     </LinearLayout>
 </layout>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_media_viewer.xml b/src/main/res/layout/activity_media_viewer.xml
index 71cc4ca2f6..0e7000f563 100644
--- a/src/main/res/layout/activity_media_viewer.xml
+++ b/src/main/res/layout/activity_media_viewer.xml
@@ -48,7 +48,6 @@
             android:layout_alignParentRight="true"
             android:layout_alignParentBottom="true"
             app:backgroundTint="?attr/colorAccent"
-            app:tint="?attr/icon_tint"
             app:sdMainFabClosedBackgroundColor="?attr/colorAccent"
             app:sdMainFabClosedSrc="@drawable/ic_menu_white_24dp"
             app:sdMainFabOpenedBackgroundColor="?attr/colorAccent"
diff --git a/src/main/res/layout/activity_rtp_session.xml b/src/main/res/layout/activity_rtp_session.xml
index 6587597ba9..0af72a372e 100644
--- a/src/main/res/layout/activity_rtp_session.xml
+++ b/src/main/res/layout/activity_rtp_session.xml
@@ -143,7 +143,7 @@
             android:alpha="0.7"
             android:src="@drawable/ic_mic_off_black_24dp"
             android:visibility="gone"
-            app:tint="?attr/icon_tint" />
+            app:tint="@color/white"  />
 
         <RelativeLayout
             android:id="@+id/button_row"
@@ -171,7 +171,6 @@
                     app:elevation="4dp"
                     app:fabCustomSize="72dp"
                     app:maxImageSize="36dp"
-                    app:tint="?attr/icon_tint"
                     tools:visibility="visible" />
 
                 <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -188,7 +187,6 @@
                     app:elevation="4dp"
                     app:fabCustomSize="72dp"
                     app:maxImageSize="36dp"
-                    app:tint="?attr/icon_tint"
                     tools:visibility="visible" />
 
             </RelativeLayout>
@@ -218,8 +216,7 @@
                 app:backgroundTint="@color/red700"
                 app:elevation="4dp"
                 app:fabCustomSize="72dp"
-                app:maxImageSize="36dp"
-                app:tint="?attr/icon_tint" />
+                app:maxImageSize="36dp" />
 
             <com.google.android.material.floatingactionbutton.FloatingActionButton
                 android:id="@+id/in_call_action_right"
diff --git a/src/main/res/layout/activity_set_settings.xml b/src/main/res/layout/activity_set_settings.xml
index 7098372037..5ba8b512e7 100644
--- a/src/main/res/layout/activity_set_settings.xml
+++ b/src/main/res/layout/activity_set_settings.xml
@@ -59,7 +59,7 @@
                                 android:background="?attr/selectableItemBackgroundBorderless"
                                 android:gravity="center_vertical"
                                 android:padding="@dimen/image_button_padding"
-                                android:src="?attr/icon_help" />
+                                android:src="?attr/icon_help_black" />
 
                             <androidx.appcompat.widget.AppCompatCheckBox
                                 android:id="@+id/forbid_screenshots"
@@ -90,7 +90,7 @@
                                 android:background="?attr/selectableItemBackgroundBorderless"
                                 android:gravity="center_vertical"
                                 android:padding="@dimen/image_button_padding"
-                                android:src="?attr/icon_help" />
+                                android:src="?attr/icon_help_black" />
 
                             <androidx.appcompat.widget.AppCompatCheckBox
                                 android:id="@+id/show_links"
@@ -120,7 +120,7 @@
                                 android:background="?attr/selectableItemBackgroundBorderless"
                                 android:gravity="center_vertical"
                                 android:padding="@dimen/image_button_padding"
-                                android:src="?attr/icon_help" />
+                                android:src="?attr/icon_help_black" />
 
                             <androidx.appcompat.widget.AppCompatCheckBox
                                 android:id="@+id/show_mappreview"
@@ -150,7 +150,7 @@
                                 android:background="?attr/selectableItemBackgroundBorderless"
                                 android:gravity="center_vertical"
                                 android:padding="@dimen/image_button_padding"
-                                android:src="?attr/icon_help" />
+                                android:src="?attr/icon_help_black" />
 
                             <androidx.appcompat.widget.AppCompatCheckBox
                                 android:id="@+id/chat_states"
@@ -180,7 +180,7 @@
                                 android:background="?attr/selectableItemBackgroundBorderless"
                                 android:gravity="center_vertical"
                                 android:padding="@dimen/image_button_padding"
-                                android:src="?attr/icon_help" />
+                                android:src="?attr/icon_help_black" />
 
                             <androidx.appcompat.widget.AppCompatCheckBox
                                 android:id="@+id/confirm_messages"
@@ -210,7 +210,7 @@
                                 android:background="?attr/selectableItemBackgroundBorderless"
                                 android:gravity="center_vertical"
                                 android:padding="@dimen/image_button_padding"
-                                android:src="?attr/icon_help" />
+                                android:src="?attr/icon_help_black" />
 
                             <androidx.appcompat.widget.AppCompatCheckBox
                                 android:id="@+id/last_seen"
@@ -240,7 +240,7 @@
                                 android:background="?attr/selectableItemBackgroundBorderless"
                                 android:gravity="center_vertical"
                                 android:padding="@dimen/image_button_padding"
-                                android:src="?attr/icon_help" />
+                                android:src="?attr/icon_help_black" />
 
                             <androidx.appcompat.widget.AppCompatCheckBox
                                 android:id="@+id/invidious"
diff --git a/src/main/res/layout/activity_show_locaction.xml b/src/main/res/layout/activity_show_locaction.xml
index d30f07bc21..02fe905863 100644
--- a/src/main/res/layout/activity_show_locaction.xml
+++ b/src/main/res/layout/activity_show_locaction.xml
@@ -31,7 +31,6 @@
         android:layout_alignParentBottom="true"
         android:layout_margin="16dp"
         android:src="@drawable/ic_navigation_white_24dp"
-        app:backgroundTint="?attr/colorAccent"
-        app:tint="?attr/icon_tint" />
+        app:backgroundTint="?attr/colorAccent" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_start_conversation.xml b/src/main/res/layout/activity_start_conversation.xml
index b06eab6d92..aa3176db35 100644
--- a/src/main/res/layout/activity_start_conversation.xml
+++ b/src/main/res/layout/activity_start_conversation.xml
@@ -36,8 +36,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_below="@id/tab_layout"
-            android:background="?attr/color_background_overlay"
-            app:tint="?attr/icon_tint" />
+            android:background="?attr/color_background_overlay" />
 
         <com.leinardi.android.speeddial.SpeedDialView
             android:id="@+id/speed_dial"
@@ -48,13 +47,10 @@
             android:layout_alignParentBottom="true"
             android:contentDescription="@string/add_contact_or_create_or_join_group_chat"
             app:sdMainFabClosedBackgroundColor="?attr/colorAccent"
-            app:sdMainFabClosedIconColor="?attr/icon_tint"
             app:sdMainFabClosedSrc="@drawable/ic_add_white_24dp"
             app:sdMainFabOpenedBackgroundColor="?attr/colorAccent"
-            app:sdMainFabOpenedIconColor="?attr/icon_tint"
             app:sdOverlayLayout="@id/overlay"
-            app:sdUseReverseAnimationOnClose="true"
-            app:tint="?attr/icon_tint" />
+            app:sdUseReverseAnimationOnClose="true" />
 
     </RelativeLayout>
 </layout>
\ No newline at end of file
diff --git a/src/main/res/layout/fragment_conversations_overview.xml b/src/main/res/layout/fragment_conversations_overview.xml
index daef65501b..aeb883b5c0 100644
--- a/src/main/res/layout/fragment_conversations_overview.xml
+++ b/src/main/res/layout/fragment_conversations_overview.xml
@@ -23,8 +23,7 @@
             android:layout_gravity="end|bottom"
             android:layout_margin="16dp"
             android:src="@drawable/ic_chat_white_24dp"
-            app:backgroundTint="?attr/colorAccent"
-            app:tint="?attr/icon_tint" />
+            app:backgroundTint="?attr/colorAccent" />
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </layout>
\ No newline at end of file
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 23c0b30910..f2f5d54692 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -91,6 +91,7 @@
     <attr name="icon_remove" format="reference" />
     <attr name="icon_search" format="reference" />
     <attr name="icon_help" format="reference" />
+    <attr name="icon_help_black" format="reference" />
     <attr name="icon_goto_chat" format="reference" />
     <attr name="icon_secure" format="reference" />
     <attr name="icon_settings" format="reference" />
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 9c303fb7c5..4cd9e456f6 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -41,7 +41,7 @@
         <item name="text_Color_Main">@color/realblack</item>
         <item name="button_text_color_disabled">@color/grey500</item>
         <item name="chat_bg">@drawable/bg_light_blue</item>
-        <item name="icon_tint">@color/realwhite</item>
+        <item name="icon_tint">@color/black54</item>
         <item name="color_background_primary">@color/grey50</item>
         <item name="color_background_secondary">@color/grey200</item>
         <item name="color_background_tertiary">@color/grey300</item>
@@ -130,7 +130,8 @@
         <item name="icon_refresh" type="reference">@drawable/ic_refresh_grey600_24dp</item>
         <item name="icon_remove" type="reference">@drawable/ic_delete_grey600_24dp</item>
         <item name="icon_search" type="reference">@drawable/ic_search_white_24dp</item>
-        <item name="icon_help" type="reference">@drawable/ic_help_black_24dp</item>
+        <item name="icon_help" type="reference">@drawable/ic_help_white_24dp</item>
+        <item name="icon_help_black" type="reference">@drawable/ic_help_black_24dp</item>
         <item name="icon_goto_chat" type="reference">@drawable/ic_question_answer_white_24dp</item>
         <item name="icon_secure" type="reference">@drawable/ic_lock_open_white_24dp</item>
         <item name="icon_settings" type="reference">@drawable/ic_settings_black_24dp</item>
@@ -320,6 +321,7 @@
         <item name="icon_remove" type="reference">@drawable/ic_delete_white_24dp</item>
         <item name="icon_search" type="reference">@drawable/ic_search_white_24dp</item>
         <item name="icon_help" type="reference">@drawable/ic_help_white_24dp</item>
+        <item name="icon_help_black" type="reference">@drawable/ic_help_white_24dp</item>
         <item name="icon_goto_chat" type="reference">@drawable/ic_question_answer_white_24dp</item>
         <item name="icon_secure" type="reference">@drawable/ic_lock_open_white_24dp</item>
         <item name="icon_settings" type="reference">@drawable/ic_settings_white_24dp</item>
@@ -363,7 +365,7 @@
     <style name="ConversationsTheme.Black" parent="ConversationsTheme.Dark">
         <item name="colorPrimary">@color/primary_black</item>
         <item name="colorPrimaryDark">@color/primary_dark_black</item>
-        <item name="color_background_primary">@color/primary_black</item>
+        <item name="color_background_primary">@color/darkblack</item>
         <item name="color_background_secondary">@color/primary_black</item>
         <item name="color_background_tertiary">@color/primary_black</item>
         <item name="color_bubble_light">@color/middleblack</item>
@@ -403,7 +405,7 @@
     <style name="ConversationsTheme.Black.Dialog" parent="ConversationsTheme.Dark.Dialog">
         <item name="colorPrimary">@color/primary_black</item>
         <item name="colorPrimaryDark">@color/primary_black</item>
-        <item name="color_background_primary">@color/primary_black</item>
+        <item name="color_background_primary">@color/darkblack</item>
     </style>
 
     <!-- blue dialog medium font -->