diff --git a/app/build.gradle b/app/build.gradle
index 6bd14c18..62ce08bc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,8 +23,8 @@ android {
         applicationId "com.kabouzeid.gramophone"
         minSdkVersion 16
         targetSdkVersion 22
-        versionCode 6
-        versionName "0.9.3.1b"
+        versionCode 7
+        versionName "0.9.4b"
     }
 
     compileOptions {
diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java
index 2fb1c2c7..8a71f892 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java
@@ -1,8 +1,10 @@
 package com.kabouzeid.gramophone.adapter;
 
 import android.app.Activity;
+import android.graphics.Color;
 import android.support.v4.util.Pair;
 import android.support.v7.widget.RecyclerView;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -62,14 +64,11 @@ public class PlaylistAdapter extends RecyclerView.Adapter<PlaylistAdapter.ViewHo
     public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
         public TextView playlistName;
         private ImageView menu;
-        private ImageView playlistIcon;
 
         public ViewHolder(View itemView) {
             super(itemView);
             playlistName = (TextView) itemView.findViewById(R.id.playlist_name);
             menu = (ImageView) itemView.findViewById(R.id.menu);
-            playlistIcon = (ImageView) itemView.findViewById(R.id.playlist_icon);
-            playlistIcon.setImageDrawable(Util.getTintedDrawable(activity.getResources(), R.drawable.ic_queue_music_white_24dp, Util.resolveColor(activity, R.attr.themed_drawable_color)));
             itemView.setOnClickListener(this);
             menu.setOnClickListener(new View.OnClickListener() {
                 @Override
diff --git a/app/src/main/res/layout/activity_playlist_detail.xml b/app/src/main/res/layout/activity_playlist_detail.xml
index 6fbdc692..eb3dc367 100644
--- a/app/src/main/res/layout/activity_playlist_detail.xml
+++ b/app/src/main/res/layout/activity_playlist_detail.xml
@@ -1,6 +1,5 @@
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -11,11 +10,8 @@
 
         <android.support.v7.widget.Toolbar
             android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?colorPrimary"
-            app:elevation="@dimen/toolbar_elevation"
-            app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"/>
+            style="@style/Toolbar"
+            android:background="?colorPrimary"/>
 
         <android.support.v7.widget.RecyclerView
             android:id="@+id/recycler_view"
diff --git a/app/src/main/res/layout/item_list_playlist.xml b/app/src/main/res/layout/item_list_playlist.xml
index 4b9f89eb..6868eb24 100644
--- a/app/src/main/res/layout/item_list_playlist.xml
+++ b/app/src/main/res/layout/item_list_playlist.xml
@@ -8,11 +8,11 @@
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-
         android:orientation="horizontal"
         android:paddingLeft="16dp">
 
         <ImageView
+            android:tint="?themed_drawable_color"
             android:id="@+id/playlist_icon"
             android:layout_width="40dp"
             android:layout_height="40dp"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 4ba94700..2b2af6b1 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -46,7 +46,7 @@
     <style name="Toolbar">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">?attr/actionBarSize</item>
-        <item name="android:theme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
+        <item name="theme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
         <item name="android:minHeight">@dimen/abc_action_bar_default_height_material</item>
         <item name="popupTheme">?toolbarPopupTheme</item>
         <item name="elevation">@dimen/toolbar_elevation</item>