diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/ThemeBaseActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/ThemeBaseActivity.java
index 2b92ecd8..3fb52435 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/ThemeBaseActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/ThemeBaseActivity.java
@@ -51,7 +51,7 @@ public abstract class ThemeBaseActivity extends ActionBarActivity implements Kab
         ThemeSingleton.get().neutralColor = ThemeSingleton.get().positiveColor;
         ThemeSingleton.get().widgetColor = ThemeSingleton.get().positiveColor;
         // Dark theme
-        ThemeSingleton.get().darkTheme = PreferenceUtils.getInstance(this).getGeneralTheme() == 1;
+        ThemeSingleton.get().darkTheme = PreferenceUtils.getInstance(this).getGeneralTheme() == R.style.Theme_MaterialMusic;
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             // Sets color of entry in the system recents page
diff --git a/app/src/main/res/drawable-hdpi/ic_play_circle_fill_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_play_circle_fill_white_24dp.png
new file mode 100644
index 00000000..1fb6dbaa
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_play_circle_fill_white_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_play_circle_outline_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_play_circle_outline_white_24dp.png
deleted file mode 100644
index 0a801fce..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_play_circle_outline_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_play_circle_fill_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_play_circle_fill_white_24dp.png
new file mode 100644
index 00000000..b8b28474
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_play_circle_fill_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_play_circle_outline_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_play_circle_outline_white_24dp.png
deleted file mode 100644
index 1d1ab66d..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_play_circle_outline_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_play_circle_fill_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_play_circle_fill_white_24dp.png
new file mode 100644
index 00000000..475274e8
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_play_circle_fill_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_play_circle_outline_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_play_circle_outline_white_24dp.png
deleted file mode 100644
index f59c45e9..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_play_circle_outline_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_play_circle_fill_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_play_circle_fill_white_24dp.png
new file mode 100644
index 00000000..2e4df6eb
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_play_circle_fill_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_play_circle_outline_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_play_circle_outline_white_24dp.png
deleted file mode 100644
index 00de7883..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_play_circle_outline_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_play_circle_fill_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_play_circle_fill_white_24dp.png
new file mode 100644
index 00000000..6d1eca46
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_play_circle_fill_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_play_circle_outline_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_play_circle_outline_white_24dp.png
deleted file mode 100644
index 81fc753c..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_play_circle_outline_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/menu/menu_album_detail.xml b/app/src/main/res/menu/menu_album_detail.xml
index 93f072cd..15589f65 100644
--- a/app/src/main/res/menu/menu_album_detail.xml
+++ b/app/src/main/res/menu/menu_album_detail.xml
@@ -5,7 +5,7 @@
 
     <item
         android:id="@+id/action_current_playing"
-        android:icon="@drawable/ic_play_circle_outline_white_24dp"
+        android:icon="@drawable/ic_play_circle_fill_white_24dp"
         android:title="@string/action_current_playing"
         app:showAsAction="ifRoom"/>
 
diff --git a/app/src/main/res/menu/menu_albums.xml b/app/src/main/res/menu/menu_albums.xml
index e80af180..6dc19722 100644
--- a/app/src/main/res/menu/menu_albums.xml
+++ b/app/src/main/res/menu/menu_albums.xml
@@ -5,7 +5,7 @@
 
     <item
         android:id="@+id/action_current_playing"
-        android:icon="@drawable/ic_play_circle_outline_white_24dp"
+        android:icon="@drawable/ic_play_circle_fill_white_24dp"
         android:title="@string/action_current_playing"
         app:showAsAction="always" />
 
diff --git a/app/src/main/res/menu/menu_artist_detail.xml b/app/src/main/res/menu/menu_artist_detail.xml
index 7e622505..c5b84e93 100644
--- a/app/src/main/res/menu/menu_artist_detail.xml
+++ b/app/src/main/res/menu/menu_artist_detail.xml
@@ -5,7 +5,7 @@
 
     <item
         android:id="@+id/action_current_playing"
-        android:icon="@drawable/ic_play_circle_outline_white_24dp"
+        android:icon="@drawable/ic_play_circle_fill_white_24dp"
         android:title="@string/action_current_playing"
         app:showAsAction="ifRoom"/>
 
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index d36d0752..a2bec3be 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -5,7 +5,7 @@
 
     <item
         android:id="@+id/action_current_playing"
-        android:icon="@drawable/ic_play_circle_outline_white_24dp"
+        android:icon="@drawable/ic_play_circle_fill_white_24dp"
         android:title="@string/action_current_playing"
         app:showAsAction="always"/>
 
diff --git a/app/src/main/res/menu/menu_playlist_detail.xml b/app/src/main/res/menu/menu_playlist_detail.xml
index a3e93c2e..21929e7c 100644
--- a/app/src/main/res/menu/menu_playlist_detail.xml
+++ b/app/src/main/res/menu/menu_playlist_detail.xml
@@ -5,7 +5,7 @@
 
     <item
         android:id="@+id/action_current_playing"
-        android:icon="@drawable/ic_play_circle_outline_white_24dp"
+        android:icon="@drawable/ic_play_circle_fill_white_24dp"
         android:title="@string/action_current_playing"
         app:showAsAction="ifRoom" />
 
diff --git a/app/src/main/res/menu/menu_playlists.xml b/app/src/main/res/menu/menu_playlists.xml
index 8edb8b0d..9c0be2d2 100644
--- a/app/src/main/res/menu/menu_playlists.xml
+++ b/app/src/main/res/menu/menu_playlists.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/action_current_playing"
-        android:icon="@drawable/ic_play_circle_outline_white_24dp"
+        android:icon="@drawable/ic_play_circle_fill_white_24dp"
         android:title="@string/action_current_playing"
         app:showAsAction="always" />