diff --git a/smali/res/drawable/ic_close_theme_tinted.xml b/smali/res/drawable/ic_close_theme_tinted.xml
index ab669b488..898482288 100644
--- a/smali/res/drawable/ic_close_theme_tinted.xml
+++ b/smali/res/drawable/ic_close_theme_tinted.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <bitmap android:src="@drawable/ic_cancel_24"
-    android:tint="?im_app_icon_toolbar"
+    android:tint="?header_text"
     xmlns:android="http://schemas.android.com/apk/res/android" />
\ No newline at end of file
diff --git a/smali/res/drawable/ic_done_theme_tinted.xml b/smali/res/drawable/ic_done_theme_tinted.xml
index 330e65af3..8e3fbb704 100644
--- a/smali/res/drawable/ic_done_theme_tinted.xml
+++ b/smali/res/drawable/ic_done_theme_tinted.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false">
-        <bitmap android:src="@drawable/ic_done_24" android:tint="?im_app_icon_toolbar" android:alpha="0.5" />
+        <bitmap android:src="@drawable/ic_done_24" android:tint="?header_text" android:alpha="0.5" />
     </item>
     <item android:state_enabled="true">
-        <bitmap android:src="@drawable/ic_done_24" android:tint="?im_app_icon_toolbar" />
+        <bitmap android:src="@drawable/ic_done_24" android:tint="?header_text" />
     </item>
 </selector>
\ No newline at end of file
diff --git a/smali/res/drawable/ic_phone_outline_28_disabled_theme_tinted.xml b/smali/res/drawable/ic_phone_outline_28_disabled_theme_tinted.xml
index 095f41a3c..eef45f185 100644
--- a/smali/res/drawable/ic_phone_outline_28_disabled_theme_tinted.xml
+++ b/smali/res/drawable/ic_phone_outline_28_disabled_theme_tinted.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <bitmap android:src="@drawable/ic_phone_outline_28"
-    android:tint="?im_app_icon_toolbar"
+    android:tint="?header_text"
     android:alpha="0.4"
     xmlns:android="http://schemas.android.com/apk/res/android" />
\ No newline at end of file
diff --git a/smali/res/drawable/ic_phone_outline_28_theme_tinted.xml b/smali/res/drawable/ic_phone_outline_28_theme_tinted.xml
index 9a391f893..b5332bb97 100644
--- a/smali/res/drawable/ic_phone_outline_28_theme_tinted.xml
+++ b/smali/res/drawable/ic_phone_outline_28_theme_tinted.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <bitmap android:src="@drawable/ic_phone_outline_28"
-    android:tint="?im_app_icon_toolbar"
+    android:tint="?header_text"
     xmlns:android="http://schemas.android.com/apk/res/android" />
\ No newline at end of file
diff --git a/smali/res/drawable/ic_search_theme_tinted.xml b/smali/res/drawable/ic_search_theme_tinted.xml
index 437758a9e..9e9975e57 100644
--- a/smali/res/drawable/ic_search_theme_tinted.xml
+++ b/smali/res/drawable/ic_search_theme_tinted.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <bitmap android:src="@drawable/ic_search_24"
-    android:tint="?im_app_icon_toolbar"
+    android:tint="?header_text"
     xmlns:android="http://schemas.android.com/apk/res/android" />
\ No newline at end of file
diff --git a/smali/res/drawable/vkim_ic_back_theme_tinted.xml b/smali/res/drawable/vkim_ic_back_theme_tinted.xml
index 1fcdf7c23..bbb94600a 100644
--- a/smali/res/drawable/vkim_ic_back_theme_tinted.xml
+++ b/smali/res/drawable/vkim_ic_back_theme_tinted.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <bitmap android:src="@drawable/ic_back_24"
-    android:tint="?im_app_icon_toolbar"
+    android:tint="?header_text"
     xmlns:android="http://schemas.android.com/apk/res/android" />
\ No newline at end of file
diff --git a/smali/res/drawable/vkim_ic_cancel_theme_tinted.xml b/smali/res/drawable/vkim_ic_cancel_theme_tinted.xml
index ab669b488..898482288 100644
--- a/smali/res/drawable/vkim_ic_cancel_theme_tinted.xml
+++ b/smali/res/drawable/vkim_ic_cancel_theme_tinted.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <bitmap android:src="@drawable/ic_cancel_24"
-    android:tint="?im_app_icon_toolbar"
+    android:tint="?header_text"
     xmlns:android="http://schemas.android.com/apk/res/android" />
\ No newline at end of file
diff --git a/smali/res/menu/vkim_dialog_header_actions.xml b/smali/res/menu/vkim_dialog_header_actions.xml
index c61a2ed79..95445d6cf 100644
--- a/smali/res/menu/vkim_dialog_header_actions.xml
+++ b/smali/res/menu/vkim_dialog_header_actions.xml
@@ -6,29 +6,29 @@
         android:id="@id/action_reply"
         android:title="@string/vkim_msg_action_reply"
         android:showAsAction="always"
-        app:iconTint="?im_app_icon_toolbar" />
+        app:iconTint="?header_text" />
     <item
         android:icon="@drawable/vkim_ic_msg_delete"
         android:id="@id/action_delete"
         android:title="@string/vkim_msg_action_delete"
         android:showAsAction="always"
-        app:iconTint="?im_app_icon_toolbar" />
+        app:iconTint="?header_text" />
     <item
         android:icon="@drawable/vkim_ic_msg_forward"
         android:id="@id/action_forward"
         android:title="@string/vkim_msg_action_forward"
         android:showAsAction="always"
-        app:iconTint="?im_app_icon_toolbar" />
+        app:iconTint="?header_text" />
     <item
         android:icon="@drawable/vkim_ic_msg_copy"
         android:id="@id/action_copy"
         android:title="@string/vkim_msg_action_copy"
         android:showAsAction="always"
-        app:iconTint="?im_app_icon_toolbar" />
+        app:iconTint="?header_text" />
     <item
         android:icon="@drawable/vkim_ic_msg_spam_24dp"
         android:id="@id/action_spam"
         android:title="@string/vkim_msg_action_spam"
         android:showAsAction="always"
-        app:iconTint="?im_app_icon_toolbar" />
+        app:iconTint="?header_text" />
 </menu>
\ No newline at end of file