diff --git a/app/src/main/java/org/oxycblt/auxio/detail/AlbumDetailFragment.kt b/app/src/main/java/org/oxycblt/auxio/detail/AlbumDetailFragment.kt
index 8bf635e5e..1197a5f78 100644
--- a/app/src/main/java/org/oxycblt/auxio/detail/AlbumDetailFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/detail/AlbumDetailFragment.kt
@@ -101,7 +101,7 @@ class AlbumDetailFragment :
 
         // --- UI SETUP --
         binding.detailNormalToolbar.apply {
-            inflateMenu(R.menu.menu_album_detail)
+            inflateMenu(R.menu.toolbar_album)
             setNavigationOnClickListener { findNavController().navigateUp() }
             setOnMenuItemClickListener(this@AlbumDetailFragment)
         }
@@ -183,7 +183,7 @@ class AlbumDetailFragment :
     }
 
     override fun onOpenMenu(item: Song, anchor: View) {
-        openMusicMenu(anchor, R.menu.menu_album_song_actions, item)
+        openMusicMenu(anchor, R.menu.item_album_song, item)
     }
 
     override fun onPlay() {
@@ -195,7 +195,7 @@ class AlbumDetailFragment :
     }
 
     override fun onOpenSortMenu(anchor: View) {
-        openMenu(anchor, R.menu.menu_album_sort) {
+        openMenu(anchor, R.menu.sort_album) {
             // Select the corresponding sort mode option
             val sort = detailModel.albumSongSort
             unlikelyToBeNull(menu.findItem(sort.mode.itemId)).isChecked = true
diff --git a/app/src/main/java/org/oxycblt/auxio/detail/ArtistDetailFragment.kt b/app/src/main/java/org/oxycblt/auxio/detail/ArtistDetailFragment.kt
index 86208424b..b281ec397 100644
--- a/app/src/main/java/org/oxycblt/auxio/detail/ArtistDetailFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/detail/ArtistDetailFragment.kt
@@ -99,7 +99,7 @@ class ArtistDetailFragment :
 
         // --- UI SETUP ---
         binding.detailNormalToolbar.apply {
-            inflateMenu(R.menu.menu_parent_detail)
+            inflateMenu(R.menu.toolbar_parent)
             setNavigationOnClickListener { findNavController().navigateUp() }
             setOnMenuItemClickListener(this@ArtistDetailFragment)
         }
@@ -194,8 +194,8 @@ class ArtistDetailFragment :
 
     override fun onOpenMenu(item: Music, anchor: View) {
         when (item) {
-            is Song -> openMusicMenu(anchor, R.menu.menu_artist_song_actions, item)
-            is Album -> openMusicMenu(anchor, R.menu.menu_artist_album_actions, item)
+            is Song -> openMusicMenu(anchor, R.menu.item_artist_song, item)
+            is Album -> openMusicMenu(anchor, R.menu.item_artist_album, item)
             else -> error("Unexpected datatype: ${item::class.simpleName}")
         }
     }
@@ -209,7 +209,7 @@ class ArtistDetailFragment :
     }
 
     override fun onOpenSortMenu(anchor: View) {
-        openMenu(anchor, R.menu.menu_artist_sort) {
+        openMenu(anchor, R.menu.sort_artist) {
             // Select the corresponding sort mode option
             val sort = detailModel.artistSongSort
             unlikelyToBeNull(menu.findItem(sort.mode.itemId)).isChecked = true
diff --git a/app/src/main/java/org/oxycblt/auxio/detail/GenreDetailFragment.kt b/app/src/main/java/org/oxycblt/auxio/detail/GenreDetailFragment.kt
index a2d2e2cd9..a8646fe24 100644
--- a/app/src/main/java/org/oxycblt/auxio/detail/GenreDetailFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/detail/GenreDetailFragment.kt
@@ -97,7 +97,7 @@ class GenreDetailFragment :
 
         // --- UI SETUP ---
         binding.detailNormalToolbar.apply {
-            inflateMenu(R.menu.menu_parent_detail)
+            inflateMenu(R.menu.toolbar_parent)
             setNavigationOnClickListener { findNavController().navigateUp() }
             setOnMenuItemClickListener(this@GenreDetailFragment)
         }
@@ -192,8 +192,8 @@ class GenreDetailFragment :
 
     override fun onOpenMenu(item: Music, anchor: View) {
         when (item) {
-            is Artist -> openMusicMenu(anchor, R.menu.menu_parent_actions, item)
-            is Song -> openMusicMenu(anchor, R.menu.menu_song_actions, item)
+            is Artist -> openMusicMenu(anchor, R.menu.item_parent, item)
+            is Song -> openMusicMenu(anchor, R.menu.item_song, item)
             else -> error("Unexpected datatype: ${item::class.simpleName}")
         }
     }
@@ -207,7 +207,7 @@ class GenreDetailFragment :
     }
 
     override fun onOpenSortMenu(anchor: View) {
-        openMenu(anchor, R.menu.menu_genre_sort) {
+        openMenu(anchor, R.menu.sort_genre) {
             // Select the corresponding sort mode option
             val sort = detailModel.genreSongSort
             unlikelyToBeNull(menu.findItem(sort.mode.itemId)).isChecked = true
diff --git a/app/src/main/java/org/oxycblt/auxio/detail/PlaylistDetailFragment.kt b/app/src/main/java/org/oxycblt/auxio/detail/PlaylistDetailFragment.kt
index dc13ef831..b444abfdb 100644
--- a/app/src/main/java/org/oxycblt/auxio/detail/PlaylistDetailFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/detail/PlaylistDetailFragment.kt
@@ -102,7 +102,7 @@ class PlaylistDetailFragment :
 
         // --- UI SETUP ---
         binding.detailNormalToolbar.apply {
-            inflateMenu(R.menu.menu_playlist_detail)
+            inflateMenu(R.menu.toolbar_playlist)
             setNavigationOnClickListener { findNavController().navigateUp() }
             setOnMenuItemClickListener(this@PlaylistDetailFragment)
         }
@@ -235,7 +235,7 @@ class PlaylistDetailFragment :
     }
 
     override fun onOpenMenu(item: Song, anchor: View) {
-        openMusicMenu(anchor, R.menu.menu_playlist_song_actions, item)
+        openMusicMenu(anchor, R.menu.item_playlist_song, item)
     }
 
     override fun onPlay() {
diff --git a/app/src/main/java/org/oxycblt/auxio/home/list/AlbumListFragment.kt b/app/src/main/java/org/oxycblt/auxio/home/list/AlbumListFragment.kt
index b4aac9121..f6ed98f88 100644
--- a/app/src/main/java/org/oxycblt/auxio/home/list/AlbumListFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/home/list/AlbumListFragment.kt
@@ -142,7 +142,7 @@ class AlbumListFragment :
     }
 
     override fun onOpenMenu(item: Album, anchor: View) {
-        openMusicMenu(anchor, R.menu.menu_album_actions, item)
+        openMusicMenu(anchor, R.menu.item_album, item)
     }
 
     private fun updateAlbums(albums: List<Album>) {
diff --git a/app/src/main/java/org/oxycblt/auxio/home/list/ArtistListFragment.kt b/app/src/main/java/org/oxycblt/auxio/home/list/ArtistListFragment.kt
index b66c6e965..86fdc3483 100644
--- a/app/src/main/java/org/oxycblt/auxio/home/list/ArtistListFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/home/list/ArtistListFragment.kt
@@ -118,7 +118,7 @@ class ArtistListFragment :
     }
 
     override fun onOpenMenu(item: Artist, anchor: View) {
-        openMusicMenu(anchor, R.menu.menu_parent_actions, item)
+        openMusicMenu(anchor, R.menu.item_parent, item)
     }
 
     private fun updateArtists(artists: List<Artist>) {
diff --git a/app/src/main/java/org/oxycblt/auxio/home/list/GenreListFragment.kt b/app/src/main/java/org/oxycblt/auxio/home/list/GenreListFragment.kt
index d751e3699..46c26f689 100644
--- a/app/src/main/java/org/oxycblt/auxio/home/list/GenreListFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/home/list/GenreListFragment.kt
@@ -117,7 +117,7 @@ class GenreListFragment :
     }
 
     override fun onOpenMenu(item: Genre, anchor: View) {
-        openMusicMenu(anchor, R.menu.menu_parent_actions, item)
+        openMusicMenu(anchor, R.menu.item_parent, item)
     }
 
     private fun updateGenres(genres: List<Genre>) {
diff --git a/app/src/main/java/org/oxycblt/auxio/home/list/PlaylistListFragment.kt b/app/src/main/java/org/oxycblt/auxio/home/list/PlaylistListFragment.kt
index 405dbe312..cef433bde 100644
--- a/app/src/main/java/org/oxycblt/auxio/home/list/PlaylistListFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/home/list/PlaylistListFragment.kt
@@ -115,7 +115,7 @@ class PlaylistListFragment :
     }
 
     override fun onOpenMenu(item: Playlist, anchor: View) {
-        openMusicMenu(anchor, R.menu.menu_playlist_actions, item)
+        openMusicMenu(anchor, R.menu.item_playlist, item)
     }
 
     private fun updatePlaylists(playlists: List<Playlist>) {
diff --git a/app/src/main/java/org/oxycblt/auxio/home/list/SongListFragment.kt b/app/src/main/java/org/oxycblt/auxio/home/list/SongListFragment.kt
index d827adbf7..b22366658 100644
--- a/app/src/main/java/org/oxycblt/auxio/home/list/SongListFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/home/list/SongListFragment.kt
@@ -143,7 +143,7 @@ class SongListFragment :
     }
 
     override fun onOpenMenu(item: Song, anchor: View) {
-        openMusicMenu(anchor, R.menu.menu_song_actions, item)
+        openMusicMenu(anchor, R.menu.item_song, item)
     }
 
     private fun updateSongs(songs: List<Song>) {
diff --git a/app/src/main/java/org/oxycblt/auxio/search/SearchFragment.kt b/app/src/main/java/org/oxycblt/auxio/search/SearchFragment.kt
index 4efc4c704..ff41e9910 100644
--- a/app/src/main/java/org/oxycblt/auxio/search/SearchFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/search/SearchFragment.kt
@@ -181,11 +181,11 @@ class SearchFragment : ListFragment<Music, FragmentSearchBinding>() {
 
     override fun onOpenMenu(item: Music, anchor: View) {
         when (item) {
-            is Song -> openMusicMenu(anchor, R.menu.menu_song_actions, item)
-            is Album -> openMusicMenu(anchor, R.menu.menu_album_actions, item)
-            is Artist -> openMusicMenu(anchor, R.menu.menu_parent_actions, item)
-            is Genre -> openMusicMenu(anchor, R.menu.menu_parent_actions, item)
-            is Playlist -> openMusicMenu(anchor, R.menu.menu_playlist_actions, item)
+            is Song -> openMusicMenu(anchor, R.menu.item_song, item)
+            is Album -> openMusicMenu(anchor, R.menu.item_album, item)
+            is Artist -> openMusicMenu(anchor, R.menu.item_parent, item)
+            is Genre -> openMusicMenu(anchor, R.menu.item_parent, item)
+            is Playlist -> openMusicMenu(anchor, R.menu.item_playlist, item)
         }
     }
 
diff --git a/app/src/main/res/layout-h480dp/fragment_playback_panel.xml b/app/src/main/res/layout-h480dp/fragment_playback_panel.xml
index f2919eacc..263bf2a7d 100644
--- a/app/src/main/res/layout-h480dp/fragment_playback_panel.xml
+++ b/app/src/main/res/layout-h480dp/fragment_playback_panel.xml
@@ -11,7 +11,7 @@
         android:layout_height="wrap_content"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:menu="@menu/menu_playback"
+        app:menu="@menu/toolbar_playback"
         app:navigationIcon="@drawable/ic_down_24"
         app:title="@string/lbl_playback"
         tools:subtitle="@string/lbl_all_songs" />
diff --git a/app/src/main/res/layout-sw600dp/fragment_playback_panel.xml b/app/src/main/res/layout-sw600dp/fragment_playback_panel.xml
index 9fa7ff413..c673dd8ca 100644
--- a/app/src/main/res/layout-sw600dp/fragment_playback_panel.xml
+++ b/app/src/main/res/layout-sw600dp/fragment_playback_panel.xml
@@ -11,7 +11,7 @@
         android:layout_height="wrap_content"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:menu="@menu/menu_playback"
+        app:menu="@menu/toolbar_playback"
         app:navigationIcon="@drawable/ic_down_24"
         app:title="@string/lbl_playback"
         tools:subtitle="@string/lbl_all_songs" />
diff --git a/app/src/main/res/layout/fragment_detail.xml b/app/src/main/res/layout/fragment_detail.xml
index a272ca07f..1dfcf82b9 100644
--- a/app/src/main/res/layout/fragment_detail.xml
+++ b/app/src/main/res/layout/fragment_detail.xml
@@ -33,7 +33,7 @@
                 android:clickable="true"
                 android:focusable="true"
                 app:navigationIcon="@drawable/ic_close_24"
-                app:menu="@menu/menu_selection_actions" />
+                app:menu="@menu/toolbar_selection" />
 
             <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/detail_edit_toolbar"
@@ -42,7 +42,7 @@
                 android:clickable="true"
                 android:focusable="true"
                 app:navigationIcon="@drawable/ic_close_24"
-                app:menu="@menu/menu_edit_actions" />
+                app:menu="@menu/toolbar_edit" />
 
         </org.oxycblt.auxio.ui.MultiToolbar>
 
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 712509a65..049256481 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -22,7 +22,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 app:layout_scrollFlags="scroll|enterAlways"
-                app:menu="@menu/menu_home"
+                app:menu="@menu/toolbar_home"
                 app:title="@string/info_app_name" />
 
             <com.google.android.material.appbar.MaterialToolbar
@@ -32,7 +32,7 @@
                 android:clickable="true"
                 android:focusable="true"
                 app:navigationIcon="@drawable/ic_close_24"
-                app:menu="@menu/menu_selection_actions" />
+                app:menu="@menu/toolbar_selection" />
 
         </org.oxycblt.auxio.ui.MultiToolbar>
 
diff --git a/app/src/main/res/layout/fragment_playback_panel.xml b/app/src/main/res/layout/fragment_playback_panel.xml
index 313c018f0..74f106903 100644
--- a/app/src/main/res/layout/fragment_playback_panel.xml
+++ b/app/src/main/res/layout/fragment_playback_panel.xml
@@ -11,7 +11,7 @@
         android:layout_height="wrap_content"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:menu="@menu/menu_playback"
+        app:menu="@menu/toolbar_playback"
         app:navigationIcon="@drawable/ic_down_24"
         app:title="@string/lbl_playback"
         tools:subtitle="@string/lbl_all_songs" />
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index 2aac496d0..d8eba32d7 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -21,7 +21,7 @@
                 android:id="@+id/search_normal_toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:menu="@menu/menu_search"
+                app:menu="@menu/toolbar_search"
                 app:navigationIcon="@drawable/ic_back_24">
 
                 <com.google.android.material.textfield.TextInputLayout
@@ -56,7 +56,7 @@
                 android:clickable="true"
                 android:focusable="true"
                 app:navigationIcon="@drawable/ic_close_24"
-                app:menu="@menu/menu_selection_actions" />
+                app:menu="@menu/toolbar_selection" />
 
         </org.oxycblt.auxio.ui.MultiToolbar>
 
diff --git a/app/src/main/res/menu/menu_album_detail.xml b/app/src/main/res/menu/item_album.xml
similarity index 100%
rename from app/src/main/res/menu/menu_album_detail.xml
rename to app/src/main/res/menu/item_album.xml
diff --git a/app/src/main/res/menu/menu_album_song_actions.xml b/app/src/main/res/menu/item_album_song.xml
similarity index 100%
rename from app/src/main/res/menu/menu_album_song_actions.xml
rename to app/src/main/res/menu/item_album_song.xml
diff --git a/app/src/main/res/menu/menu_artist_album_actions.xml b/app/src/main/res/menu/item_artist_album.xml
similarity index 100%
rename from app/src/main/res/menu/menu_artist_album_actions.xml
rename to app/src/main/res/menu/item_artist_album.xml
diff --git a/app/src/main/res/menu/menu_artist_song_actions.xml b/app/src/main/res/menu/item_artist_song.xml
similarity index 100%
rename from app/src/main/res/menu/menu_artist_song_actions.xml
rename to app/src/main/res/menu/item_artist_song.xml
diff --git a/app/src/main/res/menu/menu_parent_actions.xml b/app/src/main/res/menu/item_parent.xml
similarity index 100%
rename from app/src/main/res/menu/menu_parent_actions.xml
rename to app/src/main/res/menu/item_parent.xml
diff --git a/app/src/main/res/menu/menu_playlist_actions.xml b/app/src/main/res/menu/item_playlist.xml
similarity index 100%
rename from app/src/main/res/menu/menu_playlist_actions.xml
rename to app/src/main/res/menu/item_playlist.xml
diff --git a/app/src/main/res/menu/menu_playlist_song_actions.xml b/app/src/main/res/menu/item_playlist_song.xml
similarity index 100%
rename from app/src/main/res/menu/menu_playlist_song_actions.xml
rename to app/src/main/res/menu/item_playlist_song.xml
diff --git a/app/src/main/res/menu/menu_song_actions.xml b/app/src/main/res/menu/item_song.xml
similarity index 100%
rename from app/src/main/res/menu/menu_song_actions.xml
rename to app/src/main/res/menu/item_song.xml
diff --git a/app/src/main/res/menu/menu_album_sort.xml b/app/src/main/res/menu/sort_album.xml
similarity index 100%
rename from app/src/main/res/menu/menu_album_sort.xml
rename to app/src/main/res/menu/sort_album.xml
diff --git a/app/src/main/res/menu/menu_artist_sort.xml b/app/src/main/res/menu/sort_artist.xml
similarity index 100%
rename from app/src/main/res/menu/menu_artist_sort.xml
rename to app/src/main/res/menu/sort_artist.xml
diff --git a/app/src/main/res/menu/menu_genre_sort.xml b/app/src/main/res/menu/sort_genre.xml
similarity index 100%
rename from app/src/main/res/menu/menu_genre_sort.xml
rename to app/src/main/res/menu/sort_genre.xml
diff --git a/app/src/main/res/menu/menu_album_actions.xml b/app/src/main/res/menu/toolbar_album.xml
similarity index 76%
rename from app/src/main/res/menu/menu_album_actions.xml
rename to app/src/main/res/menu/toolbar_album.xml
index 6f9f28aff..7cc2b4b79 100644
--- a/app/src/main/res/menu/menu_album_actions.xml
+++ b/app/src/main/res/menu/toolbar_album.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/action_play"
-        android:title="@string/lbl_play" />
-    <item
-        android:id="@+id/action_shuffle"
-        android:title="@string/lbl_shuffle" />
     <item
         android:id="@+id/action_play_next"
         android:title="@string/lbl_play_next" />
diff --git a/app/src/main/res/menu/menu_edit_actions.xml b/app/src/main/res/menu/toolbar_edit.xml
similarity index 100%
rename from app/src/main/res/menu/menu_edit_actions.xml
rename to app/src/main/res/menu/toolbar_edit.xml
diff --git a/app/src/main/res/menu/menu_home.xml b/app/src/main/res/menu/toolbar_home.xml
similarity index 100%
rename from app/src/main/res/menu/menu_home.xml
rename to app/src/main/res/menu/toolbar_home.xml
diff --git a/app/src/main/res/menu/menu_parent_detail.xml b/app/src/main/res/menu/toolbar_parent.xml
similarity index 100%
rename from app/src/main/res/menu/menu_parent_detail.xml
rename to app/src/main/res/menu/toolbar_parent.xml
diff --git a/app/src/main/res/menu/menu_playback.xml b/app/src/main/res/menu/toolbar_playback.xml
similarity index 100%
rename from app/src/main/res/menu/menu_playback.xml
rename to app/src/main/res/menu/toolbar_playback.xml
diff --git a/app/src/main/res/menu/menu_playlist_detail.xml b/app/src/main/res/menu/toolbar_playlist.xml
similarity index 100%
rename from app/src/main/res/menu/menu_playlist_detail.xml
rename to app/src/main/res/menu/toolbar_playlist.xml
diff --git a/app/src/main/res/menu/menu_search.xml b/app/src/main/res/menu/toolbar_search.xml
similarity index 100%
rename from app/src/main/res/menu/menu_search.xml
rename to app/src/main/res/menu/toolbar_search.xml
diff --git a/app/src/main/res/menu/menu_selection_actions.xml b/app/src/main/res/menu/toolbar_selection.xml
similarity index 100%
rename from app/src/main/res/menu/menu_selection_actions.xml
rename to app/src/main/res/menu/toolbar_selection.xml