diff --git a/app/src/main/assets/changelog.html b/app/src/main/assets/changelog.html
index 6ebabf19..253bfc86 100644
--- a/app/src/main/assets/changelog.html
+++ b/app/src/main/assets/changelog.html
@@ -29,6 +29,7 @@
 
 <ol>
     <li><b>FIX:</b> Wrong alignment of prev/next buttons on devices below Lollipop.</li>
+    <li><b>FIX:</b> White playlist icon in the navigation drawer on Android Marshmallow.</li>
 </ol>
 
 <h3>Version 0.9.47 beta 1</h3>
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/PlayerFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/PlayerFragment.java
index 79854512..b157f50e 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/PlayerFragment.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/PlayerFragment.java
@@ -164,7 +164,6 @@ public class PlayerFragment extends Fragment implements SharedPreferences.OnShar
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         initAppearanceVarsFromSharedPrefs();
-        PreferenceUtil.getInstance(getContext()).registerOnSharedPreferenceChangedListener(this);
         progressViewUpdateHelper = new MusicProgressViewUpdateHelper(this);
     }
 
@@ -188,6 +187,7 @@ public class PlayerFragment extends Fragment implements SharedPreferences.OnShar
         setUpPlayerToolbar();
         setUpPlayerStatusBarElevation();
 
+        PreferenceUtil.getInstance(getContext()).registerOnSharedPreferenceChangedListener(this);
         activity.addMusicServiceEventListener(this);
     }
 
@@ -195,14 +195,8 @@ public class PlayerFragment extends Fragment implements SharedPreferences.OnShar
     public void onDestroyView() {
         super.onDestroyView();
         activity.removeMusicServiceEventListener(this);
-        ButterKnife.unbind(this);
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        activity.removeMusicServiceEventListener(this);
         PreferenceUtil.getInstance(activity).unregisterOnSharedPreferenceChangedListener(this);
+        ButterKnife.unbind(this);
     }
 
     @Override
diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/ViewUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/ViewUtil.java
index 9bd6fd47..03720841 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/util/ViewUtil.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/util/ViewUtil.java
@@ -194,7 +194,7 @@ public class ViewUtil {
                 for (int i = 0; i < menu.size(); i++) {
                     MenuItem item = menu.getItem(i);
                     if (item.getIcon() != null) {
-                        item.getIcon().setColorFilter(color, PorterDuff.Mode.SRC_IN);
+                        item.getIcon().mutate().setColorFilter(color, PorterDuff.Mode.SRC_IN);
                     }
                 }