diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOneHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOneHolder.kt
index d8246453e..795748a5c 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOneHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOneHolder.kt
@@ -131,11 +131,27 @@ class MangaAllInOneHolder(
             }
             .launchIn(adapter.delegate.controllerScope)
 
+        binding.mangaArtist.longClicks()
+            .onEach {
+                adapter.delegate.copyToClipboard(binding.mangaArtistLabel.text.toString(), binding.mangaArtist.text.toString())
+            }
+            .launchIn(adapter.delegate.controllerScope)
+
+        binding.mangaArtist.clicks()
+            .onEach {
+                var text = binding.mangaArtist.text.toString()
+                if (adapter.delegate.isEHentaiBasedSource()) {
+                    text = adapter.delegate.wrapTag("artist", text)
+                }
+                adapter.delegate.performGlobalSearch(text)
+            }
+            .launchIn(adapter.delegate.controllerScope)
+
         binding.mangaAuthor.longClicks()
             .onEach {
                 // EXH Special case E-Hentai/ExHentai to ignore author field (unused)
                 if (!adapter.delegate.isEHentaiBasedSource()) {
-                    adapter.delegate.copyToClipboard("author", binding.mangaAuthor.text.toString())
+                    adapter.delegate.copyToClipboard(binding.mangaAuthorLabel.text.toString(), binding.mangaAuthor.text.toString())
                 }
             }
             .launchIn(adapter.delegate.controllerScope)
@@ -187,12 +203,18 @@ class MangaAllInOneHolder(
             manga.title
         }
 
-        // Update author/artist TextView.
-        val authors = listOf(manga.author, manga.artist).filter { !it.isNullOrBlank() }.distinct()
-        binding.mangaAuthor.text = if (authors.isEmpty()) {
+        // Update artist TextView.
+        binding.mangaArtist.text = if (manga.artist.isNullOrBlank()) {
             itemView.context.getString(R.string.unknown)
         } else {
-            authors.joinToString(", ")
+            manga.artist
+        }
+
+        // Update author TextView.
+        binding.mangaAuthor.text = if (manga.author.isNullOrBlank()) {
+            itemView.context.getString(R.string.unknown)
+        } else {
+            manga.author
         }
 
         // If manga source is known update source TextView.
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt
index 6935003e2..95c3b840f 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt
@@ -176,6 +176,25 @@ class MangaInfoController(private val fromSource: Boolean = false) :
             }
             .launchIn(scope)
 
+        binding.mangaArtist.longClicks()
+            .onEach {
+                activity?.copyToClipboard(
+                    binding.mangaArtistLabel.text.toString(),
+                    binding.mangaArtist.text.toString()
+                )
+            }
+            .launchIn(scope)
+
+        binding.mangaArtist.clicks()
+            .onEach {
+                var text = binding.mangaArtist.text.toString()
+                if (isEHentaiBasedSource()) {
+                    text = wrapTag("artist", text)
+                }
+                performGlobalSearch(text)
+            }
+            .launchIn(scope)
+
         binding.mangaAuthor.longClicks()
             .onEach {
                 // EXH Special case E-Hentai/ExHentai to ignore author field (unused)
@@ -318,12 +337,18 @@ class MangaInfoController(private val fromSource: Boolean = false) :
             manga.title
         }
 
