diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt
index d56385f48..c08d903d8 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt
@@ -2,6 +2,7 @@ package code.name.monkey.retromusic.fragments.base
 
 import android.content.ContentUris
 import android.content.Intent
+import android.graphics.drawable.Drawable
 import android.media.MediaMetadataRetriever
 import android.os.Build
 import android.os.Bundle
@@ -21,6 +22,7 @@ import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.tageditor.AbsTagEditorActivity
 import code.name.monkey.retromusic.activities.tageditor.SongTagEditorActivity
 import code.name.monkey.retromusic.db.PlaylistEntity
+import code.name.monkey.retromusic.db.SongEntity
 import code.name.monkey.retromusic.dialogs.*
 import code.name.monkey.retromusic.extensions.hide
 import code.name.monkey.retromusic.extensions.whichFragment
@@ -201,12 +203,14 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMainActivityFragme
         lifecycleScope.launch(IO) {
             val playlist: PlaylistEntity? = libraryViewModel.favoritePlaylist()
             if (playlist != null) {
-                val song = MusicPlayerRemote.currentSong.toSongEntity(playlist.playListId)
-                val isFavorite = libraryViewModel.isFavoriteSong(song).isNotEmpty()
+                val song: SongEntity =
+                    MusicPlayerRemote.currentSong.toSongEntity(playlist.playListId)
+                val isFavorite: Boolean = libraryViewModel.isFavoriteSong(song).isNotEmpty()
                 withContext(Main) {
                     val icon =
                         if (isFavorite) R.drawable.ic_favorite else R.drawable.ic_favorite_border
-                    val drawable =
+                    val drawable: Drawable? =
+                        
                         RetroUtil.getTintedVectorDrawable(
                             requireContext(),
                             icon,
diff --git a/app/src/main/res/navigation/main_graph.xml b/app/src/main/res/navigation/main_graph.xml
index c3d3f4446..009217c24 100644
--- a/app/src/main/res/navigation/main_graph.xml
+++ b/app/src/main/res/navigation/main_graph.xml
@@ -5,10 +5,6 @@
     android:id="@+id/retro_graph"
     app:startDestination="@id/libraryFragment">
 
-    <include app:graph="@navigation/settings_graph" />
-
-    <include app:graph="@navigation/library_graph" />
-
     <fragment
         android:id="@+id/genreDetailsFragment"
         android:name="code.name.monkey.retromusic.fragments.genres.GenreDetailsFragment"
@@ -53,14 +49,7 @@
         android:id="@+id/libraryFragment"
         android:name="code.name.monkey.retromusic.fragments.library.LibraryFragment"
         android:label=""
-        tools:layout="@layout/fragment_library">
-        <action
-            android:id="@+id/action_main_to_library"
-            app:destination="@id/library_graph" />
-        <action
-            android:id="@+id/action_main_to_settings"
-            app:destination="@id/settings_graph" />
-    </fragment>
+        tools:layout="@layout/fragment_library" />
 
     <fragment
         android:id="@+id/detailListFragment"