diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/episodes/EpisodeDetailsFragment.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/episodes/EpisodeDetailsFragment.kt
index eadb765867..e4650b03da 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/shows/episodes/EpisodeDetailsFragment.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/shows/episodes/EpisodeDetailsFragment.kt
@@ -128,31 +128,32 @@ class EpisodeDetailsFragment : Fragment(), EpisodeActionsContract {
 
         bindingRatings!!.textViewRatingsRange.text = getString(R.string.format_rating_range, 10)
 
-        StreamingSearch.initButtons(
-            bindingButtons!!.buttonEpisodeStreamingSearch,
-            bindingButtons!!.buttonEpisodeStreamingSearchInfo,
-            parentFragmentManager
-        )
-
-        // other bottom buttons
-        bindingBottom!!.buttonEpisodeShare.setOnClickListener { shareEpisode() }
-        bindingBottom!!.buttonEpisodeCalendar.setOnClickListener {
-            val show = show
-            val episode = episode
-            if (show != null && episode != null) {
-                ShareUtils.suggestCalendarEvent(
-                    requireContext(),
-                    show.title,
-                    TextTools.getNextEpisodeString(
+        // Episode action buttons
+        bindingButtons!!.apply {
+            buttonEpisodeShare.setOnClickListener { shareEpisode() }
+            buttonEpisodeCalendar.setOnClickListener {
+                val show = show
+                val episode = episode
+                if (show != null && episode != null) {
+                    ShareUtils.suggestCalendarEvent(
                         requireContext(),
-                        episode.season,
-                        episode.number,
-                        episodeTitle
-                    ),
-                    episode.firstReleasedMs,
-                    show.runtime
-                )
+                        show.title,
+                        TextTools.getNextEpisodeString(
+                            requireContext(),
+                            episode.season,
+                            episode.number,
+                            episodeTitle
+                        ),
+                        episode.firstReleasedMs,
+                        show.runtime
+                    )
+                }
             }
+            StreamingSearch.initButtons(
+                buttonEpisodeStreamingSearch,
+                buttonEpisodeStreamingSearchInfo,
+                parentFragmentManager
+            )
         }
 
         // set up long-press to copy text to clipboard (d-pad friendly vs text selection)
@@ -193,7 +194,7 @@ class EpisodeDetailsFragment : Fragment(), EpisodeActionsContract {
             if (watchInfo != null && b != null) {
                 StreamingSearch.configureButton(
                     b.includeButtons.buttonEpisodeStreamingSearch,
-                    watchInfo
+                    watchInfo, replaceButtonText = true
                 )
             }
         }
@@ -611,6 +612,16 @@ class EpisodeDetailsFragment : Fragment(), EpisodeActionsContract {
                 )
             )
         }
+
+        // Trakt comments
+        bindingButtons.buttonEpisodeComments.setOnClickListener { v: View? ->
+            val episodeId = episodeId
+            if (episodeId > 0) {
+                val intent =
+                    TraktCommentsActivity.intentEpisode(requireContext(), episodeTitle, episodeId)
+                Utils.startActivityWithAnimation(requireActivity(), intent, v)
+            }
+        }
     }
 
     private fun updateSecondaryButtons(episode: SgEpisode2, show: SgShow2) {
@@ -638,16 +649,6 @@ class EpisodeDetailsFragment : Fragment(), EpisodeActionsContract {
                 TmdbTools.buildEpisodeUrl(show.tmdbId, episode.season, episode.number)
             )
         }
