diff --git a/app/src/main/res/drawable/ic_dvr_24dp.xml b/app/src/main/res/drawable/ic_dvr_white_24dp.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_dvr_24dp.xml
rename to app/src/main/res/drawable/ic_dvr_white_24dp.xml
diff --git a/app/src/main/res/drawable/ic_headset_grey_24dp.xml b/app/src/main/res/drawable/ic_headset_grey_24dp.xml
deleted file mode 100644
index 2e3aa86..0000000
--- a/app/src/main/res/drawable/ic_headset_grey_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#8a000000"
-        android:pathData="M12,1c-4.97,0 -9,4.03 -9,9v7c0,1.66 1.34,3 3,3h3v-8H5v-2c0,-3.87 3.13,-7 7,-7s7,3.13 7,7v2h-4v8h3c1.66,0 3,-1.34 3,-3v-7c0,-4.97 -4.03,-9 -9,-9z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_home_grey_24dp.xml b/app/src/main/res/drawable/ic_home_grey_24dp.xml
deleted file mode 100644
index f8ee71d..0000000
--- a/app/src/main/res/drawable/ic_home_grey_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#8a000000"
-        android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_image_grey_24dp.xml b/app/src/main/res/drawable/ic_image_grey_24dp.xml
deleted file mode 100644
index a302db8..0000000
--- a/app/src/main/res/drawable/ic_image_grey_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#8a000000"
-        android:pathData="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_image_white_24dp.xml b/app/src/main/res/drawable/ic_image_white_24dp.xml
index a446b6e..0b56f71 100644
--- a/app/src/main/res/drawable/ic_image_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_image_white_24dp.xml
@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#8aFFFFFF"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_movie_grey_24dp.xml b/app/src/main/res/drawable/ic_movie_grey_24dp.xml
deleted file mode 100644
index b728039..0000000
--- a/app/src/main/res/drawable/ic_movie_grey_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#8a000000"
-        android:pathData="M18,4l2,4h-3l-2,-4h-2l2,4h-3l-2,-4H8l2,4H7L5,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V4h-4z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_tv_grey_24dp.xml b/app/src/main/res/drawable/ic_tv_grey_24dp.xml
deleted file mode 100644
index 068996a..0000000
--- a/app/src/main/res/drawable/ic_tv_grey_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#8a000000"
-        android:pathData="M21,3L3,3c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h5v2h8v-2h5c1.1,0 1.99,-0.9 1.99,-2L23,5c0,-1.1 -0.9,-2 -2,-2zM21,17L3,17L3,5h18v12z"/>
-</vector>
diff --git a/app/src/main/res/layout/fragment_remote.xml b/app/src/main/res/layout/fragment_remote.xml
index 2b55203..1f20834 100644
--- a/app/src/main/res/layout/fragment_remote.xml
+++ b/app/src/main/res/layout/fragment_remote.xml
@@ -121,6 +121,7 @@
             android:layout_height="match_parent"
             style="@style/Widget.Button.Borderless"
             android:src="?attr/iconHome"
+            android:tint="?attr/defaultButtonColorFilter"
             android:contentDescription="@string/home"/>
         <ImageButton
             android:id="@+id/movies"
@@ -129,6 +130,7 @@
             android:layout_height="match_parent"
             style="@style/Widget.Button.Borderless"
             android:src="?attr/iconMovies"
+            android:tint="?attr/defaultButtonColorFilter"
             android:contentDescription="@string/movies"/>
         <ImageButton
             android:id="@+id/tv_shows"
@@ -137,6 +139,7 @@
             android:layout_height="match_parent"
             style="@style/Widget.Button.Borderless"
             android:src="?attr/iconTvShows"
+            android:tint="?attr/defaultButtonColorFilter"
             android:contentDescription="@string/tv_shows"/>
         <ImageButton
             android:id="@+id/music"
@@ -145,6 +148,7 @@
             android:layout_height="match_parent"
             style="@style/Widget.Button.Borderless"
             android:src="?attr/iconMusic"
+            android:tint="?attr/defaultButtonColorFilter"
             android:contentDescription="@string/music"/>
         <ImageButton
             android:id="@+id/pictures"
@@ -153,6 +157,7 @@
             android:layout_height="match_parent"
             style="@style/Widget.Button.Borderless"
             android:src="?attr/iconPicture"
+            android:tint="?attr/defaultButtonColorFilter"
             android:contentDescription="@string/pictures"/>
     </LinearLayout>
 
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 24738cb..523f544 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -96,7 +96,7 @@
         <item name="iconHome">@drawable/ic_home_white_24dp</item>
         <item name="iconAddons">@drawable/ic_extension_white_24dp</item>
         <item name="iconFiles">@drawable/ic_folder_white_24dp</item>
-        <item name="iconPVR">@drawable/ic_dvr_24dp</item>
+        <item name="iconPVR">@drawable/ic_dvr_white_24dp</item>
 
         <item name="iconNew">@drawable/ic_add_box_white_24dp</item>
         <item name="iconNewToolbar">@drawable/ic_add_box_white_24dp</item>
@@ -216,14 +216,14 @@
         <item name="iconHosts">@drawable/ic_devices_white_24dp</item>
         <item name="iconRemote">@drawable/ic_games_white_24dp</item>
         <item name="iconRemoteToolbar">@drawable/ic_games_white_24dp</item>
-        <item name="iconMovies">@drawable/ic_movie_grey_24dp</item>
-        <item name="iconTvShows">@drawable/ic_tv_grey_24dp</item>
-        <item name="iconMusic">@drawable/ic_headset_grey_24dp</item>
-        <item name="iconPicture">@drawable/ic_image_grey_24dp</item>
-        <item name="iconHome">@drawable/ic_home_grey_24dp</item>
+        <item name="iconMovies">@drawable/ic_movie_white_24dp</item>
+        <item name="iconTvShows">@drawable/ic_tv_white_24dp</item>
+        <item name="iconMusic">@drawable/ic_headset_white_24dp</item>
+        <item name="iconPicture">@drawable/ic_image_white_24dp</item>
+        <item name="iconHome">@drawable/ic_home_white_24dp</item>
         <item name="iconAddons">@drawable/ic_extension_white_24dp</item>
         <item name="iconFiles">@drawable/ic_folder_white_24dp</item>
-        <item name="iconPVR">@drawable/ic_dvr_24dp</item>
+        <item name="iconPVR">@drawable/ic_dvr_white_24dp</item>
 
         <item name="iconNew">@drawable/ic_add_box_black_24dp</item>
         <item name="iconNewToolbar">@drawable/ic_add_box_white_24dp</item>