diff --git a/app/src/main/java/com/battlelancer/seriesguide/movies/details/MovieDetailsFragment.kt b/app/src/main/java/com/battlelancer/seriesguide/movies/details/MovieDetailsFragment.kt
index 68b8514486..4f33cd9f24 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/movies/details/MovieDetailsFragment.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/movies/details/MovieDetailsFragment.kt
@@ -108,38 +108,45 @@ class MovieDetailsFragment : Fragment(), MovieActionsContract {
         binding.textViewMovieGenresLabel.isGone = true
         binding.labelMovieLastUpdated.isGone = true
 
-        // trailer button
-        binding.buttonMovieTrailer.setOnClickListener {
-            trailerYoutubeId?.let { ServiceUtils.openYoutube(it, requireContext()) }
-        }
-        binding.buttonMovieTrailer.isGone = true
-        binding.buttonMovieTrailer.isEnabled = false
-
-        // similar movies button
-        binding.buttonMovieSimilar.apply {
-            setOnClickListener {
-                movieDetails?.tmdbMovie()
-                    ?.title
-                    ?.let {
-                        startActivity(SimilarMoviesActivity.intent(requireContext(), tmdbId, it))
-                    }
+        // some action buttons
+        binding.containerMovieButtons.apply {
+            root.isGone = true
+            // trailer button
+            buttonMovieTrailer.apply {
+                setOnClickListener {
+                    trailerYoutubeId?.let { ServiceUtils.openYoutube(it, requireContext()) }
+                }
+                isEnabled = false
+            }
+            // similar movies button
+            buttonMovieSimilar.apply {
+                setOnClickListener {
+                    movieDetails?.tmdbMovie()
+                        ?.title
+                        ?.let {
+                            startActivity(
+                                SimilarMoviesActivity.intent(
+                                    requireContext(),
+                                    tmdbId,
+                                    it
+                                )
+                            )
+                        }
+                }
             }
-            isGone = true
+            buttonMovieCheckIn.setOnClickListener { onButtonCheckInClick() }
+            TooltipCompat.setTooltipText(
+                buttonMovieCheckIn,
+                buttonMovieCheckIn.contentDescription
+            )
+            StreamingSearch.initButtons(
+                buttonMovieStreamingSearch,
+                buttonMovieStreamingSearchInfo,
+                parentFragmentManager
+            )
         }
-
-        // important action buttons
-        binding.containerMovieButtons.root.isGone = true
-        binding.containerMovieButtons.buttonMovieCheckIn.setOnClickListener { onButtonCheckInClick() }
-        StreamingSearch.initButtons(
-            binding.containerMovieButtons.buttonMovieStreamingSearch,
-            binding.containerMovieButtons.buttonMovieStreamingSearchInfo,
-            parentFragmentManager
-        )
+        // ratings
         binding.containerRatings.root.isGone = true
-        TooltipCompat.setTooltipText(
-            binding.containerMovieButtons.buttonMovieCheckIn,
-            binding.containerMovieButtons.buttonMovieCheckIn.contentDescription
-        )
 
         // language button
         binding.buttonMovieLanguage.isGone = true
@@ -151,9 +158,6 @@ class MovieDetailsFragment : Fragment(), MovieActionsContract {
             MovieLocalizationDialogFragment.show(parentFragmentManager)
         }
 
-        // comments button
-        binding.buttonMovieComments.isGone = true
-
         // cast and crew
         setCastVisibility(false)
         setCrewVisibility(false)
@@ -192,7 +196,7 @@ class MovieDetailsFragment : Fragment(), MovieActionsContract {
         model.watchProvider.observe(viewLifecycleOwner) { watchInfo ->
             StreamingSearch.configureButton(
                 binding.containerMovieButtons.buttonMovieStreamingSearch,
-                watchInfo
+                watchInfo, true
             )
         }
 
@@ -344,11 +348,6 @@ class MovieDetailsFragment : Fragment(), MovieActionsContract {
         }
         binding.textViewMovieDate.text = releaseAndRuntime.toString()
 
-        // show trailer button (but trailer is loaded separately, just for animation)
-        binding.buttonMovieTrailer.isGone = false
-        // movie title should be available now, can show similar movies button
-        binding.buttonMovieSimilar.isGone = false
-
         // hide check-in if not connected to trakt or hexagon is enabled
         val isConnectedToTrakt = TraktCredentials.get(requireContext()).hasCredentials()
         val hideCheckIn = !isConnectedToTrakt || HexagonSettings.isEnabled(requireContext())
@@ -437,7 +436,18 @@ class MovieDetailsFragment : Fragment(), MovieActionsContract {
             }
         }
 
-        // show button bar
+        // trakt comments link
+        binding.containerMovieButtons.buttonMovieComments.apply {
+            setOnClickListener { v ->
+                val tmdbId = tmdbId
+                if (tmdbId > 0) {
+                    val i = TraktCommentsActivity.intentMovie(requireContext(), movieTitle, tmdbId)
+                    Utils.startActivityWithAnimation(activity, i, v)
+                }
+            }
+        }
+
+        // show buttons after configuring them
         binding.containerMovieButtons.root.isGone = false
 
         // language button
@@ -496,16 +506,6 @@ class MovieDetailsFragment : Fragment(), MovieActionsContract {
         binding.textMovieLastUpdated.text =
             TimeTools.formatToLocalDateAndTime(requireContext(), movieDetails.lastUpdatedMillis)
 
-        // trakt comments link
-        binding.buttonMovieComments.setOnClickListener { v ->
-            val tmdbId = tmdbId
-            if (tmdbId > 0) {
-                val i = TraktCommentsActivity.intentMovie(requireContext(), movieTitle, tmdbId)
-                Utils.startActivityWithAnimation(activity, i, v)
-            }
-        }
-        binding.buttonMovieComments.isGone = false
-
         // load poster, cache on external storage
         if (tmdbMovie.poster_path.isNullOrEmpty()) {
             binding.frameLayoutMoviePoster.isClickable = false
@@ -791,7 +791,7 @@ class MovieDetailsFragment : Fragment(), MovieActionsContract {
         ) {
             if (videoId != null) {
                 this@MovieDetailsFragment.trailerYoutubeId = videoId
-                binding.buttonMovieTrailer.isEnabled = true
+                binding.containerMovieButtons.buttonMovieTrailer.isEnabled = true
             }
         }
 
diff --git a/app/src/main/res/layout-w1024dp/fragment_movie.xml b/app/src/main/res/layout-w1024dp/fragment_movie.xml
index 45760442e6..1a501f77fb 100644
--- a/app/src/main/res/layout-w1024dp/fragment_movie.xml
+++ b/app/src/main/res/layout-w1024dp/fragment_movie.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!-- SPDX-License-Identifier: Apache-2.0 -->
+<!-- Copyright 2016-2018, 2020, 2022, 2023 Uwe Trottmann -->
+
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -78,7 +82,7 @@
                             android:layout_toRightOf="@id/frameLayoutMoviePoster"
                             android:background="?attr/selectableItemBackground"
                             android:focusable="true"
-                            android:textAppearance="@style/TextAppearance.SeriesGuide.Headline5"
+                            android:textAppearance="@style/TextAppearance.SeriesGuide.Headline6"
                             tools:text="Awesome Movie Title" />
 
                         <TextView
@@ -94,31 +98,6 @@
                             android:textAppearance="@style/TextAppearance.SeriesGuide.Caption"
                             tools:text="20 Oct 2013" />
 
-                        <Button
-                            android:id="@+id/buttonMovieTrailer"
-                            style="@style/Widget.SeriesGuide.Button.Borderless.Default"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_below="@+id/textViewMovieDate"
-                            android:layout_marginRight="@dimen/large_padding"
-                            android:layout_toRightOf="@id/frameLayoutMoviePoster"
-                            android:text="@string/trailer"
-                            app:icon="@drawable/ic_movie_white_24dp"
-                            app:iconGravity="start" />
-
-                        <Button
-                            android:id="@+id/buttonMovieSimilar"
-                            style="@style/Widget.SeriesGuide.Button.Borderless.Default"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_below="@+id/buttonMovieTrailer"
-                            android:layout_marginRight="@dimen/large_padding"
-                            android:layout_marginBottom="@dimen/large_padding"
-                            android:layout_toRightOf="@id/frameLayoutMoviePoster"
-                            android:text="@string/title_similar_movies"
-                            app:icon="@drawable/ic_search_white_24dp"
-                            app:iconGravity="start" />
-
                     </RelativeLayout>
 
                     <include
@@ -225,32 +204,11 @@
                         android:layout_marginBottom="@dimen/default_padding"
                         android:background="?attr/sgColorDivider" />
 
-                    <Button
-                        android:id="@+id/buttonMovieComments"
-                        style="@style/Widget.SeriesGuide.Button.Borderless.Sheet"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@+id/dividerMovie2"
-                        android:text="@string/comments"
-                        app:icon="@drawable/ic_forum_black_24dp"
-                        app:iconGravity="start" />
-
-                    <View
-                        android:id="@+id/dividerMovie3"
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:layout_below="@+id/buttonMovieComments"
-                        android:layout_marginLeft="72dp"
-                        android:layout_marginTop="@dimen/default_padding"
-                        android:layout_marginRight="@dimen/large_padding"
-                        android:layout_marginBottom="@dimen/default_padding"
-                        android:background="?attr/sgColorDivider" />
-
                     <LinearLayout
                         android:id="@+id/containerMovieActions"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_below="@id/dividerMovie3"
+                        android:layout_below="@id/dividerMovie2"
                         android:orientation="vertical" />
 
                 </RelativeLayout>
diff --git a/app/src/main/res/layout-w590dp/fragment_movie.xml b/app/src/main/res/layout-w590dp/fragment_movie.xml
index 560c7f51bd..fb6a0d9ce3 100644
--- a/app/src/main/res/layout-w590dp/fragment_movie.xml
+++ b/app/src/main/res/layout-w590dp/fragment_movie.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!-- SPDX-License-Identifier: Apache-2.0 -->
+<!-- Copyright 2016-2018, 2020, 2022, 2023 Uwe Trottmann -->
+
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/rootLayoutMovie"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -33,8 +37,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:animateLayoutChanges="true"
-                android:paddingBottom="@dimen/large_padding"
-                android:paddingTop="@dimen/large_padding">
+                android:paddingTop="@dimen/large_padding"
+                android:paddingBottom="@dimen/large_padding">
 
                 <!-- Wrap in container to support reeeeally long movie titles. -->
                 <RelativeLayout
@@ -61,41 +65,18 @@
 
                     </com.google.android.material.card.MaterialCardView>
 
-                    <Button
-                        android:id="@+id/buttonMovieTrailer"
-                        style="@style/Widget.SeriesGuide.Button.Borderless.Default"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentEnd="true"
-                        android:layout_marginRight="@dimen/padding_button"
-                        android:text="@string/trailer"
-                        app:icon="@drawable/ic_movie_white_24dp"
-                        app:iconGravity="start" />
-
-                    <Button
-                        android:id="@+id/buttonMovieSimilar"
-                        style="@style/Widget.SeriesGuide.Button.Borderless.Default"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentEnd="true"
-                        android:layout_marginRight="@dimen/padding_button"
-                        android:layout_below="@id/buttonMovieTrailer"
-                        android:text="@string/title_similar_movies"
-                        app:icon="@drawable/ic_search_white_24dp"
-                        app:iconGravity="start" />
-
                     <TextView
                         android:id="@+id/textViewMovieTitle"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="@dimen/default_padding"
-                        android:layout_marginTop="@dimen/inline_padding"
-                        android:layout_marginRight="@dimen/inline_padding"
-                        android:layout_toRightOf="@id/frameLayoutMoviePoster"
-                        android:layout_toLeftOf="@id/buttonMovieSimilar"
+                        android:layout_alignParentEnd="true"
+                        android:layout_marginStart="8dp"
+                        android:layout_marginTop="4dp"
+                        android:layout_marginEnd="8dp"
+                        android:layout_toEndOf="@id/frameLayoutMoviePoster"
                         android:background="?attr/selectableItemBackground"
                         android:focusable="true"
-                        android:textAppearance="@style/TextAppearance.SeriesGuide.Headline5"
+                        android:textAppearance="@style/TextAppearance.SeriesGuide.Headline6"
                         tools:text="Awesome Movie Title" />
 
                     <TextView
@@ -103,9 +84,10 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_below="@+id/textViewMovieTitle"
-                        android:layout_marginLeft="@dimen/default_padding"
-                        android:layout_marginRight="@dimen/large_padding"
-                        android:layout_toRightOf="@id/frameLayoutMoviePoster"
+                        android:layout_alignParentEnd="true"
+                        android:layout_marginStart="@dimen/default_padding"
+                        android:layout_marginEnd="@dimen/large_padding"
+                        android:layout_toEndOf="@id/frameLayoutMoviePoster"
                         android:background="?attr/selectableItemBackground"
                         android:focusable="true"
                         android:textAppearance="@style/TextAppearance.SeriesGuide.Caption"
@@ -116,8 +98,9 @@
                         layout="@layout/buttons_movie"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_below="@+id/buttonMovieSimilar"
-                        android:layout_toRightOf="@id/frameLayoutMoviePoster" />
+                        android:layout_below="@+id/textViewMovieDate"
+                        android:layout_marginTop="8dp"
+                        android:layout_toEndOf="@id/frameLayoutMoviePoster" />
 
                 </RelativeLayout>
 
@@ -155,8 +138,8 @@
                         android:layout_width="match_parent"
                         android:layout_height="1dp"
                         android:layout_marginLeft="@dimen/large_padding"
-                        android:layout_marginRight="@dimen/large_padding"
                         android:layout_marginTop="@dimen/large_padding"
+                        android:layout_marginRight="@dimen/large_padding"
                         android:background="?attr/sgColorDivider" />
 
                     <include
@@ -214,31 +197,12 @@
                         android:id="@+id/dividerMovie3"
                         android:layout_width="match_parent"
                         android:layout_height="1dp"
-                        android:layout_marginBottom="@dimen/default_padding"
                         android:layout_marginLeft="@dimen/large_padding"
                         android:layout_marginRight="@dimen/large_padding"
+                        android:layout_marginBottom="@dimen/default_padding"
                         android:background="?attr/sgColorDivider"
                         tools:ignore="UnknownIdInLayout" />
 
-                    <Button
-                        android:id="@+id/buttonMovieComments"
-                        style="@style/Widget.SeriesGuide.Button.Borderless.Sheet"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="@string/comments"
-                        app:icon="@drawable/ic_forum_black_24dp"
-                        app:iconGravity="start" />
-
-                    <View
-                        android:id="@+id/dividerMovie4"
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:layout_marginBottom="@dimen/default_padding"
-                        android:layout_marginLeft="72dp"
-                        android:layout_marginRight="@dimen/large_padding"
-                        android:layout_marginTop="@dimen/default_padding"
-                        android:background="?attr/sgColorDivider" />
-
                     <LinearLayout
                         android:id="@+id/containerMovieActions"
                         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/buttons_movie.xml b/app/src/main/res/layout/buttons_movie.xml
index 3ad33a4baf..86f485853d 100644
--- a/app/src/main/res/layout/buttons_movie.xml
+++ b/app/src/main/res/layout/buttons_movie.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!-- SPDX-License-Identifier: Apache-2.0 -->
+<!-- Copyright 2014-2018, 2020, 2021, 2023 Uwe Trottmann -->
+
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -42,56 +46,86 @@
 
     </LinearLayout>
 
-    <View
-        android:id="@+id/dividerMovieButtons"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginLeft="@dimen/large_padding"
-        android:layout_marginRight="@dimen/large_padding"
-        android:background="?attr/sgColorDivider" />
-
-    <Button
-        android:id="@+id/buttonMovieCheckIn"
-        style="@style/Widget.SeriesGuide.Button.Borderless.Caption"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/padding_button"
-        android:layout_marginRight="@dimen/padding_button"
-        android:contentDescription="@string/checkin"
-        android:gravity="center_vertical|start"
-        android:text="@string/checkin"
-        app:icon="@drawable/ic_checkin_black_24dp" />
-
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/containerMovieStreamingSearch"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/padding_button"
+        android:layout_marginTop="12dp"
         android:layout_marginEnd="@dimen/padding_button">
 
+        <androidx.constraintlayout.helper.widget.Flow
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:constraint_referenced_ids="buttonMovieTrailer,buttonMovieSimilar,buttonMovieComments,buttonMovieCheckIn,buttonMovieStreamingSearch,buttonMovieStreamingSearchInfo"
+            app:flow_horizontalBias="0"
+            app:flow_horizontalGap="4dp"
+            app:flow_horizontalStyle="packed"
+            app:flow_wrapMode="chain"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <Button
+            android:id="@+id/buttonMovieTrailer"
+            style="@style/Widget.SeriesGuide.Button.Outlined.Icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/trailer"
+            app:icon="@drawable/ic_movie_white_24dp"
+            app:iconGravity="start" />
+
+        <Button
+            android:id="@+id/buttonMovieSimilar"
+            style="@style/Widget.SeriesGuide.Button.Outlined.Icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawablePadding="@dimen/default_padding"
+            android:text="@string/action_similar"
+            app:icon="@drawable/ic_search_white_24dp"
+            app:iconGravity="start" />
+
+        <Button
+            android:id="@+id/buttonMovieComments"
+            style="@style/Widget.SeriesGuide.Button.Outlined.Icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/comments"
+            app:icon="@drawable/ic_forum_black_24dp"
+            app:iconGravity="start" />
+
+        <Button
+            android:id="@+id/buttonMovieCheckIn"
+            style="@style/Widget.SeriesGuide.Button.Outlined.Icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:contentDescription="@string/checkin"
+            android:text="@string/checkin"
+            app:icon="@drawable/ic_checkin_black_24dp"
+            app:iconGravity="start" />
+
         <Button
             android:id="@+id/buttonMovieStreamingSearch"
-            style="@style/Widget.SeriesGuide.Button.Borderless.Caption"
-            android:layout_width="0dp"
+            style="@style/Widget.SeriesGuide.Button.Outlined.Icon"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:contentDescription="@string/action_stream"
-            android:gravity="center_vertical|start"
             android:text="@string/action_stream"
-            app:icon="@drawable/ic_play_arrow_black_24dp"
-            app:layout_constraintEnd_toStartOf="@+id/buttonMovieStreamingSearchInfo"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:icon="@drawable/ic_play_arrow_black_24dp" />
 
-        <ImageButton
+        <!-- Note: can not wrap in LinearLayout to keep close to search button as it would
+             grow out of bounds if long. -->
+        <Button
             android:id="@+id/buttonMovieStreamingSearchInfo"
-            style="?attr/borderlessButtonStyle"
+            style="@style/Widget.SeriesGuide.Button.IconButton.Outlined"
             android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:background="?attr/selectableItemBackgroundBorderless"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="0dp"
             android:contentDescription="@string/action_stream_info"
-            android:src="@drawable/ic_settings_control_24dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            android:insetLeft="0dp"
+            android:insetRight="8dp"
+            app:icon="@drawable/ic_settings_control_24dp" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/fragment_movie.xml b/app/src/main/res/layout/fragment_movie.xml
index fc506145cb..930856bfbb 100644
--- a/app/src/main/res/layout/fragment_movie.xml
+++ b/app/src/main/res/layout/fragment_movie.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!-- SPDX-License-Identifier: Apache-2.0 -->
+<!-- Copyright 2013-2018, 2020, 2022, 2023 Uwe Trottmann -->
+
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -81,31 +85,6 @@
                     android:textAppearance="@style/TextAppearance.SeriesGuide.Caption"
                     tools:text="20 Oct 2013" />
 
-                <Button
-                    android:id="@+id/buttonMovieTrailer"
-                    style="@style/Widget.SeriesGuide.Button.Borderless.Default"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@+id/textViewMovieDate"
-                    android:layout_marginRight="@dimen/large_padding"
-                    android:layout_toRightOf="@id/frameLayoutMoviePoster"
-                    android:text="@string/trailer"
-                    app:icon="@drawable/ic_movie_white_24dp"
-                    app:iconGravity="start" />
-
-                <Button
-                    android:id="@+id/buttonMovieSimilar"
-                    style="@style/Widget.SeriesGuide.Button.Borderless.Default"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@+id/buttonMovieTrailer"
-                    android:layout_marginRight="@dimen/large_padding"
-                    android:layout_marginBottom="@dimen/large_padding"
-                    android:layout_toRightOf="@id/frameLayoutMoviePoster"
-                    android:text="@string/title_similar_movies"
-                    app:icon="@drawable/ic_search_white_24dp"
-                    app:iconGravity="start" />
-
             </RelativeLayout>
 
             <include
@@ -115,23 +94,12 @@
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/containerMovieHeader" />
 
-            <View
-                android:id="@+id/dividerMovie0"
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_below="@id/containerMovieButtons"
-                android:layout_marginBottom="@dimen/inline_padding"
-                android:layout_marginLeft="@dimen/large_padding"
-                android:layout_marginRight="@dimen/large_padding"
-                android:background="?attr/sgColorDivider"
-                tools:ignore="UnknownIdInLayout" />
-
             <Button
                 android:id="@+id/buttonMovieLanguage"
                 style="@style/Widget.SeriesGuide.Button.Borderless.Default"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_below="@+id/dividerMovie0"
+                android:layout_below="@+id/containerMovieButtons"
                 android:layout_marginLeft="@dimen/padding_button"
                 android:layout_marginRight="@dimen/padding_button"
                 app:icon="@drawable/ic_language_white_24dp"
@@ -232,31 +200,11 @@
                 android:layout_marginTop="@dimen/inline_padding"
                 android:background="?attr/sgColorDivider" />
 
-            <Button
-                android:id="@+id/buttonMovieComments"
-                style="@style/Widget.SeriesGuide.Button.Borderless.Sheet"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/dividerMovie3"
-                android:text="@string/comments"
-                app:icon="@drawable/ic_forum_black_24dp"
-                app:iconGravity="start" />
-
-            <View
-                android:id="@+id/dividerMovie4"
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_below="@id/buttonMovieComments"
-                android:layout_marginBottom="@dimen/default_padding"
-                android:layout_marginLeft="72dp"
-                android:layout_marginTop="@dimen/default_padding"
-                android:background="?attr/sgColorDivider" />
-
             <LinearLayout
                 android:id="@+id/containerMovieActions"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_below="@+id/dividerMovie4"
+                android:layout_below="@+id/dividerMovie3"
                 android:orientation="vertical" />
 
         </RelativeLayout>