diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt
index 454a1d3cb7..5523906c89 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt
@@ -243,7 +243,7 @@ class MangaInfoHeaderAdapter(
             setFavoriteButtonState(manga.favorite)
 
             // Set cover if changed.
-            listOf(binding.mangaCover, binding.backdrop).forEach {
+            listOfNotNull(binding.mangaCover, binding.backdrop).forEach {
                 it.loadAny(manga)
             }
 
@@ -277,7 +277,8 @@ class MangaInfoHeaderAdapter(
                 merge(
                     binding.mangaSummaryText.clicks(),
                     binding.mangaInfoToggleMore.clicks(),
-                    binding.mangaInfoToggleLess.clicks()
+                    binding.mangaInfoToggleLess.clicks(),
+                    binding.mangaSummarySection.clicks()
                 )
                     .onEach { toggleMangaInfo() }
                     .launchIn(controller.viewScope)
@@ -288,6 +289,13 @@ class MangaInfoHeaderAdapter(
                     toggleMangaInfo()
                     initialLoad = false
                 }
+
+                // Refreshes will change the state and it needs to be set to correct state to display correctly
+                if (binding.mangaSummaryText.maxLines == 2) {
+                    binding.mangaSummarySection.transitionToState(R.id.start)
+                } else {
+                    binding.mangaSummarySection.transitionToState(R.id.end)
+                }
             }
         }
 
@@ -298,18 +306,17 @@ class MangaInfoHeaderAdapter(
         private fun toggleMangaInfo() {
             val isCurrentlyExpanded = binding.mangaSummaryText.maxLines != 2
 
-            binding.mangaInfoToggleMoreScrim.isVisible = isCurrentlyExpanded
-            binding.mangaInfoToggleMore.isVisible = isCurrentlyExpanded
-            binding.mangaInfoToggleLess.isVisible = !isCurrentlyExpanded
+            if (isCurrentlyExpanded) {
+                binding.mangaSummarySection.transitionToStart()
+            } else {
+                binding.mangaSummarySection.transitionToEnd()
+            }
 
             binding.mangaSummaryText.maxLines = if (isCurrentlyExpanded) {
                 2
             } else {
                 Int.MAX_VALUE
             }
-
-            binding.mangaGenresTagsCompact.isVisible = isCurrentlyExpanded
-            binding.mangaGenresTagsFullChips.isVisible = !isCurrentlyExpanded
         }
 
         /**
diff --git a/app/src/main/res/layout-w720dp/manga_info_header.xml b/app/src/main/res/layout-w720dp/manga_info_header.xml
new file mode 100644
index 0000000000..299529ef1d
--- /dev/null
+++ b/app/src/main/res/layout-w720dp/manga_info_header.xml
@@ -0,0 +1,282 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.motion.widget.MotionLayout 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"
+    app:layoutDescription="@xml/manga_info_header_scene_sw600dp"
+    tools:context=".ui.browse.source.browse.BrowseSourceController">
+
+    <ImageView
+        android:id="@+id/backdrop"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginBottom="-32dp"
+        android:alpha="0.2"
+        android:scaleType="centerCrop"
+        app:layout_constraintBottom_toBottomOf="@+id/manga_cover"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:background="@mipmap/ic_launcher" />
+
+    <View
+        android:id="@+id/backdrop_overlay"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:alpha="1"
+        android:background="@drawable/manga_info_gradient"
+        android:backgroundTint="?android:attr/colorBackground"
+        app:layout_constraintBottom_toBottomOf="@+id/backdrop"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/manga_cover"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginStart="@dimen/tablet_horizontal_cover_margin"
+        android:layout_marginTop="32dp"
+        android:layout_marginEnd="@dimen/tablet_horizontal_cover_margin"
+        android:background="@drawable/rounded_rectangle"
+        android:contentDescription="@string/description_cover"
+        android:scaleType="centerCrop"
+        app:layout_constraintDimensionRatio="w,3:2"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@mipmap/ic_launcher" />
+
+    <LinearLayout
+        android:id="@+id/manga_detail"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="-8dp"
+        android:layout_marginEnd="16dp"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/backdrop">
+
+        <TextView
+            android:id="@+id/manga_full_title"
+            style="@style/TextAppearance.Medium.Title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp"
+            android:gravity="bottom"
+            android:maxLines="3"
+            android:text="@string/manga_info_full_title_label"
+            android:textAlignment="center"
+            android:textIsSelectable="false"
+            app:autoSizeMaxTextSize="20sp"
+            app:autoSizeMinTextSize="12sp"
+            app:autoSizeStepGranularity="2sp"
+            app:autoSizeTextType="uniform" />
+
+        <TextView
+            android:id="@+id/manga_author"
+            style="@style/TextAppearance.Regular.Body1.Secondary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAlignment="center"
+            android:textIsSelectable="false"
+            tools:text="Author" />
+
+        <TextView
+            android:id="@+id/manga_artist"
+            style="@style/TextAppearance.Regular.Body1.Secondary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp"
+            android:textIsSelectable="false"
+            tools:text="Artist" />
+
+        <LinearLayout
+            android:id="@+id/manga_status_row"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:id="@+id/manga_status"
+                style="@style/TextAppearance.Regular.Body1.Secondary"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:textIsSelectable="false"
+                tools:text="Status" />
+
+            <TextView
+                style="@style/TextAppearance.Regular.Body1.Secondary"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="4dp"
+                android:layout_marginEnd="4dp"
+                android:text="•"
+                android:textIsSelectable="false"
+                tools:ignore="HardcodedText" />
+
+            <TextView
+                android:id="@+id/manga_source"
+                style="@style/TextAppearance.Regular.Body1.Secondary"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:textIsSelectable="false"
+                tools:text="Source" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/btn_favorite"
+        style="@style/Theme.Widget.Button.Action"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:text="@string/add_to_library"
+        app:icon="@drawable/ic_favorite_border_24dp"
+        app:layout_constraintEnd_toStartOf="@+id/btn_tracking"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/manga_detail" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/btn_tracking"
+        style="@style/Theme.Widget.Button.Action"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="@string/manga_tracking_tab"
+        android:visibility="gone"
+        app:icon="@drawable/ic_sync_24dp"
+        app:layout_constraintEnd_toStartOf="@+id/btn_webview"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/btn_favorite"
+        app:layout_constraintTop_toTopOf="@+id/btn_favorite"
+        tools:visibility="visible" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/btn_webview"
+        style="@style/Theme.Widget.Button.Action"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="@string/action_web_view"
+        android:visibility="gone"
+        app:icon="@drawable/ic_public_24dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/btn_tracking"
+        app:layout_constraintTop_toTopOf="@+id/btn_favorite"
+        tools:visibility="visible" />
+
+    <androidx.constraintlayout.motion.widget.MotionLayout
+        android:id="@+id/manga_summary_section"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        app:layoutDescription="@xml/manga_summary_section_scene"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/btn_favorite">
+
+        <TextView
+            android:id="@+id/manga_summary_text"
+            style="@style/TextAppearance.Regular.Body1.Secondary"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="16dp"
+            android:clickable="true"
+            android:focusable="true"
+            android:maxLines="2"
+            android:textIsSelectable="false"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/manga_cover"
+            tools:text="Collapsed summary content Collapsed summary content Collapsed summary content Collapsed summary content Collapsed summary content Collapsed summary content" />
+
+        <View
+            android:id="@+id/manga_info_toggle_more_scrim"
+            android:layout_width="20dp"
+            android:layout_height="0dp"
+            android:background="@drawable/manga_info_more_gradient"
+            android:backgroundTint="?android:attr/colorBackground"
+            app:layout_constraintBottom_toBottomOf="@+id/manga_info_toggle_more"
+            app:layout_constraintEnd_toStartOf="@+id/manga_info_toggle_more"
+            app:layout_constraintTop_toTopOf="@+id/manga_info_toggle_more" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/manga_info_toggle_more"
+            style="@style/Theme.Widget.Button.TextButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingStart="8dp"
+            android:paddingEnd="16dp"
+            android:text="@string/manga_info_expand"
+            android:textAlignment="viewEnd"
+            app:layout_constraintBottom_toBottomOf="@+id/manga_summary_text"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/manga_info_toggle_less"
+            style="@style/Theme.Widget.Button.TextButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingStart="8dp"
+            android:paddingEnd="16dp"
+            android:text="@string/manga_info_collapse"
+            android:textAlignment="viewEnd"
+            android:visibility="gone"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/manga_summary_text"
+            tools:visibility="gone" />
+
+        <HorizontalScrollView
+            android:id="@+id/manga_genres_tags_compact"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:requiresFadingEdge="horizontal"
+            android:scrollbars="none"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/manga_summary_text">
+
+            <com.google.android.material.chip.ChipGroup
+                android:id="@+id/manga_genres_tags_compact_chips"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingStart="16dp"
+                android:paddingTop="8dp"
+                android:paddingEnd="16dp"
+                android:paddingBottom="8dp"
+                app:chipSpacingHorizontal="4dp"
+                app:singleLine="true" />
+
+        </HorizontalScrollView>
+
+        <com.google.android.material.chip.ChipGroup
+            android:id="@+id/manga_genres_tags_full_chips"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
+            android:visibility="gone"
+            app:chipSpacingHorizontal="4dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/manga_info_toggle_less"
+            tools:visibility="gone" />
+
+    </androidx.constraintlayout.motion.widget.MotionLayout>
+
+</androidx.constraintlayout.motion.widget.MotionLayout>
diff --git a/app/src/main/res/layout/manga_info_header.xml b/app/src/main/res/layout/manga_info_header.xml
index 69f85920c5..e2b80ec537 100644
--- a/app/src/main/res/layout/manga_info_header.xml
+++ b/app/src/main/res/layout/manga_info_header.xml
@@ -168,100 +168,107 @@
         app:layout_constraintTop_toTopOf="@+id/btn_favorite"
         tools:visibility="visible" />
 
-    <TextView
-        android:id="@+id/manga_summary_text"
-        style="@style/TextAppearance.Regular.Body1.Secondary"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:clickable="true"
-        android:focusable="true"
-        android:maxLines="2"
-        android:textIsSelectable="false"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/btn_favorite"
-        tools:text="Collapsed summary content Collapsed summary content Collapsed summary content Collapsed summary content Collapsed summary content Collapsed summary content" />
-
-    <View
-        android:id="@+id/manga_info_toggle_more_scrim"
-        android:layout_width="20dp"
-        android:layout_height="0dp"
-        android:background="@drawable/manga_info_more_gradient"
-        android:backgroundTint="?android:attr/colorBackground"
-        app:layout_constraintBottom_toBottomOf="@+id/manga_info_toggle_more"
-        app:layout_constraintEnd_toStartOf="@+id/manga_info_toggle_more"
-        app:layout_constraintTop_toTopOf="@+id/manga_info_toggle_more" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/manga_info_toggle_more"
-        style="@style/Theme.Widget.Button.TextButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingStart="8dp"
-        android:paddingEnd="16dp"
-        android:text="@string/manga_info_expand"
-        android:textAlignment="viewEnd"
-        app:layout_constraintBottom_toBottomOf="@+id/manga_summary_text"
-        app:layout_constraintEnd_toEndOf="parent" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/manga_info_toggle_less"
-        style="@style/Theme.Widget.Button.TextButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingStart="8dp"
-        android:paddingEnd="16dp"
-        android:text="@string/manga_info_collapse"
-        android:textAlignment="viewEnd"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/manga_summary_text"
-        tools:visibility="visible" />
-
-    <HorizontalScrollView
-        android:id="@+id/manga_genres_tags_compact"
+    <androidx.constraintlayout.motion.widget.MotionLayout
+        android:id="@+id/manga_summary_section"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:requiresFadingEdge="horizontal"
-        android:scrollbars="none"
+        app:layoutDescription="@xml/manga_summary_section_scene"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/manga_summary_text">
+        app:layout_constraintTop_toBottomOf="@+id/btn_favorite">
 
-        <com.google.android.material.chip.ChipGroup
-            android:id="@+id/manga_genres_tags_compact_chips"
+
+        <TextView
+            android:id="@+id/manga_summary_text"
+            style="@style/TextAppearance.Regular.Body1.Secondary"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="16dp"
+            android:clickable="true"
+            android:focusable="true"
+            android:maxLines="2"
+            android:textIsSelectable="false"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/manga_cover"
+            tools:text="Collapsed summary content Collapsed summary content Collapsed summary content Collapsed summary content Collapsed summary content Collapsed summary content" />
+
+        <View
+            android:id="@+id/manga_info_toggle_more_scrim"
+            android:layout_width="20dp"
+            android:layout_height="0dp"
+            android:background="@drawable/manga_info_more_gradient"
+            android:backgroundTint="?android:attr/colorBackground"
+            app:layout_constraintBottom_toBottomOf="@+id/manga_info_toggle_more"
+            app:layout_constraintEnd_toStartOf="@+id/manga_info_toggle_more"
+            app:layout_constraintTop_toTopOf="@+id/manga_info_toggle_more" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/manga_info_toggle_more"
+            style="@style/Theme.Widget.Button.TextButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingStart="16dp"
-            android:paddingTop="8dp"
+            android:paddingStart="8dp"
             android:paddingEnd="16dp"
+            android:text="@string/manga_info_expand"
+            android:textAlignment="viewEnd"
+            app:layout_constraintBottom_toBottomOf="@+id/manga_summary_text"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/manga_info_toggle_less"
+            style="@style/Theme.Widget.Button.TextButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingStart="8dp"
+            android:paddingEnd="16dp"
+            android:text="@string/manga_info_collapse"
+            android:textAlignment="viewEnd"
+            android:visibility="gone"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/manga_summary_text"
+            tools:visibility="gone" />
+
+        <HorizontalScrollView
+            android:id="@+id/manga_genres_tags_compact"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:requiresFadingEdge="horizontal"
+            android:scrollbars="none"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/manga_summary_text">
+
+            <com.google.android.material.chip.ChipGroup
+                android:id="@+id/manga_genres_tags_compact_chips"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingStart="16dp"
+                android:paddingTop="8dp"
+                android:paddingEnd="16dp"
+                android:paddingBottom="8dp"
+                app:chipSpacingHorizontal="4dp"
+                app:singleLine="true" />
+
+        </HorizontalScrollView>
+
+        <com.google.android.material.chip.ChipGroup
+            android:id="@+id/manga_genres_tags_full_chips"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:paddingTop="8dp"
             android:paddingBottom="8dp"
+            android:visibility="gone"
             app:chipSpacingHorizontal="4dp"
-            app:singleLine="true" />
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/manga_info_toggle_less"
+            tools:visibility="gone" />
 
-    </HorizontalScrollView>
-
-    <com.google.android.material.chip.ChipGroup
-        android:id="@+id/manga_genres_tags_full_chips"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:paddingTop="8dp"
-        android:paddingBottom="8dp"
-        android:visibility="gone"
-        app:chipSpacingHorizontal="4dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/manga_info_toggle_less"
-        tools:visibility="visible" />
-
-    <androidx.constraintlayout.widget.Group
-        android:id="@+id/manga_summary_section"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:constraint_referenced_ids="manga_summary_text,manga_info_toggle_more,manga_info_toggle_more_scrim,manga_genres_tags_compact" />
+    </androidx.constraintlayout.motion.widget.MotionLayout>
 
 </androidx.constraintlayout.motion.widget.MotionLayout>
diff --git a/app/src/main/res/values-sw600dp-port/dimens.xml b/app/src/main/res/values-sw600dp-port/dimens.xml
new file mode 100644
index 0000000000..5fb171c818
--- /dev/null
+++ b/app/src/main/res/values-sw600dp-port/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="tablet_horizontal_cover_margin">80dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index dabe27907b..fc0c8c13a2 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -14,4 +14,6 @@
     <dimen name="action_toolbar_list_padding">72dp</dimen>
 
     <dimen name="screen_edge_margin">16dp</dimen>
+
+    <dimen name="tablet_horizontal_cover_margin">128dp</dimen>
 </resources>
diff --git a/app/src/main/res/xml/manga_info_header_scene.xml b/app/src/main/res/xml/manga_info_header_scene.xml
index de2df81be7..047bed8efc 100644
--- a/app/src/main/res/xml/manga_info_header_scene.xml
+++ b/app/src/main/res/xml/manga_info_header_scene.xml
@@ -6,62 +6,15 @@
         motion:constraintSetEnd="@+id/end"
         motion:constraintSetStart="@id/start"
         motion:duration="@android:integer/config_mediumAnimTime">
-        <KeyFrameSet>
-            <KeyPosition
-                motion:keyPositionType="pathRelative"
-                motion:motionTarget="@+id/manga_detail" />
-        </KeyFrameSet>
+        <KeyFrameSet></KeyFrameSet>
         <OnClick motion:targetId="@+id/manga_cover" />
     </Transition>
 
     <ConstraintSet android:id="@+id/start">
-        <Constraint
-            android:id="@+id/manga_info_toggle_more"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            motion:layout_constraintBottom_toBottomOf="@+id/manga_summary_text"
-            motion:layout_constraintEnd_toEndOf="parent"
-            motion:visibilityMode="ignore" />
-        <Constraint
-            android:id="@+id/manga_genres_tags_compact"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            motion:layout_constraintEnd_toEndOf="parent"
-            motion:layout_constraintStart_toStartOf="parent"
-            motion:layout_constraintTop_toBottomOf="@+id/manga_summary_text"
-            motion:visibilityMode="ignore" />
-        <Constraint
-            android:id="@+id/manga_info_toggle_more_scrim"
-            android:layout_width="20dp"
-            android:layout_height="0dp"
-            motion:layout_constraintBottom_toBottomOf="@+id/manga_info_toggle_more"
-            motion:layout_constraintEnd_toStartOf="@+id/manga_info_toggle_more"
-            motion:layout_constraintTop_toTopOf="@+id/manga_info_toggle_more"
-            motion:visibilityMode="ignore" />
-        <Constraint
-            android:id="@+id/manga_info_toggle_less"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="gone"
-            motion:layout_constraintEnd_toEndOf="parent"
-            motion:layout_constraintTop_toBottomOf="@+id/manga_summary_text"
-            motion:visibilityMode="ignore" />
-        <Constraint
-            android:id="@+id/manga_genres_tags_full_chips"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:visibility="gone"
-            motion:layout_constraintEnd_toEndOf="parent"
-            motion:layout_constraintStart_toStartOf="parent"
-            motion:layout_constraintTop_toBottomOf="@id/manga_info_toggle_less"
-            motion:visibilityMode="ignore" />
         <Constraint
             android:id="@+id/btn_tracking"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:visibility="visible"
             motion:layout_constraintEnd_toStartOf="@+id/btn_webview"
             motion:layout_constraintHorizontal_bias="0.5"
             motion:layout_constraintStart_toEndOf="@+id/btn_favorite"
@@ -71,12 +24,19 @@
             android:id="@+id/btn_webview"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:visibility="visible"
             motion:layout_constraintEnd_toEndOf="parent"
             motion:layout_constraintHorizontal_bias="0.5"
             motion:layout_constraintStart_toEndOf="@+id/btn_tracking"
             motion:layout_constraintTop_toTopOf="@+id/btn_favorite"
             motion:visibilityMode="ignore" />
+        <Constraint
+            android:id="@+id/manga_summary_section"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            motion:layout_constraintEnd_toEndOf="parent"
+            motion:layout_constraintStart_toStartOf="parent"
+            motion:layout_constraintTop_toBottomOf="@+id/btn_favorite"
+            motion:visibilityMode="ignore" />
     </ConstraintSet>
 
     <ConstraintSet android:id="@+id/end">
@@ -134,19 +94,10 @@
             motion:layout_constraintEnd_toEndOf="parent"
             motion:layout_constraintStart_toStartOf="parent"
             motion:layout_constraintTop_toBottomOf="@id/manga_cover" />
-        <Constraint
-            android:id="@+id/manga_info_toggle_less"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="visible"
-            motion:layout_constraintEnd_toEndOf="parent"
-            motion:layout_constraintTop_toBottomOf="@+id/manga_summary_text"
-            motion:visibilityMode="ignore" />
         <Constraint
             android:id="@+id/btn_tracking"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:visibility="visible"
             motion:layout_constraintEnd_toStartOf="@+id/btn_webview"
             motion:layout_constraintHorizontal_bias="0.5"
             motion:layout_constraintStart_toEndOf="@+id/btn_favorite"
@@ -166,55 +117,18 @@
             android:id="@+id/btn_webview"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:visibility="visible"
             motion:layout_constraintEnd_toEndOf="parent"
             motion:layout_constraintHorizontal_bias="0.5"
             motion:layout_constraintStart_toEndOf="@+id/btn_tracking"
             motion:layout_constraintTop_toTopOf="@+id/btn_favorite"
             motion:visibilityMode="ignore" />
         <Constraint
-            android:id="@+id/manga_summary_text"
+            android:id="@+id/manga_summary_section"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
             motion:layout_constraintEnd_toEndOf="parent"
             motion:layout_constraintStart_toStartOf="parent"
             motion:layout_constraintTop_toBottomOf="@+id/btn_favorite"
             motion:visibilityMode="ignore" />
-        <Constraint
-            android:id="@+id/manga_info_toggle_more_scrim"
-            android:layout_width="20dp"
-            android:layout_height="0dp"
-            motion:layout_constraintBottom_toBottomOf="@+id/manga_info_toggle_more"
-            motion:layout_constraintEnd_toStartOf="@+id/manga_info_toggle_more"
-            motion:layout_constraintTop_toTopOf="@+id/manga_info_toggle_more"
-            motion:visibilityMode="ignore" />
-        <Constraint
-            android:id="@+id/manga_info_toggle_more"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            motion:layout_constraintBottom_toBottomOf="@+id/manga_summary_text"
-            motion:layout_constraintEnd_toEndOf="parent"
-            motion:visibilityMode="ignore" />
-        <Constraint
-            android:id="@+id/manga_genres_tags_compact"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            motion:layout_constraintEnd_toEndOf="parent"
-            motion:layout_constraintStart_toStartOf="parent"
-            motion:layout_constraintTop_toBottomOf="@+id/manga_summary_text"
-            motion:visibilityMode="ignore" />
-        <Constraint
-            android:id="@+id/manga_genres_tags_full_chips"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:visibility="visible"
-            motion:layout_constraintEnd_toEndOf="parent"
-            motion:layout_constraintStart_toStartOf="parent"
-            motion:layout_constraintTop_toBottomOf="@+id/manga_info_toggle_less"
-            motion:visibilityMode="ignore" />
     </ConstraintSet>
 </MotionScene>
diff --git a/app/src/main/res/xml/manga_info_header_scene_sw600dp.xml b/app/src/main/res/xml/manga_info_header_scene_sw600dp.xml
new file mode 100644
index 0000000000..f05cd8c4e9
--- /dev/null
+++ b/app/src/main/res/xml/manga_info_header_scene_sw600dp.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<MotionScene xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:motion="http://schemas.android.com/apk/res-auto">
+
+    <Transition
+        motion:constraintSetEnd="@+id/end"
+        motion:constraintSetStart="@id/start"
+        motion:duration="@android:integer/config_mediumAnimTime">
+        <KeyFrameSet></KeyFrameSet>
+        <OnClick motion:targetId="@+id/manga_cover" />
+    </Transition>
+
+    <ConstraintSet android:id="@+id/start">
+        <Constraint
+            android:id="@+id/manga_summary_section"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            motion:layout_constraintEnd_toEndOf="parent"
+            motion:layout_constraintStart_toStartOf="parent"
+            motion:layout_constraintTop_toBottomOf="@+id/btn_favorite"
+            motion:visibilityMode="ignore" />
+    </ConstraintSet>
+
+    <ConstraintSet android:id="@+id/end">
+
+        <Constraint
+            android:id="@+id/manga_summary_section"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            motion:layout_constraintEnd_toEndOf="parent"
+            motion:layout_constraintStart_toStartOf="parent"
+            motion:layout_constraintTop_toBottomOf="@id/btn_favorite"
+            motion:visibilityMode="ignore" />
+        <Constraint
+            android:id="@+id/manga_detail"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="24dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="8dp"
+            motion:layout_constraintEnd_toEndOf="parent"
+            motion:layout_constraintStart_toStartOf="parent"
+            motion:layout_constraintTop_toBottomOf="@+id/manga_cover" />
+        <Constraint
+            motion:layout_constraintEnd_toEndOf="parent"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginEnd="0dp"
+            android:layout_marginStart="0dp"
+            motion:layout_constraintTop_toTopOf="parent"
+            motion:layout_constraintStart_toStartOf="parent"
+            motion:layout_constraintDimensionRatio="w,3:2"
+            android:layout_marginTop="0dp"
+            android:id="@+id/manga_cover" />
+    </ConstraintSet>
+</MotionScene>
diff --git a/app/src/main/res/xml/manga_summary_section_scene.xml b/app/src/main/res/xml/manga_summary_section_scene.xml
new file mode 100644
index 0000000000..49ddc4381f
--- /dev/null
+++ b/app/src/main/res/xml/manga_summary_section_scene.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<MotionScene xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:motion="http://schemas.android.com/apk/res-auto">
+
+    <Transition
+        motion:constraintSetEnd="@+id/end"
+        motion:constraintSetStart="@id/start"
+        motion:duration="1">
+        <KeyFrameSet></KeyFrameSet>
+        <OnClick motion:clickAction="toggle" />
+    </Transition>
+
+    <ConstraintSet android:id="@+id/start">
+        <Constraint
+            android:id="@+id/manga_info_toggle_more_scrim"
+            android:layout_width="20dp"
+            android:layout_height="0dp"
+            android:visibility="visible"
+            motion:layout_constraintBottom_toBottomOf="@+id/manga_info_toggle_more"
+            motion:layout_constraintEnd_toStartOf="@+id/manga_info_toggle_more"
+            motion:layout_constraintTop_toTopOf="@+id/manga_info_toggle_more" />
+        <Constraint
+            android:id="@+id/manga_info_toggle_more"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="visible"
+            motion:layout_constraintBottom_toBottomOf="@+id/manga_summary_text"
+            motion:layout_constraintEnd_toEndOf="parent" />
+        <Constraint
+            android:id="@+id/manga_info_toggle_less"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            motion:layout_constraintEnd_toEndOf="parent"
+            motion:layout_constraintTop_toBottomOf="@+id/manga_summary_text" />
+        <Constraint
+            android:id="@+id/manga_genres_tags_compact"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="visible"
+            motion:layout_constraintEnd_toEndOf="parent"
+            motion:layout_constraintStart_toStartOf="parent"
+            motion:layout_constraintTop_toBottomOf="@+id/manga_summary_text" />
+        <Constraint
+            android:id="@+id/manga_genres_tags_full_chips"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:visibility="gone"
+            motion:layout_constraintEnd_toEndOf="parent"
+            motion:layout_constraintStart_toStartOf="parent"
+            motion:layout_constraintTop_toBottomOf="@+id/manga_info_toggle_less" />
+    </ConstraintSet>
+
+    <ConstraintSet android:id="@+id/end">
+        <Constraint
+            android:id="@+id/manga_info_toggle_more_scrim"
+            android:layout_width="20dp"
+            android:layout_height="0dp"
+            android:visibility="gone"
+            motion:layout_constraintBottom_toBottomOf="@+id/manga_info_toggle_more"
+            motion:layout_constraintEnd_toStartOf="@+id/manga_info_toggle_more"
+            motion:layout_constraintTop_toTopOf="@+id/manga_info_toggle_more" />
+        <Constraint
+            android:id="@+id/manga_info_toggle_more"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            motion:layout_constraintBottom_toBottomOf="@+id/manga_summary_text"
+            motion:layout_constraintEnd_toEndOf="parent" />
+        <Constraint
+            android:id="@+id/manga_info_toggle_less"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="visible"
+            motion:layout_constraintEnd_toEndOf="parent"
+            motion:layout_constraintTop_toBottomOf="@+id/manga_summary_text" />
+        <Constraint
+            android:id="@+id/manga_genres_tags_compact"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            motion:layout_constraintEnd_toEndOf="parent"
+            motion:layout_constraintStart_toStartOf="parent"
+            motion:layout_constraintTop_toBottomOf="@+id/manga_summary_text" />
+        <Constraint
+            android:id="@+id/manga_genres_tags_full_chips"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:visibility="visible"
+            motion:layout_constraintEnd_toEndOf="parent"
+            motion:layout_constraintStart_toStartOf="parent"
+            motion:layout_constraintTop_toBottomOf="@+id/manga_info_toggle_less" />
+        <Constraint
+            android:id="@+id/manga_summary_text"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="16dp"
+            motion:layout_constraintEnd_toEndOf="parent"
+            motion:layout_constraintStart_toStartOf="parent"
+            motion:layout_constraintTop_toBottomOf="@+id/manga_cover"
+            motion:visibilityMode="ignore" />
+        <Constraint
+            android:id="@+id/manga_summary_text"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="16dp"
+            motion:layout_constraintEnd_toEndOf="parent"
+            motion:layout_constraintStart_toStartOf="parent"
+            motion:layout_constraintTop_toBottomOf="@+id/manga_cover"
+            motion:visibilityMode="ignore" />
+        <Constraint
+            android:id="@+id/manga_summary_text"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="16dp"
+            motion:layout_constraintEnd_toEndOf="parent"
+            motion:layout_constraintStart_toStartOf="parent"
+            motion:layout_constraintTop_toBottomOf="@+id/manga_cover"
+            motion:visibilityMode="ignore" />
+        <Constraint
+            android:id="@+id/manga_summary_text"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="16dp"
+            motion:layout_constraintEnd_toEndOf="parent"
+            motion:layout_constraintStart_toStartOf="parent"
+            motion:layout_constraintTop_toBottomOf="@+id/manga_cover"
+            motion:visibilityMode="ignore" />
+    </ConstraintSet>
+</MotionScene>