diff --git a/JellyfinPlayer tvOS/MovieItemView.swift b/JellyfinPlayer tvOS/MovieItemView.swift
index fe3be443..20967097 100644
--- a/JellyfinPlayer tvOS/MovieItemView.swift	
+++ b/JellyfinPlayer tvOS/MovieItemView.swift	
@@ -129,7 +129,7 @@ struct MovieItemView: View {
                                 .fontWeight(.medium)
                                 .foregroundColor(.primary)
 
-                            MediaPlayButtonRowView(viewModel: self.viewModel, wrappedScrollView: self.wrappedScrollView)
+                            MediaPlayButtonRowView(viewModel: viewModel, wrappedScrollView: wrappedScrollView)
                             .padding(.top, 15)
                             .addFocusGuide(using: focusBag, name: "actionButtons", destinations: [.bottom: "moreLikeThis"], debug: false)
                         }
diff --git a/JellyfinPlayer tvOS/SeriesItemView.swift b/JellyfinPlayer tvOS/SeriesItemView.swift
index cab03c10..922a25d8 100644
--- a/JellyfinPlayer tvOS/SeriesItemView.swift	
+++ b/JellyfinPlayer tvOS/SeriesItemView.swift	
@@ -135,35 +135,8 @@ struct SeriesItemView: View {
                                 .fontWeight(.medium)
                                 .foregroundColor(.primary)
 
-                            HStack {
-                                VStack {
-                                    Button {
-                                        viewModel.updateFavoriteState()
-                                    } label: {
-                                        MediaViewActionButton(icon: "heart.fill", scrollView: $wrappedScrollView, iconColor: viewModel.isFavorited ? .red : .white)
-                                    }.prefersDefaultFocus(in: namespace)
-                                    Text(viewModel.isFavorited ? "Unfavorite" : "Favorite")
-                                        .font(.caption)
-                                }
-                                if viewModel.nextUpItem != nil {
-                                    VStack {
-                                        NavigationLink(destination: VideoPlayerView(item: viewModel.nextUpItem!)) {
-                                            MediaViewActionButton(icon: "play.fill", scrollView: $wrappedScrollView)
-                                        }
-                                        Text("Play • \(viewModel.nextUpItem!.getEpisodeLocator())")
-                                            .font(.caption)
-                                    }
-                                }
-                                VStack {
-                                    Button {
-                                        viewModel.updateWatchState()
-                                    } label: {
-                                        MediaViewActionButton(icon: "eye.fill", scrollView: $wrappedScrollView, iconColor: viewModel.isWatched ? .red : .white)
-                                    }
-                                    Text(viewModel.isWatched ? "Unwatch" : "Mark Watched")
-                                        .font(.caption)
-                                }
-                            }.padding(.top, 15)
+                            MediaPlayButtonRowView(viewModel: viewModel, wrappedScrollView: wrappedScrollView)
+                            .padding(.top, 15)
                             Spacer()
                         }
                     }.padding(.top, 50)