diff --git a/app/src/main/res/layout/fragment_show_narrow.xml b/app/src/main/res/layout/fragment_show_narrow.xml
index f2a72e4e34..e5023ab293 100644
--- a/app/src/main/res/layout/fragment_show_narrow.xml
+++ b/app/src/main/res/layout/fragment_show_narrow.xml
@@ -162,48 +162,64 @@
 
         </com.google.android.material.card.MaterialCardView>
 
-        <Button
-            android:id="@+id/buttonShowTrailer"
-            style="@style/Widget.SeriesGuide.Button.Borderless.Sheet"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/constraintLayoutShowButtons"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/trailer"
-            app:icon="@drawable/ic_movie_white_24dp"
-            app:iconGravity="start" />
-
-        <Button
-            android:id="@+id/buttonShowSimilar"
-            style="@style/Widget.SeriesGuide.Button.Borderless.Sheet"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/title_similar_shows"
-            app:icon="@drawable/ic_search_white_24dp"
-            app:iconGravity="start" />
-
-        <Button
-            android:id="@+id/buttonShowShare"
-            style="@style/Widget.SeriesGuide.Button.Borderless.Sheet"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/share_show"
-            app:icon="@drawable/ic_share_white_24dp"
-            app:iconGravity="start" />
-
-        <Button
-            android:id="@+id/buttonShowComments"
-            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:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginLeft="@dimen/large_padding"
-            android:layout_marginRight="@dimen/large_padding"
-            android:background="?attr/sgColorDivider" />
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp">
+
+            <androidx.constraintlayout.helper.widget.Flow
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                app:constraint_referenced_ids="buttonShowTrailer,buttonShowSimilar,buttonShowShare,buttonShowComments"
+                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/buttonShowTrailer"
+                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/buttonShowSimilar"
+                style="@style/Widget.SeriesGuide.Button.Outlined.Icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/title_similar_shows"
+                app:icon="@drawable/ic_search_white_24dp"
+                app:iconGravity="start" />
+
+            <Button
+                android:id="@+id/buttonShowShare"
+                style="@style/Widget.SeriesGuide.Button.Outlined.Icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/share_show"
+                app:icon="@drawable/ic_share_white_24dp"
+                app:iconGravity="start" />
+
+            <Button
+                android:id="@+id/buttonShowComments"
+                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" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <include
             android:id="@+id/containerRatings"
diff --git a/app/src/main/res/layout/fragment_show_regular.xml b/app/src/main/res/layout/fragment_show_regular.xml
index ceceb6e315..ed78e88de6 100644
--- a/app/src/main/res/layout/fragment_show_regular.xml
+++ b/app/src/main/res/layout/fragment_show_regular.xml
@@ -155,48 +155,64 @@
 
         </com.google.android.material.card.MaterialCardView>
 
-        <Button
-            android:id="@+id/buttonShowTrailer"
-            style="@style/Widget.SeriesGuide.Button.Borderless.Sheet"
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/constraintLayoutShowButtons"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/trailer"
-            app:icon="@drawable/ic_movie_white_24dp"
-            app:iconGravity="start" />
-
-        <Button
-            android:id="@+id/buttonShowSimilar"
-            style="@style/Widget.SeriesGuide.Button.Borderless.Sheet"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/title_similar_shows"
-            app:icon="@drawable/ic_search_white_24dp"
-            app:iconGravity="start" />
-
-        <Button
-            android:id="@+id/buttonShowShare"
-            style="@style/Widget.SeriesGuide.Button.Borderless.Sheet"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/share_show"
-            app:icon="@drawable/ic_share_white_24dp"
-            app:iconGravity="start" />
-
-        <Button
-            android:id="@+id/buttonShowComments"
-            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:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginLeft="@dimen/large_padding"
-            android:layout_marginRight="@dimen/large_padding"
-            android:background="?attr/sgColorDivider" />
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginEnd="8dp">
+
+            <androidx.constraintlayout.helper.widget.Flow
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                app:constraint_referenced_ids="buttonShowTrailer,buttonShowSimilar,buttonShowShare,buttonShowComments"
+                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/buttonShowTrailer"
+                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/buttonShowSimilar"
+                style="@style/Widget.SeriesGuide.Button.Outlined.Icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/title_similar_shows"
+                app:icon="@drawable/ic_search_white_24dp"
+                app:iconGravity="start" />
+
+            <Button
+                android:id="@+id/buttonShowShare"
+                style="@style/Widget.SeriesGuide.Button.Outlined.Icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/share_show"
+                app:icon="@drawable/ic_share_white_24dp"
+                app:iconGravity="start" />
+
+            <Button
+                android:id="@+id/buttonShowComments"
+                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" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <include
             android:id="@+id/containerRatings"