diff --git a/app/src/main/java/org/xbmc/kore/ui/hosts/EditHostActivity.java b/app/src/main/java/org/xbmc/kore/ui/hosts/EditHostActivity.java
index 288e098..91128d2 100644
--- a/app/src/main/java/org/xbmc/kore/ui/hosts/EditHostActivity.java
+++ b/app/src/main/java/org/xbmc/kore/ui/hosts/EditHostActivity.java
@@ -119,7 +119,7 @@ public class EditHostActivity extends BaseActivity implements
         if (actionBar != null) {
             actionBar.setTitle(R.string.edit_xbmc);
             TypedArray styledAttrs = getTheme().obtainStyledAttributes(new int[] {R.attr.iconHosts});
-            actionBar.setIcon(styledAttrs.getResourceId(styledAttrs.getIndex(0), R.drawable.ic_phonelink_white_24dp));
+            actionBar.setIcon(styledAttrs.getResourceId(styledAttrs.getIndex(0), R.drawable.ic_devices_white_24dp));
             styledAttrs.recycle();
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
diff --git a/app/src/main/res/drawable-xhdpi/ic_extension_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_extension_black_24dp.png
deleted file mode 100644
index 622595b..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_extension_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_extension_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_extension_white_24dp.png
deleted file mode 100644
index dcb9a83..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_extension_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_folder_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_folder_black_24dp.png
deleted file mode 100644
index c9423a1..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_folder_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_folder_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_folder_white_24dp.png
deleted file mode 100644
index e5f54ce..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_folder_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_games_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_games_black_24dp.png
deleted file mode 100644
index 1aa3192..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_games_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_games_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_games_white_24dp.png
deleted file mode 100644
index 3cf4cbf..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_games_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_headset_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_headset_black_24dp.png
deleted file mode 100644
index ed4b3f0..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_headset_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_headset_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_headset_white_24dp.png
deleted file mode 100644
index a5defe3..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_headset_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_home_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_home_black_24dp.png
deleted file mode 100644
index 9022de4..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_home_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_home_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_home_white_24dp.png
deleted file mode 100644
index d00f914..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_home_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_image_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_image_black_24dp.png
deleted file mode 100644
index bdc5db0..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_image_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_image_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_image_white_24dp.png
deleted file mode 100644
index bf56761..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_image_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_movie_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_movie_black_24dp.png
deleted file mode 100644
index ac344ba..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_movie_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_movie_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_movie_white_24dp.png
deleted file mode 100644
index 3098fd9..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_movie_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_phonelink_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_phonelink_black_24dp.png
deleted file mode 100644
index c9969cc..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_phonelink_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_phonelink_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_phonelink_white_24dp.png
deleted file mode 100644
index 813fe44..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_phonelink_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png
deleted file mode 100644
index 1879dfc..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png
deleted file mode 100644
index 12e5d10..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_tv_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_tv_black_24dp.png
deleted file mode 100644
index f0df6fc..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_tv_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_tv_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_tv_white_24dp.png
deleted file mode 100644
index 737315f..0000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_tv_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_extension_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_extension_black_24dp.png
deleted file mode 100644
index c91c290..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_extension_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_extension_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_extension_white_24dp.png
deleted file mode 100644
index 8c3bc3b..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_extension_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_folder_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_folder_black_24dp.png
deleted file mode 100644
index 4011f39..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_folder_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_folder_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_folder_white_24dp.png
deleted file mode 100644
index 0d1ac48..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_folder_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_games_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_games_black_24dp.png
deleted file mode 100644
index a86b1a8..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_games_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_games_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_games_white_24dp.png
deleted file mode 100644
index f9ce49d..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_games_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_headset_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_headset_black_24dp.png
deleted file mode 100644
index d11a6e0..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_headset_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_headset_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_headset_white_24dp.png
deleted file mode 100644
index 4080871..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_headset_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_home_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_home_black_24dp.png
deleted file mode 100644
index 5db255a..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_home_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_home_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_home_white_24dp.png
deleted file mode 100644
index fd40ac3..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_home_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_image_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_image_black_24dp.png
deleted file mode 100644
index 5500a21..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_image_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_image_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_image_white_24dp.png
deleted file mode 100644
index d120024..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_image_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_movie_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_movie_black_24dp.png
deleted file mode 100644
index 071d706..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_movie_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_movie_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_movie_white_24dp.png
deleted file mode 100644
index 373585e..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_movie_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_phonelink_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_phonelink_black_24dp.png
deleted file mode 100644
index 8ba698b..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_phonelink_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_phonelink_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_phonelink_white_24dp.png
deleted file mode 100644
index d81a496..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_phonelink_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png
deleted file mode 100644
index c835cc6..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png
deleted file mode 100644
index 6bb8f6e..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_tv_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_tv_black_24dp.png
deleted file mode 100644
index 78cb122..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_tv_black_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_tv_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_tv_white_24dp.png
deleted file mode 100644
index daa6a05..0000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_tv_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_devices_white_24dp.xml b/app/src/main/res/drawable/ic_devices_white_24dp.xml
new file mode 100644
index 0000000..dde2b6a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_devices_white_24dp.xml
@@ -0,0 +1,9 @@
+<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="#FFFFFFFF"
+        android:pathData="M4,6h18L22,4L4,4c-1.1,0 -2,0.9 -2,2v11L0,17v3h14v-3L4,17L4,6zM23,8h-6c-0.55,0 -1,0.45 -1,1v10c0,0.55 0.45,1 1,1h6c0.55,0 1,-0.45 1,-1L24,9c0,-0.55 -0.45,-1 -1,-1zM22,17h-4v-7h4v7z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_extension_white_24dp.xml b/app/src/main/res/drawable/ic_extension_white_24dp.xml
new file mode 100644
index 0000000..c7c624b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_extension_white_24dp.xml
@@ -0,0 +1,9 @@
+<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="#FFFFFFFF"
+        android:pathData="M20.5,11H19V7c0,-1.1 -0.9,-2 -2,-2h-4V3.5C13,2.12 11.88,1 10.5,1S8,2.12 8,3.5V5H4c-1.1,0 -1.99,0.9 -1.99,2v3.8H3.5c1.49,0 2.7,1.21 2.7,2.7s-1.21,2.7 -2.7,2.7H2V20c0,1.1 0.9,2 2,2h3.8v-1.5c0,-1.49 1.21,-2.7 2.7,-2.7 1.49,0 2.7,1.21 2.7,2.7V22H17c1.1,0 2,-0.9 2,-2v-4h1.5c1.38,0 2.5,-1.12 2.5,-2.5S21.88,11 20.5,11z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_folder_white_24dp.xml b/app/src/main/res/drawable/ic_folder_white_24dp.xml
new file mode 100644
index 0000000..504d3c6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_folder_white_24dp.xml
@@ -0,0 +1,9 @@
+<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="#FFFFFFFF"
+        android:pathData="M10,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,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_games_white_24dp.xml b/app/src/main/res/drawable/ic_games_white_24dp.xml
new file mode 100644
index 0000000..804381e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_games_white_24dp.xml
@@ -0,0 +1,9 @@
+<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="#FFFFFFFF"
+        android:pathData="M15,7.5V2H9v5.5l3,3 3,-3zM7.5,9H2v6h5.5l3,-3 -3,-3zM9,16.5V22h6v-5.5l-3,-3 -3,3zM16.5,9l-3,3 3,3H22V9h-5.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_headset_grey_24dp.xml b/app/src/main/res/drawable/ic_headset_grey_24dp.xml
new file mode 100644
index 0000000..2e3aa86
--- /dev/null
+++ b/app/src/main/res/drawable/ic_headset_grey_24dp.xml
@@ -0,0 +1,9 @@
+<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_headset_white_24dp.xml b/app/src/main/res/drawable/ic_headset_white_24dp.xml
new file mode 100644
index 0000000..1796884
--- /dev/null
+++ b/app/src/main/res/drawable/ic_headset_white_24dp.xml
@@ -0,0 +1,9 @@
+<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="#FFFFFFFF"
+        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
new file mode 100644
index 0000000..f8ee71d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_home_grey_24dp.xml
@@ -0,0 +1,9 @@
+<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_home_white_24dp.xml b/app/src/main/res/drawable/ic_home_white_24dp.xml
new file mode 100644
index 0000000..8a3ea7c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_home_white_24dp.xml
@@ -0,0 +1,9 @@
+<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="#FFFFFFFF"
+        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
new file mode 100644
index 0000000..a302db8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_image_grey_24dp.xml
@@ -0,0 +1,9 @@
+<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
new file mode 100644
index 0000000..a446b6e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_image_white_24dp.xml
@@ -0,0 +1,9 @@
+<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="#8aFFFFFF"
+        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
new file mode 100644
index 0000000..b728039
--- /dev/null
+++ b/app/src/main/res/drawable/ic_movie_grey_24dp.xml
@@ -0,0 +1,9 @@
+<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_movie_white_24dp.xml b/app/src/main/res/drawable/ic_movie_white_24dp.xml
new file mode 100644
index 0000000..ca8cbb1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_movie_white_24dp.xml
@@ -0,0 +1,9 @@
+<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="#FFFFFFFF"
+        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_settings_white_24dp.xml b/app/src/main/res/drawable/ic_settings_white_24dp.xml
new file mode 100644
index 0000000..ce997a7
--- /dev/null
+++ b/app/src/main/res/drawable/ic_settings_white_24dp.xml
@@ -0,0 +1,9 @@
+<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="#FFFFFFFF"
+        android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
+</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
new file mode 100644
index 0000000..068996a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_tv_grey_24dp.xml
@@ -0,0 +1,9 @@
+<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/drawable/ic_tv_white_24dp.xml b/app/src/main/res/drawable/ic_tv_white_24dp.xml
new file mode 100644
index 0000000..1d5a84d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_tv_white_24dp.xml
@@ -0,0 +1,9 @@
+<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="#FFFFFFFF"
+        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/values/themes.xml b/app/src/main/res/values/themes.xml
index 97ac643..24738cb 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -86,7 +86,7 @@
         <item name="iconDown">@drawable/remote_down_white</item>
         <item name="iconSelect">@drawable/remote_select_white</item>
 
-		<item name="iconHosts">@drawable/ic_phonelink_white_24dp</item>
+		<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_white_24dp</item>
@@ -213,16 +213,16 @@
         <!--<item name="iconDown">@drawable/remote_down_black</item>-->
         <!--<item name="iconSelect">@drawable/remote_select_black</item>-->
 
-        <item name="iconHosts">@drawable/ic_phonelink_black_24dp</item>
-        <item name="iconRemote">@drawable/ic_games_black_24dp</item>
+        <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_black_24dp</item>
-        <item name="iconTvShows">@drawable/ic_tv_black_24dp</item>
-        <item name="iconMusic">@drawable/ic_headset_black_24dp</item>
-        <item name="iconPicture">@drawable/ic_image_black_24dp</item>
-        <item name="iconHome">@drawable/ic_home_black_24dp</item>
-        <item name="iconAddons">@drawable/ic_extension_black_24dp</item>
-        <item name="iconFiles">@drawable/ic_folder_black_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="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="iconNew">@drawable/ic_add_box_black_24dp</item>
@@ -231,7 +231,7 @@
         <item name="iconOnOffToolbar">@drawable/ic_settings_power_white_24dp</item>
         <item name="iconKeyboard">@drawable/ic_keyboard_black_24dp</item>
 
-        <item name="iconSettings">@drawable/ic_settings_black_24dp</item>
+        <item name="iconSettings">@drawable/ic_settings_white_24dp</item>
 
         <item name="iconPlay">@drawable/ic_play_arrow_black_24dp</item>
         <item name="iconPause">@drawable/ic_pause_black_24dp</item>