-        // Update author/artist TextView.
-        val authors = listOf(manga.author, manga.artist).filter { !it.isNullOrBlank() }.distinct()
-        binding.mangaAuthor.text = if (authors.isEmpty()) {
+        // Update artist TextView.
+        binding.mangaArtist.text = if (manga.artist.isNullOrBlank()) {
             view.context.getString(R.string.unknown)
         } else {
-            authors.joinToString(", ")
+            manga.artist
+        }
+
+        // Update author TextView.
+        binding.mangaAuthor.text = if (manga.author.isNullOrBlank()) {
+            view.context.getString(R.string.unknown)
+        } else {
+            manga.author
         }
 
         // If manga source is known update source TextView.
diff --git a/app/src/main/res/layout-land/manga_all_in_one_header.xml b/app/src/main/res/layout-land/manga_all_in_one_header.xml
index b31bacbb5..2e880ae57 100644
--- a/app/src/main/res/layout-land/manga_all_in_one_header.xml
+++ b/app/src/main/res/layout-land/manga_all_in_one_header.xml
@@ -70,26 +70,62 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
+            <TextView
+                android:id="@+id/manga_author_label"
+                style="@style/TextAppearance.Medium.Body2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/manga_info_author_label"
+                android:textIsSelectable="false"
+
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/manga_full_title" />
+
             <TextView
                 android:id="@+id/manga_author"
                 style="@style/TextAppearance.Regular.Body1.Secondary"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:textIsSelectable="false"
+                app:layout_constraintBaseline_toBaselineOf="@+id/manga_author_label"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/manga_author_label" />
+
+            <TextView
+                android:id="@+id/manga_artist_label"
+                style="@style/TextAppearance.Medium.Body2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/manga_info_artist_label"
                 android:textIsSelectable="false"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/manga_full_title"
-                tools:text="Author" />
+                app:layout_constraintTop_toBottomOf="@+id/manga_author_label" />
+
+            <TextView
+                android:id="@+id/manga_artist"
+                style="@style/TextAppearance.Regular.Body1.Secondary"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:textIsSelectable="false"
+                app:layout_constraintBaseline_toBaselineOf="@+id/manga_artist_label"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/manga_artist_label" />
 
             <TextView
                 android:id="@+id/manga_chapters_label"
                 style="@style/TextAppearance.Medium.Body2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
                 android:text="@string/manga_info_last_chapter_label"
                 android:textIsSelectable="false"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/manga_author" />
+                app:layout_constraintTop_toBottomOf="@+id/manga_artist_label" />
 
             <TextView
                 android:id="@+id/manga_chapters"
diff --git a/app/src/main/res/layout-land/manga_info_controller.xml b/app/src/main/res/layout-land/manga_info_controller.xml
index f76457369..e69b0350a 100644
--- a/app/src/main/res/layout-land/manga_info_controller.xml
+++ b/app/src/main/res/layout-land/manga_info_controller.xml
@@ -53,26 +53,61 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
+                <TextView
+                    android:id="@+id/manga_author_label"
+                    style="@style/TextAppearance.Medium.Body2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/manga_info_author_label"
+                    android:textIsSelectable="false"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/manga_full_title" />
+
                 <TextView
                     android:id="@+id/manga_author"
                     style="@style/TextAppearance.Regular.Body1.Secondary"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_marginStart="8dp"
+                    android:ellipsize="end"
+                    android:maxLines="1"
+                    android:textIsSelectable="false"
+                    app:layout_constraintBaseline_toBaselineOf="@+id/manga_author_label"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/manga_author_label" />
+
+                <TextView
+                    android:id="@+id/manga_artist_label"
+                    style="@style/TextAppearance.Medium.Body2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/manga_info_artist_label"
                     android:textIsSelectable="false"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/manga_full_title"
-                    tools:text="Author" />
+                    app:layout_constraintTop_toBottomOf="@+id/manga_author_label" />
+
+                <TextView
+                    android:id="@+id/manga_artist"
+                    style="@style/TextAppearance.Regular.Body1.Secondary"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="8dp"
+                    android:ellipsize="end"
+                    android:maxLines="1"
+                    android:textIsSelectable="false"
+                    app:layout_constraintBaseline_toBaselineOf="@+id/manga_artist_label"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/manga_artist_label" />
 
                 <TextView
                     android:id="@+id/manga_chapters_label"
                     style="@style/TextAppearance.Medium.Body2"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
                     android:text="@string/manga_info_last_chapter_label"
                     android:textIsSelectable="false"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/manga_author" />
+                    app:layout_constraintTop_toBottomOf="@+id/manga_artist_label" />
 
                 <TextView
                     android:id="@+id/manga_chapters"
diff --git a/app/src/main/res/layout/manga_all_in_one_header.xml b/app/src/main/res/layout/manga_all_in_one_header.xml
index fa0d9246b..d3b9653ab 100644
--- a/app/src/main/res/layout/manga_all_in_one_header.xml
+++ b/app/src/main/res/layout/manga_all_in_one_header.xml
@@ -70,26 +70,62 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
+            <TextView
+                android:id="@+id/manga_author_label"
+                style="@style/TextAppearance.Medium.Body2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/manga_info_author_label"
+                android:textIsSelectable="false"
+
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/manga_full_title" />
+
             <TextView
                 android:id="@+id/manga_author"
                 style="@style/TextAppearance.Regular.Body1.Secondary"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:textIsSelectable="false"
+                app:layout_constraintBaseline_toBaselineOf="@+id/manga_author_label"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/manga_author_label" />
+
+            <TextView
+                android:id="@+id/manga_artist_label"
+                style="@style/TextAppearance.Medium.Body2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/manga_info_artist_label"
                 android:textIsSelectable="false"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/manga_full_title"
-                tools:text="Author" />
+                app:layout_constraintTop_toBottomOf="@+id/manga_author_label" />
+
+            <TextView
+                android:id="@+id/manga_artist"
+                style="@style/TextAppearance.Regular.Body1.Secondary"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:textIsSelectable="false"
+                app:layout_constraintBaseline_toBaselineOf="@+id/manga_artist_label"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/manga_artist_label" />
 
             <TextView
                 android:id="@+id/manga_chapters_label"
                 style="@style/TextAppearance.Medium.Body2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
                 android:text="@string/manga_info_last_chapter_label"
                 android:textIsSelectable="false"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/manga_author" />
+                app:layout_constraintTop_toBottomOf="@+id/manga_artist_label" />
 
             <TextView
                 android:id="@+id/manga_chapters"
diff --git a/app/src/main/res/layout/manga_info_controller.xml b/app/src/main/res/layout/manga_info_controller.xml
index b5e095fc3..f39c0bb22 100755
--- a/app/src/main/res/layout/manga_info_controller.xml
+++ b/app/src/main/res/layout/manga_info_controller.xml
@@ -70,6 +70,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:maxLines="2"
+                        android:paddingBottom="8dp"
                         android:text="@string/manga_info_full_title_label"
                         android:textIsSelectable="false"
                         app:autoSizeMaxTextSize="20sp"
@@ -79,27 +80,62 @@
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
+                    <TextView
+                        android:id="@+id/manga_author_label"
+                        style="@style/TextAppearance.Medium.Body2"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/manga_info_author_label"
+                        android:textIsSelectable="false"
+
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/manga_full_title" />
+
                     <TextView
                         android:id="@+id/manga_author"
                         style="@style/TextAppearance.Regular.Body1.Secondary"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:layout_marginStart="8dp"
+                        android:ellipsize="end"
+                        android:maxLines="1"
                         android:textIsSelectable="false"
+                        app:layout_constraintBaseline_toBaselineOf="@+id/manga_author_label"
                         app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toEndOf="@+id/manga_author_label" />
+
+                    <TextView
+                        android:id="@+id/manga_artist_label"
+                        style="@style/TextAppearance.Medium.Body2"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/manga_info_artist_label"
+                        android:textIsSelectable="false"
                         app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/manga_full_title"
-                        tools:text="Author" />
+                        app:layout_constraintTop_toBottomOf="@+id/manga_author_label" />
+
+                    <TextView
+                        android:id="@+id/manga_artist"
+                        style="@style/TextAppearance.Regular.Body1.Secondary"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="8dp"
+                        android:ellipsize="end"
+                        android:maxLines="1"
+                        android:textIsSelectable="false"
+                        app:layout_constraintBaseline_toBaselineOf="@+id/manga_artist_label"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toEndOf="@+id/manga_artist_label" />
 
                     <TextView
                         android:id="@+id/manga_chapters_label"
                         style="@style/TextAppearance.Medium.Body2"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
                         android:text="@string/manga_info_last_chapter_label"
                         android:textIsSelectable="false"
                         app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/manga_author" />
+                        app:layout_constraintTop_toBottomOf="@+id/manga_artist_label" />
 
                     <TextView
                         android:id="@+id/manga_chapters"
diff --git a/app/src/main/res/layout/source_list_item.xml b/app/src/main/res/layout/source_list_item.xml
index 5be6c310a..8eb51b3e5 100644
--- a/app/src/main/res/layout/source_list_item.xml
+++ b/app/src/main/res/layout/source_list_item.xml
@@ -26,7 +26,9 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
         android:ellipsize="end"
         android:maxLines="1"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 984d8fcce..bf3613f23 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -458,6 +458,8 @@
     <string name="manga_info_full_title_label">Title</string>
     <string name="manga_added_library">Added to library</string>
     <string name="manga_removed_library">Removed from library</string>
+    <string name="manga_info_author_label">Author</string>
+    <string name="manga_info_artist_label">Artist</string>
     <string name="manga_info_chapters_label">Chapters</string>
     <string name="manga_info_last_chapter_label">Last chapter</string>
     <string name="manga_info_latest_data_label">Updated</string>