-
-        // Trakt comments
-        bindingBottom.buttonEpisodeComments.setOnClickListener { v: View? ->
-            val episodeId = episodeId
-            if (episodeId > 0) {
-                val intent =
-                    TraktCommentsActivity.intentEpisode(requireContext(), episodeTitle, episodeId)
-                Utils.startActivityWithAnimation(requireActivity(), intent, v)
-            }
-        }
     }
 
     private fun loadTraktRatings() {
diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/overview/OverviewFragment.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/overview/OverviewFragment.kt
index 06ec12d959..129cbc8d4b 100644
--- a/app/src/main/java/com/battlelancer/seriesguide/shows/overview/OverviewFragment.kt
+++ b/app/src/main/java/com/battlelancer/seriesguide/shows/overview/OverviewFragment.kt
@@ -172,6 +172,15 @@ class OverviewFragment() : Fragment(), EpisodeActionsContract {
                 buttonEpisodeWatched.setOnClickListener { onButtonWatchedClick() }
                 buttonEpisodeCollected.setOnClickListener { onButtonCollectedClick() }
                 buttonEpisodeSkip.setOnClickListener { onButtonSkipClicked() }
+                buttonEpisodeShare.setOnClickListener { shareEpisode() }
+                buttonEpisodeCalendar.setOnClickListener { createCalendarEvent() }
+                buttonEpisodeComments.setOnClickListener {
+                    onButtonCommentsClick(buttonEpisodeComments)
+                }
+                initButtons(
+                    buttonEpisodeStreamingSearch, buttonEpisodeStreamingSearchInfo,
+                    parentFragmentManager
+                )
 
                 TooltipCompat.setTooltipText(
                     buttonEpisodeCheckin,
@@ -185,10 +194,6 @@ class OverviewFragment() : Fragment(), EpisodeActionsContract {
                     buttonEpisodeSkip,
                     buttonEpisodeSkip.contentDescription
                 )
-                initButtons(
-                    buttonEpisodeStreamingSearch, buttonEpisodeStreamingSearchInfo,
-                    parentFragmentManager
-                )
             }
 
             // ratings
@@ -201,14 +206,6 @@ class OverviewFragment() : Fragment(), EpisodeActionsContract {
                 textViewRatingsRange.text = getString(R.string.format_rating_range, 10)
             }
 
-            with(includeServices.includeMore) {
-                buttonEpisodeShare.setOnClickListener { shareEpisode() }
-                buttonEpisodeCalendar.setOnClickListener { createCalendarEvent() }
-                buttonEpisodeComments.setOnClickListener {
-                    onButtonCommentsClick(buttonEpisodeComments)
-                }
-            }
-
             // set up long-press to copy text to clipboard (d-pad friendly vs text selection)
             textViewEpisodeDescription.copyTextToClipboardOnLongClick()
             textGuestStars.copyTextToClipboardOnLongClick()
@@ -244,7 +241,7 @@ class OverviewFragment() : Fragment(), EpisodeActionsContract {
                 this.binding?.let {
                     StreamingSearch.configureButton(
                         it.includeButtons.buttonEpisodeStreamingSearch,
-                        watchInfo
+                        watchInfo, replaceButtonText = true
                     )
                 }
             }
@@ -527,18 +524,15 @@ class OverviewFragment() : Fragment(), EpisodeActionsContract {
         }
 
         // dvd number
-        var isShowingMeta = ViewTools.setLabelValueOrHide(
+        ViewTools.setLabelValueOrHide(
             binding.labelDvdNumber, binding.textDvdNumber, episode.dvdNumber
         )
         // guest stars
-        isShowingMeta = isShowingMeta or ViewTools.setLabelValueOrHide(
+        ViewTools.setLabelValueOrHide(
             binding.labelGuestStars,
             binding.textGuestStars,
             TextTools.splitPipeSeparatedStrings(episode.guestStars)
         )
-        // hide divider if no meta is visible
-        binding.dividerOverviewEpisodeDetails.visibility =
-            if (isShowingMeta) View.VISIBLE else View.GONE
 
         // Trakt rating
         binding.includeRatings.also {
diff --git a/app/src/main/res/layout/buttons_episode.xml b/app/src/main/res/layout/buttons_episode.xml
index 62c54fec5d..68fa694dc2 100644
--- a/app/src/main/res/layout/buttons_episode.xml
+++ b/app/src/main/res/layout/buttons_episode.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
+<!-- SPDX-License-Identifier: Apache-2.0 -->
+<!-- Copyright 2014-2021, 2023 Uwe Trottmann -->
+
 <!-- Will never be a root layout, overdraw is expected -->
 <!-- Need to define root ID in include tag or view binding breaks. -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -47,69 +50,97 @@
 
     </LinearLayout>
 
-    <View
-        android:id="@+id/dividerEpisodeButtons"
-        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/buttonEpisodeCheckin"
-        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:nextFocusUp="@+id/buttonEpisodeWatched"
-        android:text="@string/checkin"
-        app:icon="@drawable/ic_checkin_black_24dp" />
-
-    <Button
-        android:id="@+id/buttonEpisodeWatchedUpTo"
-        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/action_watched_up_to"
-        android:gravity="center_vertical|start"
-        android:text="@string/action_watched_up_to"
-        app:icon="@drawable/ic_watch_all_black_24dp" />
-
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/containerEpisodeStreamingSearch"
+        android:id="@+id/constraintLayoutEpisodeButtons"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/padding_button"
-        android:layout_marginEnd="@dimen/padding_button">
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="4dp"
+        android:layout_marginEnd="16dp">
+
+        <androidx.constraintlayout.helper.widget.Flow
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:constraint_referenced_ids="buttonEpisodeCheckin,buttonEpisodeWatchedUpTo,buttonEpisodeShare,buttonEpisodeCalendar,buttonEpisodeComments,buttonEpisodeStreamingSearch,buttonEpisodeStreamingSearchInfo"
+            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/buttonEpisodeCheckin"
+            style="@style/Widget.SeriesGuide.Button.Outlined.Icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:contentDescription="@string/checkin"
+            android:nextFocusUp="@+id/buttonEpisodeWatched"
+            android:text="@string/checkin"
+            app:icon="@drawable/ic_checkin_black_24dp"
+            app:iconGravity="start" />
+
+        <Button
+            android:id="@+id/buttonEpisodeWatchedUpTo"
+            style="@style/Widget.SeriesGuide.Button.Outlined.Icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:contentDescription="@string/action_watched_up_to"
+            android:text="@string/action_watched_up_to"
+            app:icon="@drawable/ic_watch_all_black_24dp"
+            app:iconGravity="start" />
+
+        <Button
+            android:id="@+id/buttonEpisodeShare"
+            style="@style/Widget.SeriesGuide.Button.Outlined.Icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/share"
+            app:icon="@drawable/ic_share_white_24dp"
+            app:iconGravity="start" />
+
+        <Button
+            android:id="@+id/buttonEpisodeCalendar"
+            style="@style/Widget.SeriesGuide.Button.Outlined.Icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/addtocalendar"
+            app:icon="@drawable/ic_event_white_24dp"
+            app:iconGravity="start" />
+
+        <Button
+            android:id="@+id/buttonEpisodeComments"
+            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/buttonEpisodeStreamingSearch"
-            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/buttonEpisodeStreamingSearchInfo"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:iconGravity="start" />
 
-        <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/buttonEpisodeStreamingSearchInfo"
-            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/buttons_episode_more.xml b/app/src/main/res/layout/buttons_episode_more.xml
index 5ecb1ce5dd..1a6f01f7e3 100644
--- a/app/src/main/res/layout/buttons_episode_more.xml
+++ b/app/src/main/res/layout/buttons_episode_more.xml
@@ -1,66 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
 
+<!-- SPDX-License-Identifier: Apache-2.0 -->
+<!-- Copyright 2014-2021, 2023 Uwe Trottmann -->
+
 <!-- Need to define root ID in include tag or view binding breaks. -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
     tools:showIn="@layout/buttons_services">
 
+    <androidx.constraintlayout.helper.widget.Flow
+        android:id="@+id/flowButtonsEpisodeMoreLinks"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:constraint_referenced_ids="buttonEpisodeTmdb,buttonEpisodeTrakt,buttonEpisodeImdb"
+        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/buttonEpisodeTmdb"
-        style="@style/Widget.SeriesGuide.Button.Borderless.Sheet"
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
+        style="@style/Widget.SeriesGuide.Button.Outlined.Icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:text="@string/tmdb"
         app:icon="@drawable/ic_link_black_24dp"
         app:iconGravity="start" />
 
     <Button
         android:id="@+id/buttonEpisodeTrakt"
-        style="@style/Widget.SeriesGuide.Button.Borderless.Sheet"
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
+        style="@style/Widget.SeriesGuide.Button.Outlined.Icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:text="@string/trakt"
         app:icon="@drawable/ic_link_black_24dp"
         app:iconGravity="start" />
 
     <Button
         android:id="@+id/buttonEpisodeImdb"
-        style="@style/Widget.SeriesGuide.Button.Borderless.Sheet"
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
+        style="@style/Widget.SeriesGuide.Button.Outlined.Icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:text="@string/imdb"
         app:icon="@drawable/ic_link_black_24dp"
         app:iconGravity="start" />
 
-    <Button
-        android:id="@+id/buttonEpisodeShare"
-        style="@style/Widget.SeriesGuide.Button.Borderless.Sheet"
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        android:text="@string/share_episode"
-        app:icon="@drawable/ic_share_white_24dp"
-        app:iconGravity="start" />
-
-    <Button
-        android:id="@+id/buttonEpisodeCalendar"
-        style="@style/Widget.SeriesGuide.Button.Borderless.Sheet"
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        android:text="@string/addtocalendar"
-        app:icon="@drawable/ic_event_white_24dp"
-        app:iconGravity="start" />
-
-    <Button
-        android:id="@+id/buttonEpisodeComments"
-        style="@style/Widget.SeriesGuide.Button.Borderless.Sheet"
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        android:text="@string/comments"
-        app:icon="@drawable/ic_forum_black_24dp"
-        app:iconGravity="start" />
-
-</LinearLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/buttons_services.xml b/app/src/main/res/layout/buttons_services.xml
index ba274c2f7f..443e0e7a35 100644
--- a/app/src/main/res/layout/buttons_services.xml
+++ b/app/src/main/res/layout/buttons_services.xml
@@ -3,25 +3,22 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingTop="@dimen/default_padding"
-    android:paddingBottom="@dimen/large_padding">
+    android:paddingTop="16dp"
+    android:paddingBottom="16dp">
 
     <include
         android:id="@+id/include_more"
-        layout="@layout/buttons_episode_more" />
-
-    <View
+        layout="@layout/buttons_episode_more"
         android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginLeft="72dp"
-        android:layout_marginTop="@dimen/default_padding"
-        android:layout_marginBottom="@dimen/default_padding"
-        android:background="?attr/sgColorDivider" />
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp" />
 
     <LinearLayout
         android:id="@+id/containerEpisodeActions"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/default_padding"
         android:orientation="vertical" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/buttons_services_wide.xml b/app/src/main/res/layout/buttons_services_wide.xml
index 9d6037d0d2..168ffde301 100644
--- a/app/src/main/res/layout/buttons_services_wide.xml
+++ b/app/src/main/res/layout/buttons_services_wide.xml
@@ -16,6 +16,7 @@
         layout="@layout/buttons_episode_more"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
         android:layout_weight="1" />
 
     <LinearLayout
diff --git a/app/src/main/res/layout/fragment_overview.xml b/app/src/main/res/layout/fragment_overview.xml
index d5e4b8bb6a..da18facd6b 100644
--- a/app/src/main/res/layout/fragment_overview.xml
+++ b/app/src/main/res/layout/fragment_overview.xml
@@ -253,19 +253,12 @@
                             android:id="@+id/includeButtons"
                             layout="@layout/buttons_episode" />
 
-                        <View
-                            android:layout_width="match_parent"
-                            android:layout_height="1dp"
-                            android:layout_marginLeft="@dimen/large_padding"
-                            android:layout_marginRight="@dimen/large_padding"
-                            android:layout_marginBottom="@dimen/large_padding"
-                            android:background="?attr/sgColorDivider" />
-
                         <TextView
                             android:id="@+id/textViewEpisodeDescription"
                             style="@style/Block.FlowText"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:layout_marginTop="16dp"
                             android:layout_marginBottom="@dimen/large_padding"
                             android:background="?attr/selectableItemBackground"
                             android:focusable="true"
@@ -324,18 +317,9 @@
                             android:focusable="true"
                             android:textAppearance="@style/TextAppearance.SeriesGuide.Body2" />
 
-                        <View
-                            android:id="@+id/dividerOverviewEpisodeDetails"
-                            android:layout_width="match_parent"
-                            android:layout_height="1dp"
-                            android:layout_marginTop="@dimen/large_padding"
-                            android:background="?attr/sgColorDivider" />
-
                         <include
                             android:id="@+id/includeServices"
-                            layout="@layout/buttons_services"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content" />
+                            layout="@layout/buttons_services" />
                     </LinearLayout>
                 </LinearLayout>
             </FrameLayout>
diff --git a/app/src/main/res/layout/layout_episode.xml b/app/src/main/res/layout/layout_episode.xml
index 37490c915c..2abd63fa86 100644
--- a/app/src/main/res/layout/layout_episode.xml
+++ b/app/src/main/res/layout/layout_episode.xml
@@ -28,8 +28,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/large_padding"
-        android:layout_marginRight="@dimen/large_padding"
         android:layout_marginTop="12dp"
+        android:layout_marginRight="@dimen/large_padding"
         android:background="?attr/selectableItemBackground"
         android:focusable="true"
         android:nextFocusDown="@+id/textViewEpisodeReleaseTime"
@@ -45,8 +45,8 @@
         android:layout_marginBottom="@dimen/large_padding"
         android:background="?attr/selectableItemBackground"
         android:focusable="true"
-        android:nextFocusDown="@+id/containerEpisodeImage"
         android:nextFocusUp="@+id/textViewEpisodeTitle"
+        android:nextFocusDown="@+id/containerEpisodeImage"
         android:textAppearance="@style/TextAppearance.SeriesGuide.Caption"
         tools:text="OCT 15, 2013 (TUE) · 52" />
 
@@ -88,19 +88,12 @@
         android:id="@+id/include_buttons"
         layout="@layout/buttons_episode" />
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginBottom="@dimen/large_padding"
-        android:layout_marginLeft="@dimen/large_padding"
-        android:layout_marginRight="@dimen/large_padding"
-        android:background="?attr/sgColorDivider" />
-
     <TextView
         android:id="@+id/textview_description"
         style="@style/Block.FlowText"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
         android:layout_marginBottom="@dimen/large_padding"
         android:background="?attr/selectableItemBackground"
         android:focusable="true"
@@ -215,12 +208,6 @@
         android:textAppearance="@style/TextAppearance.SeriesGuide.Body2"
         tools:text="2014/07/25 CEST (Fri)" />
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginTop="@dimen/large_padding"
-        android:background="?attr/sgColorDivider" />
-
     <include
         android:id="@+id/include_services"
         layout="@layout/buttons_services" />