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 bdb8f68e8..147fbf8eb 100644
--- a/app/src/main/java/org/oxycblt/auxio/detail/AlbumDetailFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/detail/AlbumDetailFragment.kt
@@ -44,7 +44,7 @@ class AlbumDetailFragment : DetailFragment() {
         }
 
         val detailAdapter = AlbumDetailAdapter(
-            detailModel, viewLifecycleOwner,
+            detailModel, playbackModel, viewLifecycleOwner,
             doOnClick = { playbackModel.playSong(it, PlaybackMode.IN_ALBUM) },
             doOnLongClick = { data, view ->
                 PopupMenu(requireContext(), view).setupAlbumSongActions(
@@ -57,23 +57,8 @@ class AlbumDetailFragment : DetailFragment() {
 
         binding.lifecycleOwner = this
 
-        setupToolbar(R.menu.menu_album_actions) {
+        setupToolbar(R.menu.menu_album_detail) {
             when (it) {
-                R.id.action_shuffle -> {
-                    playbackModel.playAlbum(
-                        detailModel.currentAlbum.value!!, true
-                    )
-
-                    true
-                }
-                R.id.action_play -> {
-                    playbackModel.playAlbum(
-                        detailModel.currentAlbum.value!!, false
-                    )
-
-                    true
-                }
-
                 R.id.action_queue_add -> {
                     playbackModel.addToUserQueue(detailModel.currentAlbum.value!!)
                     getString(R.string.label_queue_added).createToast(requireContext())
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 af5cd0c5a..79b33a29b 100644
--- a/app/src/main/java/org/oxycblt/auxio/detail/ArtistDetailFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/detail/ArtistDetailFragment.kt
@@ -7,7 +7,6 @@ import android.view.ViewGroup
 import androidx.appcompat.widget.PopupMenu
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
-import org.oxycblt.auxio.R
 import org.oxycblt.auxio.detail.adapters.ArtistDetailAdapter
 import org.oxycblt.auxio.logD
 import org.oxycblt.auxio.music.Album
@@ -43,7 +42,7 @@ class ArtistDetailFragment : DetailFragment() {
         }
 
         val detailAdapter = ArtistDetailAdapter(
-            detailModel, viewLifecycleOwner,
+            detailModel, playbackModel, viewLifecycleOwner,
             doOnClick = {
                 if (!detailModel.isNavigating) {
                     detailModel.updateNavigationStatus(true)
@@ -64,29 +63,7 @@ class ArtistDetailFragment : DetailFragment() {
 
         binding.lifecycleOwner = this
 
-        setupToolbar(R.menu.menu_artist_actions) {
-            when (it) {
-                R.id.action_shuffle -> {
-                    playbackModel.playArtist(
-                        detailModel.currentArtist.value!!,
-                        true
-                    )
-
-                    true
-                }
-
-                R.id.action_play_albums -> {
-                    playbackModel.playArtist(
-                        detailModel.currentArtist.value!!, false
-                    )
-
-                    true
-                }
-
-                else -> false
-            }
-        }
-
+        setupToolbar()
         setupRecycler(detailAdapter)
 
         // --- VIEWMODEL SETUP ---
diff --git a/app/src/main/java/org/oxycblt/auxio/detail/DetailFragment.kt b/app/src/main/java/org/oxycblt/auxio/detail/DetailFragment.kt
index fc0e46f24..83f2c2268 100644
--- a/app/src/main/java/org/oxycblt/auxio/detail/DetailFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/detail/DetailFragment.kt
@@ -47,16 +47,23 @@ abstract class DetailFragment : Fragment() {
     /**
      * Shortcut method for doing setup of the detail toolbar.
      */
-    protected fun setupToolbar(@MenuRes menu: Int, onMenuClick: (id: Int) -> Boolean) {
+    protected fun setupToolbar(
+        @MenuRes menu: Int = -1,
+        onMenuClick: ((id: Int) -> Boolean)? = null
+    ) {
         binding.detailToolbar.apply {
-            inflateMenu(menu)
+            if (menu != -1) {
+                inflateMenu(menu)
+            }
 
             setNavigationOnClickListener {
                 findNavController().navigateUp()
             }
 
-            setOnMenuItemClickListener {
-                onMenuClick(it.itemId)
+            onMenuClick?.let {
+                setOnMenuItemClickListener {
+                    it(it.itemId)
+                }
             }
         }
     }
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 749e2dea8..29244946a 100644
--- a/app/src/main/java/org/oxycblt/auxio/detail/GenreDetailFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/detail/GenreDetailFragment.kt
@@ -7,7 +7,6 @@ import android.view.ViewGroup
 import androidx.appcompat.widget.PopupMenu
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
-import org.oxycblt.auxio.R
 import org.oxycblt.auxio.detail.adapters.GenreDetailAdapter
 import org.oxycblt.auxio.logD
 import org.oxycblt.auxio.music.Album
@@ -42,7 +41,7 @@ class GenreDetailFragment : DetailFragment() {
         }
 
         val detailAdapter = GenreDetailAdapter(
-            detailModel, viewLifecycleOwner,
+            detailModel, playbackModel, viewLifecycleOwner,
             doOnClick = {
                 playbackModel.playSong(it, PlaybackMode.IN_GENRE)
             },
@@ -57,21 +56,7 @@ class GenreDetailFragment : DetailFragment() {
 
         binding.lifecycleOwner = this
 
-        setupToolbar(R.menu.menu_genre_actions) {
-            when (it) {
-                R.id.action_shuffle -> {
-                    playbackModel.playGenre(
-                        detailModel.currentGenre.value!!,
-                        true
-                    )
-
-                    true
-                }
-
-                else -> false
-            }
-        }
-
+        setupToolbar()
         setupRecycler(detailAdapter)
 
         // --- DETAILVIEWMODEL SETUP ---
diff --git a/app/src/main/java/org/oxycblt/auxio/detail/adapters/AlbumDetailAdapter.kt b/app/src/main/java/org/oxycblt/auxio/detail/adapters/AlbumDetailAdapter.kt
index feabe7ed1..cba0d8969 100644
--- a/app/src/main/java/org/oxycblt/auxio/detail/adapters/AlbumDetailAdapter.kt
+++ b/app/src/main/java/org/oxycblt/auxio/detail/adapters/AlbumDetailAdapter.kt
@@ -1,29 +1,34 @@
 package org.oxycblt.auxio.detail.adapters
 
+import android.content.res.ColorStateList
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.lifecycle.LifecycleOwner
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
+import org.oxycblt.auxio.R
 import org.oxycblt.auxio.databinding.ItemAlbumHeaderBinding
 import org.oxycblt.auxio.databinding.ItemAlbumSongBinding
 import org.oxycblt.auxio.detail.DetailViewModel
 import org.oxycblt.auxio.music.Album
 import org.oxycblt.auxio.music.BaseModel
 import org.oxycblt.auxio.music.Song
+import org.oxycblt.auxio.playback.PlaybackViewModel
 import org.oxycblt.auxio.recycler.DiffCallback
 import org.oxycblt.auxio.recycler.viewholders.BaseViewHolder
 import org.oxycblt.auxio.recycler.viewholders.Highlightable
 import org.oxycblt.auxio.ui.accent
 import org.oxycblt.auxio.ui.disable
 import org.oxycblt.auxio.ui.setTextColorResource
+import org.oxycblt.auxio.ui.toColor
 
 /**
  * An adapter for displaying the details and [Song]s of an [Album]
  */
 class AlbumDetailAdapter(
     private val detailModel: DetailViewModel,
+    private val playbackModel: PlaybackViewModel,
     private val lifecycleOwner: LifecycleOwner,
     private val doOnClick: (data: Song) -> Unit,
     private val doOnLongClick: (data: Song, view: View) -> Unit
@@ -109,8 +114,25 @@ class AlbumDetailAdapter(
         override fun onBind(data: Album) {
             binding.album = data
             binding.detailModel = detailModel
+            binding.playbackModel = playbackModel
             binding.lifecycleOwner = lifecycleOwner
 
+            // Apply the accent programmatically since I don't want to deal the with the
+            // nightmarish mess of switching out my styling to Material
+            val accent = accent.first.toColor(binding.albumShuffleButton.context)
+            val selection = ColorStateList.valueOf(
+                R.color.selection_color.toColor(binding.albumShuffleButton.context)
+            )
+
+            binding.albumShuffleButton.apply {
+                backgroundTintList = ColorStateList.valueOf(accent)
+                rippleColor = selection
+            }
+            binding.albumPlayButton.apply {
+                setTextColor(accent)
+                rippleColor = selection
+            }
+
             if (data.songs.size < 2) {
                 binding.albumSortButton.disable()
             }
diff --git a/app/src/main/java/org/oxycblt/auxio/detail/adapters/ArtistDetailAdapter.kt b/app/src/main/java/org/oxycblt/auxio/detail/adapters/ArtistDetailAdapter.kt
index 6cb601374..e58b75a8f 100644
--- a/app/src/main/java/org/oxycblt/auxio/detail/adapters/ArtistDetailAdapter.kt
+++ b/app/src/main/java/org/oxycblt/auxio/detail/adapters/ArtistDetailAdapter.kt
@@ -1,29 +1,34 @@
 package org.oxycblt.auxio.detail.adapters
 
+import android.content.res.ColorStateList
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.lifecycle.LifecycleOwner
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
+import org.oxycblt.auxio.R
 import org.oxycblt.auxio.databinding.ItemArtistAlbumBinding
 import org.oxycblt.auxio.databinding.ItemArtistHeaderBinding
 import org.oxycblt.auxio.detail.DetailViewModel
 import org.oxycblt.auxio.music.Album
 import org.oxycblt.auxio.music.Artist
 import org.oxycblt.auxio.music.BaseModel
+import org.oxycblt.auxio.playback.PlaybackViewModel
 import org.oxycblt.auxio.recycler.DiffCallback
 import org.oxycblt.auxio.recycler.viewholders.BaseViewHolder
 import org.oxycblt.auxio.recycler.viewholders.Highlightable
 import org.oxycblt.auxio.ui.accent
 import org.oxycblt.auxio.ui.disable
 import org.oxycblt.auxio.ui.setTextColorResource
+import org.oxycblt.auxio.ui.toColor
 
 /**
  * An adapter for displaying the [Album]s of an artist.
  */
 class ArtistDetailAdapter(
     private val detailModel: DetailViewModel,
+    private val playbackModel: PlaybackViewModel,
     private val lifecycleOwner: LifecycleOwner,
     private val doOnClick: (data: Album) -> Unit,
     private val doOnLongClick: (data: Album, view: View) -> Unit,
@@ -108,8 +113,26 @@ class ArtistDetailAdapter(
         override fun onBind(data: Artist) {
             binding.artist = data
             binding.detailModel = detailModel
+            binding.playbackModel = playbackModel
             binding.lifecycleOwner = lifecycleOwner
 
+            // Apply the accent programmatically since I don't want to deal the with the
+            // nightmarish mess of switching out my styling to Material
+            val accent = accent.first.toColor(binding.artistShuffleButton.context)
+            val selection = ColorStateList.valueOf(
+                R.color.selection_color.toColor(binding.artistShuffleButton.context)
+            )
+
+            binding.artistShuffleButton.apply {
+                backgroundTintList = ColorStateList.valueOf(accent)
+                rippleColor = selection
+            }
+
+            binding.artistPlayButton.apply {
+                setTextColor(accent)
+                rippleColor = selection
+            }
+
             if (data.albums.size < 2) {
                 binding.artistSortButton.disable()
             }
diff --git a/app/src/main/java/org/oxycblt/auxio/detail/adapters/GenreDetailAdapter.kt b/app/src/main/java/org/oxycblt/auxio/detail/adapters/GenreDetailAdapter.kt
index af3868147..2a1f8094b 100644
--- a/app/src/main/java/org/oxycblt/auxio/detail/adapters/GenreDetailAdapter.kt
+++ b/app/src/main/java/org/oxycblt/auxio/detail/adapters/GenreDetailAdapter.kt
@@ -1,29 +1,34 @@
 package org.oxycblt.auxio.detail.adapters
 
+import android.content.res.ColorStateList
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.lifecycle.LifecycleOwner
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
+import org.oxycblt.auxio.R
 import org.oxycblt.auxio.databinding.ItemGenreHeaderBinding
 import org.oxycblt.auxio.databinding.ItemGenreSongBinding
 import org.oxycblt.auxio.detail.DetailViewModel
 import org.oxycblt.auxio.music.BaseModel
 import org.oxycblt.auxio.music.Genre
 import org.oxycblt.auxio.music.Song
+import org.oxycblt.auxio.playback.PlaybackViewModel
 import org.oxycblt.auxio.recycler.DiffCallback
 import org.oxycblt.auxio.recycler.viewholders.BaseViewHolder
 import org.oxycblt.auxio.recycler.viewholders.Highlightable
 import org.oxycblt.auxio.ui.accent
 import org.oxycblt.auxio.ui.disable
 import org.oxycblt.auxio.ui.setTextColorResource
+import org.oxycblt.auxio.ui.toColor
 
 /**
  * An adapter for displaying the [Song]s of a genre.
  */
 class GenreDetailAdapter(
     private val detailModel: DetailViewModel,
+    private val playbackModel: PlaybackViewModel,
     private val lifecycleOwner: LifecycleOwner,
     private val doOnClick: (data: Song) -> Unit,
     private val doOnLongClick: (data: Song, view: View) -> Unit
@@ -109,8 +114,26 @@ class GenreDetailAdapter(
         override fun onBind(data: Genre) {
             binding.genre = data
             binding.detailModel = detailModel
+            binding.playbackModel = playbackModel
             binding.lifecycleOwner = lifecycleOwner
 
+            // Apply the accent programmatically since I don't want to deal the with the
+            // nightmarish mess of switching out my styling to Material
+            val accent = accent.first.toColor(binding.genreShuffleButton.context)
+            val selection = ColorStateList.valueOf(
+                R.color.selection_color.toColor(binding.genreShuffleButton.context)
+            )
+
+            binding.genreShuffleButton.apply {
+                backgroundTintList = ColorStateList.valueOf(accent)
+                rippleColor = selection
+            }
+
+            binding.genrePlayButton.apply {
+                setTextColor(accent)
+                rippleColor = selection
+            }
+
             if (data.songs.size < 2) {
                 binding.genreSortButton.disable()
             }
diff --git a/app/src/main/res/layout-land/item_album_header.xml b/app/src/main/res/layout-land/item_album_header.xml
index 5844dfe25..ecd272f17 100644
--- a/app/src/main/res/layout-land/item_album_header.xml
+++ b/app/src/main/res/layout-land/item_album_header.xml
@@ -5,13 +5,17 @@
 
     <data>
 
+        <variable
+            name="album"
+            type="org.oxycblt.auxio.music.Album" />
+
         <variable
             name="detailModel"
             type="org.oxycblt.auxio.detail.DetailViewModel" />
 
         <variable
-            name="album"
-            type="org.oxycblt.auxio.music.Album" />
+            name="playbackModel"
+            type="org.oxycblt.auxio.playback.PlaybackViewModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -43,7 +47,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toEndOf="@+id/album_cover"
-            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/album_cover"
             app:layout_constraintVertical_chainStyle="packed"
             tools:text="Album Name" />
 
@@ -72,18 +76,40 @@
             android:textAppearance="?android:attr/textAppearanceListItem"
             android:textColor="?android:attr/textColorSecondary"
             app:albumDetails="@{album}"
-            app:layout_constraintBottom_toTopOf="@+id/album_song_header"
+            app:layout_constraintBottom_toBottomOf="@+id/album_cover"
             app:layout_constraintStart_toEndOf="@+id/album_cover"
             app:layout_constraintTop_toBottomOf="@+id/album_artist"
             tools:text="2020 / 10 Songs / 16:16" />
 
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/album_play_button"
+            style="@style/Widget.MaterialComponents.Button.Unimportant"
+            android:onClick="@{() -> playbackModel.playAlbum(album, false)}"
+            android:text="@string/label_play"
+            app:layout_constraintEnd_toStartOf="@+id/album_shuffle_button"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/album_cover"
+            tools:textColor="@color/blue" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/album_shuffle_button"
+            style="@style/Widget.MaterialComponents.Button.Highlighted"
+            android:onClick="@{() -> playbackModel.playAlbum(album, true)}"
+            android:text="@string/label_shuffle"
+            app:layout_constraintBottom_toBottomOf="@+id/album_play_button"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/album_play_button"
+            app:layout_constraintTop_toTopOf="@+id/album_play_button"
+            tools:backgroundTint="@color/blue" />
+
         <TextView
             android:id="@+id/album_song_header"
             style="@style/HeaderText"
-            android:layout_marginTop="@dimen/margin_medium"
+            android:layout_marginTop="8dp"
             android:text="@string/label_songs"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/album_cover" />
+            app:layout_constraintTop_toBottomOf="@+id/album_play_button" />
 
         <ImageButton
             android:id="@+id/album_sort_button"
diff --git a/app/src/main/res/layout-land/item_artist_header.xml b/app/src/main/res/layout-land/item_artist_header.xml
index 61923ec06..5117c884a 100644
--- a/app/src/main/res/layout-land/item_artist_header.xml
+++ b/app/src/main/res/layout-land/item_artist_header.xml
@@ -13,6 +13,10 @@
         <variable
             name="detailModel"
             type="org.oxycblt.auxio.detail.DetailViewModel" />
+
+        <variable
+            name="playbackModel"
+            type="org.oxycblt.auxio.playback.PlaybackViewModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -42,7 +46,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toEndOf="@+id/artist_image"
-            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/artist_image"
             app:layout_constraintVertical_chainStyle="packed"
             tools:text="Artist Name" />
 
@@ -67,18 +71,40 @@
             android:textAppearance="?android:attr/textAppearanceListItem"
             android:textColor="?android:attr/textColorSecondary"
             app:artistCounts="@{artist}"
-            app:layout_constraintBottom_toTopOf="@+id/artist_album_header"
+            app:layout_constraintBottom_toBottomOf="@+id/artist_image"
             app:layout_constraintStart_toEndOf="@+id/artist_image"
             app:layout_constraintTop_toBottomOf="@+id/artist_genre"
             tools:text="2 Albums, 20 Songs" />
 
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/artist_play_button"
+            style="@style/Widget.MaterialComponents.Button.Unimportant"
+            android:onClick="@{() -> playbackModel.playArtist(artist, false)}"
+            android:text="@string/label_play"
+            app:layout_constraintEnd_toStartOf="@+id/artist_shuffle_button"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/artist_image"
+            tools:textColor="@color/blue" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/artist_shuffle_button"
+            style="@style/Widget.MaterialComponents.Button.Highlighted"
+            android:onClick="@{() -> playbackModel.playArtist(artist, true)}"
+            android:text="@string/label_shuffle"
+            app:layout_constraintBottom_toBottomOf="@+id/artist_play_button"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/artist_play_button"
+            app:layout_constraintTop_toTopOf="@+id/artist_play_button"
+            tools:backgroundTint="@color/blue" />
+
         <TextView
             android:id="@+id/artist_album_header"
             style="@style/HeaderText"
-            android:layout_marginTop="@dimen/margin_medium"
+            android:layout_marginTop="@dimen/margin_small"
             android:text="@string/label_albums"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/artist_image" />
+            app:layout_constraintTop_toBottomOf="@+id/artist_play_button" />
 
         <ImageButton
             android:id="@+id/artist_sort_button"
diff --git a/app/src/main/res/layout-land/item_genre_header.xml b/app/src/main/res/layout-land/item_genre_header.xml
index a93fcb5ee..336ee00db 100644
--- a/app/src/main/res/layout-land/item_genre_header.xml
+++ b/app/src/main/res/layout-land/item_genre_header.xml
@@ -14,6 +14,9 @@
             name="detailModel"
             type="org.oxycblt.auxio.detail.DetailViewModel" />
 
+        <variable
+            name="playbackModel"
+            type="org.oxycblt.auxio.playback.PlaybackViewModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -43,7 +46,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toEndOf="@+id/genre_image"
-            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/genre_image"
             app:layout_constraintVertical_chainStyle="packed"
             tools:text="Genre Name" />
 
@@ -60,6 +63,28 @@
             app:layout_constraintTop_toBottomOf="@+id/genre_name"
             tools:text="2 Artists, 4 Albums" />
 
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/genre_play_button"
+            style="@style/Widget.MaterialComponents.Button.Unimportant"
+            android:onClick="@{() -> playbackModel.playGenre(genre, false)}"
+            android:text="@string/label_play"
+            app:layout_constraintEnd_toStartOf="@+id/genre_shuffle_button"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/genre_image"
+            tools:textColor="@color/blue" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/genre_shuffle_button"
+            style="@style/Widget.MaterialComponents.Button.Highlighted"
+            android:onClick="@{() -> playbackModel.playGenre(genre, true)}"
+            android:text="@string/label_shuffle"
+            app:layout_constraintBottom_toBottomOf="@+id/genre_play_button"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/genre_play_button"
+            app:layout_constraintTop_toTopOf="@+id/genre_play_button"
+            tools:backgroundTint="@color/blue" />
+
         <TextView
             android:id="@+id/genre_duration"
             android:layout_width="0dp"
@@ -68,7 +93,7 @@
             android:text="@{genre.totalDuration}"
             android:textAppearance="?android:attr/textAppearanceListItem"
             android:textColor="?android:attr/textColorSecondary"
-            app:layout_constraintBottom_toTopOf="@+id/genre_song_header"
+            app:layout_constraintBottom_toBottomOf="@+id/genre_image"
             app:layout_constraintStart_toEndOf="@+id/genre_image"
             app:layout_constraintTop_toBottomOf="@+id/genre_song_count"
             tools:text="16:16" />
@@ -76,10 +101,10 @@
         <TextView
             android:id="@+id/genre_song_header"
             style="@style/HeaderText"
-            android:layout_marginTop="@dimen/margin_medium"
+            android:layout_marginTop="@dimen/margin_small"
             android:text="@string/label_songs"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/genre_image" />
+            app:layout_constraintTop_toBottomOf="@+id/genre_play_button" />
 
         <ImageButton
             android:id="@+id/genre_sort_button"
diff --git a/app/src/main/res/layout/item_album_header.xml b/app/src/main/res/layout/item_album_header.xml
index 56040ab62..1c45430a1 100644
--- a/app/src/main/res/layout/item_album_header.xml
+++ b/app/src/main/res/layout/item_album_header.xml
@@ -5,13 +5,17 @@
 
     <data>
 
+        <variable
+            name="album"
+            type="org.oxycblt.auxio.music.Album" />
+
         <variable
             name="detailModel"
             type="org.oxycblt.auxio.detail.DetailViewModel" />
 
         <variable
-            name="album"
-            type="org.oxycblt.auxio.music.Album" />
+            name="playbackModel"
+            type="org.oxycblt.auxio.playback.PlaybackViewModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -74,13 +78,35 @@
             app:layout_constraintTop_toBottomOf="@+id/album_artist"
             tools:text="2020 / 10 Songs / 16:16" />
 
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/album_play_button"
+            style="@style/Widget.MaterialComponents.Button.Unimportant"
+            android:onClick="@{() -> playbackModel.playAlbum(album, false)}"
+            android:text="@string/label_play"
+            app:layout_constraintEnd_toStartOf="@+id/album_shuffle_button"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/album_details"
+            tools:textColor="@color/blue" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/album_shuffle_button"
+            style="@style/Widget.MaterialComponents.Button.Highlighted"
+            android:onClick="@{() -> playbackModel.playAlbum(album, true)}"
+            android:text="@string/label_shuffle"
+            app:layout_constraintBottom_toBottomOf="@+id/album_play_button"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/album_play_button"
+            app:layout_constraintTop_toTopOf="@+id/album_play_button"
+            tools:backgroundTint="@color/blue" />
+
         <TextView
             android:id="@+id/album_song_header"
             style="@style/HeaderText"
-            android:layout_marginTop="@dimen/margin_medium"
+            android:layout_marginTop="@dimen/margin_small"
+            android:background="@drawable/ui_header_dividers"
             android:text="@string/label_songs"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/album_details" />
+            app:layout_constraintTop_toBottomOf="@+id/album_play_button" />
 
         <ImageButton
             android:id="@+id/album_sort_button"
diff --git a/app/src/main/res/layout/item_artist_header.xml b/app/src/main/res/layout/item_artist_header.xml
index 888769ec2..7a04aa6b2 100644
--- a/app/src/main/res/layout/item_artist_header.xml
+++ b/app/src/main/res/layout/item_artist_header.xml
@@ -13,6 +13,10 @@
         <variable
             name="detailModel"
             type="org.oxycblt.auxio.detail.DetailViewModel" />
+
+        <variable
+            name="playbackModel"
+            type="org.oxycblt.auxio.playback.PlaybackViewModel" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -70,13 +74,34 @@
             app:layout_constraintTop_toBottomOf="@+id/artist_genre"
             tools:text="2 Albums, 20 Songs" />
 
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/artist_play_button"
+            style="@style/Widget.MaterialComponents.Button.Unimportant"
+            android:onClick="@{() -> playbackModel.playArtist(artist, false)}"
+            android:text="@string/label_play"
+            app:layout_constraintEnd_toStartOf="@+id/artist_shuffle_button"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/artist_counts"
+            tools:textColor="@color/blue" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/artist_shuffle_button"
+            style="@style/Widget.MaterialComponents.Button.Highlighted"
+            android:onClick="@{() -> playbackModel.playArtist(artist, true)}"
+            android:text="@string/label_shuffle"
+            app:layout_constraintBottom_toBottomOf="@+id/artist_play_button"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/artist_play_button"
+            app:layout_constraintTop_toTopOf="@+id/artist_play_button"
+            tools:backgroundTint="@color/blue" />
+
         <TextView
             android:id="@+id/artist_album_header"
             style="@style/HeaderText"
-            android:layout_marginTop="@dimen/margin_medium"
+            android:layout_marginTop="@dimen/margin_small"
             android:text="@string/label_albums"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/artist_counts" />
+            app:layout_constraintTop_toBottomOf="@+id/artist_play_button" />
 
         <ImageButton
             android:id="@+id/artist_sort_button"
diff --git a/app/src/main/res/layout/item_genre_header.xml b/app/src/main/res/layout/item_genre_header.xml
index 15111a89e..7fb9ea002 100644
--- a/app/src/main/res/layout/item_genre_header.xml
+++ b/app/src/main/res/layout/item_genre_header.xml
@@ -14,6 +14,10 @@
             name="detailModel"
             type="org.oxycblt.auxio.detail.DetailViewModel" />
 
+        <variable
+            name="playbackModel"
+            type="org.oxycblt.auxio.playback.PlaybackViewModel" />
+
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -71,13 +75,34 @@
             app:layout_constraintTop_toBottomOf="@+id/genre_song_count"
             tools:text="16:16" />
 
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/genre_play_button"
+            style="@style/Widget.MaterialComponents.Button.Unimportant"
+            android:onClick="@{() -> playbackModel.playGenre(genre, false)}"
+            android:text="@string/label_play"
+            app:layout_constraintEnd_toStartOf="@+id/genre_shuffle_button"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/genre_duration"
+            tools:textColor="@color/blue" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/genre_shuffle_button"
+            style="@style/Widget.MaterialComponents.Button.Highlighted"
+            android:onClick="@{() -> playbackModel.playGenre(genre, true)}"
+            android:text="@string/label_shuffle"
+            app:layout_constraintBottom_toBottomOf="@+id/genre_play_button"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/genre_play_button"
+            app:layout_constraintTop_toTopOf="@+id/genre_play_button"
+            tools:backgroundTint="@color/blue" />
+
         <TextView
             android:id="@+id/genre_song_header"
             style="@style/HeaderText"
-            android:layout_marginTop="@dimen/padding_medium"
+            android:layout_marginTop="@dimen/margin_small"
             android:text="@string/label_songs"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/genre_duration" />
+            app:layout_constraintTop_toBottomOf="@+id/genre_play_button" />
 
         <ImageButton
             android:id="@+id/genre_sort_button"
diff --git a/app/src/main/res/menu/menu_album_detail.xml b/app/src/main/res/menu/menu_album_detail.xml
new file mode 100644
index 000000000..f9a7210c9
--- /dev/null
+++ b/app/src/main/res/menu/menu_album_detail.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/action_queue_add"
+        android:icon="@drawable/ic_queue_add"
+        android:title="@string/label_queue_add"
+        app:showAsAction="never" />
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f108afbe2..613448633 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -180,4 +180,38 @@
     <style name="Theme.BottomSheetHeightFix" parent="Widget.Design.BottomSheet.Modal">
         <item name="behavior_peekHeight">500dp</item>
     </style>
+
+    <!-- An "Unimportant" material button, used for the "Play" button -->
+    <style name="Widget.MaterialComponents.Button.Unimportant" parent="@style/Widget.MaterialComponents.Button.OutlinedButton">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginTop">@dimen/margin_small</item>
+        <item name="android:layout_marginStart">@dimen/margin_medium</item>
+        <item name="android:layout_marginEnd">@dimen/margin_small</item>
+        <item name="android:clickable">true</item>
+        <item name="android:focusable">true</item>
+        <item name="android:theme">@style/Theme.MaterialComponents</item>
+        <item name="strokeColor">@color/divider_color</item>
+        <item name="strokeWidth">1dp</item>
+        <item name="rippleColor">@color/selection_color</item>
+        <item name="fontFamily">@font/inter_semibold</item>
+        <item name="textAllCaps">false</item>
+        <item name="cornerRadius">0dp</item>
+    </style>
+
+    <!-- An highlighted material button, used for the "Shuffle" button -->
+    <style name="Widget.MaterialComponents.Button.Highlighted" parent="@style/Widget.MaterialComponents.Button.TextButton">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:clickable">true</item>
+        <item name="android:focusable">true</item>
+        <item name="android:layout_marginStart">@dimen/margin_small</item>
+        <item name="android:layout_marginEnd">@dimen/margin_medium</item>
+        <item name="android:theme">@style/Theme.MaterialComponents</item>
+        <item name="rippleColor">@color/selection_color</item>
+        <item name="fontFamily">@font/inter_semibold</item>
+        <item name="textAllCaps">false</item>
+        <item name="android:textColor">@color/background</item>
+        <item name="cornerRadius">0dp</item>
+    </style>
 </resources>
\ No newline at end of file