diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/GenreDetailsActivity.kt b/app/src/main/java/code/name/monkey/retromusic/ui/activities/GenreDetailsActivity.kt
index 2f6a8da9..34682418 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/GenreDetailsActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/GenreDetailsActivity.kt
@@ -1,5 +1,6 @@
 package code.name.monkey.retromusic.ui.activities
 
+import android.graphics.Color
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
@@ -8,6 +9,7 @@ import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.appthemehelper.ThemeStore
+import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
@@ -45,13 +47,12 @@ class GenreDetailsActivity : AbsSlidingMusicPanelActivity(), GenreDetailsContrac
         super.onCreate(savedInstanceState)
 
 
-        setStatusbarColorAuto()
+        setStatusbarColor(Color.TRANSPARENT)
         setNavigationbarColorAuto()
         setTaskDescriptionColorAuto()
-
-        toggleBottomNavigationView(true)
         setLightNavigationBar(true)
-
+        setLightStatusbar(ColorUtil.isColorLight(ThemeStore.primaryColor(this)))
+        toggleBottomNavigationView(true)
 
         genre = intent.extras!!.getParcelable(EXTRA_GENRE_ID)
         presenter = GenreDetailsPresenter(this, genre!!.id)
@@ -66,13 +67,15 @@ class GenreDetailsActivity : AbsSlidingMusicPanelActivity(), GenreDetailsContrac
         bannerTitle!!.setTextColor(ThemeStore.textColorPrimary(this))
 
         val primaryColor = ThemeStore.primaryColor(this)
-        toolbar.setNavigationIcon(R.drawable.ic_keyboard_backspace_black_24dp)
-        toolbar.setBackgroundColor(primaryColor)
         appBarLayout.setBackgroundColor(primaryColor)
-        ToolbarContentTintHelper.colorBackButton(toolbar!!, ThemeStore.accentColor(this))
+        toolbar.apply {
+            setNavigationIcon(R.drawable.ic_keyboard_backspace_black_24dp)
+            setBackgroundColor(primaryColor)
+            setSupportActionBar(this)
+            ToolbarContentTintHelper.colorBackButton(this, ThemeStore.textColorSecondary(this@GenreDetailsActivity))
+        }
+        actionShuffle.setColor(ThemeStore.accentColor(this@GenreDetailsActivity))
         title = null
-        setSupportActionBar(toolbar)
-        actionShuffle.setColor(ThemeStore.accentColor(this))
     }
 
     override fun onResume() {
diff --git a/app/src/main/java/code/name/monkey/retromusic/ui/activities/PlaylistDetailActivity.kt b/app/src/main/java/code/name/monkey/retromusic/ui/activities/PlaylistDetailActivity.kt
index 6155b743..f1814fcc 100644
--- a/app/src/main/java/code/name/monkey/retromusic/ui/activities/PlaylistDetailActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/ui/activities/PlaylistDetailActivity.kt
@@ -1,5 +1,6 @@
 package code.name.monkey.retromusic.ui.activities
 
+import android.graphics.Color
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
@@ -7,6 +8,7 @@ import android.view.View
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.appthemehelper.ThemeStore
+import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
@@ -29,6 +31,7 @@ import com.afollestad.materialcab.MaterialCab
 import com.h6ah4i.android.widget.advrecyclerview.animator.RefactoredDefaultItemAnimator
 import com.h6ah4i.android.widget.advrecyclerview.draggable.RecyclerViewDragDropManager
 import com.h6ah4i.android.widget.advrecyclerview.utils.WrapperAdapterUtils
+
 import kotlinx.android.synthetic.main.activity_playlist_detail.*
 import java.util.*
 
@@ -46,13 +49,14 @@ class PlaylistDetailActivity : AbsSlidingMusicPanelActivity(), CabHolder, Playli
         setDrawUnderStatusBar()
         super.onCreate(savedInstanceState)
 
-        setStatusbarColorAuto()
+
+        setStatusbarColor(Color.TRANSPARENT)
         setNavigationbarColorAuto()
         setTaskDescriptionColorAuto()
         setLightNavigationBar(true)
+        setLightStatusbar(ColorUtil.isColorLight(ThemeStore.primaryColor(this)))
         toggleBottomNavigationView(true)
 
-
         playlist = intent.extras!!.getParcelable(EXTRA_PLAYLIST)
         songsPresenter = PlaylistSongsPresenter(this, playlist!!)
 
@@ -125,14 +129,13 @@ class PlaylistDetailActivity : AbsSlidingMusicPanelActivity(), CabHolder, Playli
         actionShuffle.setColor(ThemeStore.accentColor(this))
 
         val primaryColor = ThemeStore.primaryColor(this)
-        toolbar!!.setBackgroundColor(primaryColor)
-        appBarLayout!!.setBackgroundColor(primaryColor)
-
+        toolbar!!.apply {
+            setBackgroundColor(primaryColor)
+            setSupportActionBar(toolbar)
+            setNavigationIcon(R.drawable.ic_keyboard_backspace_black_24dp)
+            ToolbarContentTintHelper.colorBackButton(this, ThemeStore.textColorSecondary(this@PlaylistDetailActivity))
+        }
         title = null
-        setSupportActionBar(toolbar)
-        toolbar!!.setNavigationIcon(R.drawable.ic_keyboard_backspace_black_24dp)
-
-        ToolbarContentTintHelper.colorBackButton(toolbar!!, ThemeStore.accentColor(this))
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {