diff --git a/app/src/main/res/menu/menu_feedback.xml b/app/src/main/res/menu/menu_feedback.xml
index 16f90d2b..9135adc2 100644
--- a/app/src/main/res/menu/menu_feedback.xml
+++ b/app/src/main/res/menu/menu_feedback.xml
@@ -4,31 +4,43 @@
     <item
         android:id="@+id/view_in_google_play"
         android:icon="@drawable/ic_play_store_tinted"
+        android:iconTint="?attr/colorOnSurface"
         android:title="@string/view_in_google_play"
+        app:iconTint="?attr/colorOnSurface"
         app:showAsAction="never" />
     <item
         android:id="@+id/version_info"
         android:icon="@drawable/ic_perm_device_information"
+        android:iconTint="?attr/colorOnSurface"
         android:title="@string/version_info"
+        app:iconTint="?attr/colorOnSurface"
         app:showAsAction="never" />
     <item
         android:id="@+id/beta_program"
         android:icon="@drawable/ic_tips_and_updates"
+        android:iconTint="?attr/colorOnSurface"
         android:title="@string/beta_program"
+        app:iconTint="?attr/colorOnSurface"
         app:showAsAction="never" />
     <item
         android:id="@+id/terms_of_service"
         android:icon="@drawable/ic_terms_of_service"
+        android:iconTint="?attr/colorOnSurface"
         android:title="@string/terms_of_service"
+        app:iconTint="?attr/colorOnSurface"
         app:showAsAction="never" />
     <item
         android:id="@+id/privacy_policy"
         android:icon="@drawable/ic_privacy_policy"
+        android:iconTint="?attr/colorOnSurface"
         android:title="@string/privacy_policy"
+        app:iconTint="?attr/colorOnSurface"
         app:showAsAction="never" />
     <item
         android:id="@+id/oss"
         android:icon="@drawable/ic_license"
+        android:iconTint="?attr/colorOnSurface"
         android:title="@string/open_source_licenses"
+        app:iconTint="?attr/colorOnSurface"
         app:showAsAction="never" />
-</menu>
\ No newline at end of file
+</menu>
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index d6008a80..2b6b4a9b 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/support"
         android:icon="@drawable/ic_support"
-        android:title="@string/support_us" />
-</menu>
\ No newline at end of file
+        android:iconTint="?attr/colorOnSurface"
+        android:title="@string/support_us"
+        app:iconTint="?attr/colorOnSurface" />
+</menu>
diff --git a/app/src/main/res/menu/menu_share.xml b/app/src/main/res/menu/menu_share.xml
index 4b16c4c4..fdf017f0 100644
--- a/app/src/main/res/menu/menu_share.xml
+++ b/app/src/main/res/menu/menu_share.xml
@@ -4,6 +4,8 @@
     <item
         android:id="@+id/action_share"
         android:icon="@drawable/ic_share"
+        android:iconTint="?attr/colorOnSurface"
         android:title="@string/share"
+        app:iconTint="?attr/colorOnSurface"
         app:showAsAction="ifRoom" />
 </menu>