diff --git a/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadState.kt b/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadState.kt
index d7f86abfb..4ed75b514 100644
--- a/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadState.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/download/domain/DownloadState.kt
@@ -108,34 +108,6 @@ sealed interface DownloadState {
 		}
 	}
 
-	@Deprecated("TODO: remove")
-	class WaitingForNetwork(
-		override val startId: Int,
-		override val manga: Manga,
-		override val cover: Drawable?,
-	) : DownloadState {
-
-		override fun equals(other: Any?): Boolean {
-			if (this === other) return true
-			if (javaClass != other?.javaClass) return false
-
-			other as WaitingForNetwork
-
-			if (startId != other.startId) return false
-			if (manga != other.manga) return false
-			if (cover != other.cover) return false
-
-			return true
-		}
-
-		override fun hashCode(): Int {
-			var result = startId
-			result = 31 * result + manga.hashCode()
-			result = 31 * result + (cover?.hashCode() ?: 0)
-			return result
-		}
-	}
-
 	class Done(
 		override val startId: Int,
 		override val manga: Manga,
@@ -252,4 +224,4 @@ sealed interface DownloadState {
 			return result
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadItemAD.kt b/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadItemAD.kt
index 476f6efb6..5dcf4fd9e 100644
--- a/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadItemAD.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadItemAD.kt
@@ -12,15 +12,13 @@ import org.koitharu.kotatsu.databinding.ItemDownloadBinding
 import org.koitharu.kotatsu.download.domain.DownloadState
 import org.koitharu.kotatsu.parsers.util.format
 import org.koitharu.kotatsu.utils.ext.*
-import org.koitharu.kotatsu.utils.progress.ProgressJob
 
 fun downloadItemAD(
 	scope: CoroutineScope,
 	coil: ImageLoader,
-) = adapterDelegateViewBinding<ProgressJob<DownloadState>, ProgressJob<DownloadState>, ItemDownloadBinding>(
-	{ inflater, parent -> ItemDownloadBinding.inflate(inflater, parent, false) }
+) = adapterDelegateViewBinding<DownloadItem, DownloadItem, ItemDownloadBinding>(
+	{ inflater, parent -> ItemDownloadBinding.inflate(inflater, parent, false) },
 ) {
-
 	var job: Job? = null
 	val percentPattern = context.resources.getString(R.string.percent_string_pattern)
 
@@ -44,6 +42,8 @@ fun downloadItemAD(
 					binding.progressBar.isVisible = true
 					binding.textViewPercent.isVisible = false
 					binding.textViewDetails.isVisible = false
+					binding.buttonCancel.isVisible = false
+					binding.buttonResume.isVisible = false
 				}
 				is DownloadState.Done -> {
 					binding.textViewStatus.setText(R.string.download_complete)
@@ -51,6 +51,8 @@ fun downloadItemAD(
 					binding.progressBar.isVisible = false
 					binding.textViewPercent.isVisible = false
 					binding.textViewDetails.isVisible = false
+					binding.buttonCancel.isVisible = false
+					binding.buttonResume.isVisible = false
 				}
 				is DownloadState.Error -> {
 					binding.textViewStatus.setText(R.string.error_occurred)
@@ -59,6 +61,8 @@ fun downloadItemAD(
 					binding.textViewPercent.isVisible = false
 					binding.textViewDetails.text = state.error.getDisplayMessage(context.resources)
 					binding.textViewDetails.isVisible = true
+					binding.buttonCancel.isVisible = state.canRetry
+					binding.buttonResume.isVisible = state.canRetry
 				}
 				is DownloadState.PostProcessing -> {
 					binding.textViewStatus.setText(R.string.processing_)
@@ -66,6 +70,8 @@ fun downloadItemAD(
 					binding.progressBar.isVisible = true
 					binding.textViewPercent.isVisible = false
 					binding.textViewDetails.isVisible = false
+					binding.buttonCancel.isVisible = false
+					binding.buttonResume.isVisible = false
 				}
 				is DownloadState.Preparing -> {
 					binding.textViewStatus.setText(R.string.preparing_)
@@ -73,6 +79,8 @@ fun downloadItemAD(
 					binding.progressBar.isVisible = true
 					binding.textViewPercent.isVisible = false
 					binding.textViewDetails.isVisible = false
+					binding.buttonCancel.isVisible = true
+					binding.buttonResume.isVisible = false
 				}
 				is DownloadState.Progress -> {
 					binding.textViewStatus.setText(R.string.manga_downloading_)
@@ -83,6 +91,8 @@ fun downloadItemAD(
 					binding.textViewPercent.text = percentPattern.format((state.percent * 100f).format(1))
 					binding.textViewPercent.isVisible = true
 					binding.textViewDetails.isVisible = false
+					binding.buttonCancel.isVisible = true
+					binding.buttonResume.isVisible = false
 				}
 				is DownloadState.Queued -> {
 					binding.textViewStatus.setText(R.string.queued)
@@ -90,13 +100,8 @@ fun downloadItemAD(
 					binding.progressBar.isVisible = false
 					binding.textViewPercent.isVisible = false
 					binding.textViewDetails.isVisible = false
-				}
-				is DownloadState.WaitingForNetwork -> {
-					binding.textViewStatus.setText(R.string.waiting_for_network)
-					binding.progressBar.isIndeterminate = false
-					binding.progressBar.isVisible = false
-					binding.textViewPercent.isVisible = false
-					binding.textViewDetails.isVisible = false
+					binding.buttonCancel.isVisible = true
+					binding.buttonResume.isVisible = false
 				}
 			}
 		}.launchIn(scope)
@@ -106,4 +111,4 @@ fun downloadItemAD(
 		job?.cancel()
 		job = null
 	}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadsAdapter.kt b/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadsAdapter.kt
index 0c3629d1b..de75277bf 100644
--- a/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadsAdapter.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/download/ui/DownloadsAdapter.kt
@@ -5,12 +5,14 @@ import coil.ImageLoader
 import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter
 import kotlinx.coroutines.CoroutineScope
 import org.koitharu.kotatsu.download.domain.DownloadState
-import org.koitharu.kotatsu.utils.progress.ProgressJob
+import org.koitharu.kotatsu.utils.progress.PausingProgressJob
+
+typealias DownloadItem = PausingProgressJob<DownloadState>
 
 class DownloadsAdapter(
 	scope: CoroutineScope,
 	coil: ImageLoader,
-) : AsyncListDifferDelegationAdapter<ProgressJob<DownloadState>>(DiffCallback()) {
+) : AsyncListDifferDelegationAdapter<DownloadItem>(DiffCallback()) {
 
 	init {
 		delegatesManager.addDelegate(downloadItemAD(scope, coil))
@@ -21,20 +23,24 @@ class DownloadsAdapter(
 		return items[position].progressValue.startId.toLong()
 	}
 
-	private class DiffCallback : DiffUtil.ItemCallback<ProgressJob<DownloadState>>() {
+	private class DiffCallback : DiffUtil.ItemCallback<DownloadItem>() {
 
 		override fun areItemsTheSame(
-			oldItem: ProgressJob<DownloadState>,
-			newItem: ProgressJob<DownloadState>,
+			oldItem: DownloadItem,
+			newItem: DownloadItem,
 		): Boolean {
 			return oldItem.progressValue.startId == newItem.progressValue.startId
 		}
 
 		override fun areContentsTheSame(
-			oldItem: ProgressJob<DownloadState>,
-			newItem: ProgressJob<DownloadState>,
+			oldItem: DownloadItem,
+			newItem: DownloadItem,
 		): Boolean {
-			return oldItem.progressValue == newItem.progressValue
+			return oldItem.progressValue == newItem.progressValue && oldItem.isPaused == newItem.isPaused
+		}
+
+		override fun getChangePayload(oldItem: DownloadItem, newItem: DownloadItem): Any {
+			return Unit
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadNotification.kt b/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadNotification.kt
index 5a6997de7..b5f4d90d3 100644
--- a/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadNotification.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadNotification.kt
@@ -41,14 +41,14 @@ class DownloadNotification(private val context: Context, startId: Int) {
 			context,
 			startId * 2 + 1,
 			DownloadService.getResumeIntent(startId),
-			PendingIntent.FLAG_CANCEL_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE
-		)
+			PendingIntent.FLAG_CANCEL_CURRENT or PendingIntentCompat.FLAG_IMMUTABLE,
+		),
 	)
 	private val listIntent = PendingIntent.getActivity(
 		context,
 		REQUEST_LIST,
 		DownloadsActivity.newIntent(context),
-		PendingIntentCompat.FLAG_IMMUTABLE
+		PendingIntentCompat.FLAG_IMMUTABLE,
 	)
 
 	init {
@@ -142,13 +142,6 @@ class DownloadNotification(private val context: Context, startId: Int) {
 				builder.setOngoing(true)
 				builder.addAction(cancelAction)
 			}
-			is DownloadState.WaitingForNetwork -> {
-				builder.setProgress(0, 0, false)
-				builder.setContentText(context.getString(R.string.waiting_for_network))
-				builder.setStyle(null)
-				builder.setOngoing(true)
-				builder.addAction(cancelAction)
-			}
 		}
 		return builder.build()
 	}
diff --git a/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadService.kt b/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadService.kt
index dd58ee6a1..bf54797be 100644
--- a/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadService.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/download/ui/service/DownloadService.kt
@@ -171,7 +171,7 @@ class DownloadService : BaseService() {
 
 	class DownloadBinder(private val service: DownloadService) : Binder() {
 
-		val downloads: Flow<Collection<ProgressJob<DownloadState>>>
+		val downloads: Flow<Collection<PausingProgressJob<DownloadState>>>
 			get() = service.jobCount.mapLatest { service.jobs.values }
 	}
 
diff --git a/app/src/main/java/org/koitharu/kotatsu/library/ui/LibraryFragment.kt b/app/src/main/java/org/koitharu/kotatsu/library/ui/LibraryFragment.kt
index 2068db53b..43f45bef2 100644
--- a/app/src/main/java/org/koitharu/kotatsu/library/ui/LibraryFragment.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/library/ui/LibraryFragment.kt
@@ -4,7 +4,6 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.content.ContextCompat.startActivity
 import androidx.core.graphics.Insets
 import androidx.core.view.updatePadding
 import androidx.fragment.app.viewModels
diff --git a/app/src/main/res/layout/item_download.xml b/app/src/main/res/layout/item_download.xml
index 101df297e..980e54799 100644
--- a/app/src/main/res/layout/item_download.xml
+++ b/app/src/main/res/layout/item_download.xml
@@ -1,101 +1,123 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
+<com.google.android.material.card.MaterialCardView
 	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:background="?attr/selectableItemBackground"
-	android:paddingStart="8dp"
-	android:paddingTop="4dp"
-	android:paddingEnd="8dp"
-	android:paddingBottom="6dp">
+	app:cardCornerRadius="16dp">
 
-	<com.google.android.material.card.MaterialCardView
-		android:id="@+id/card_cover"
-		android:layout_width="48dp"
-		android:layout_height="48dp"
-		android:layout_margin="8dp"
-		app:layout_constraintBottom_toBottomOf="parent"
-		app:layout_constraintDimensionRatio="h,1:1"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="parent"
-		app:layout_constraintVertical_bias="0.0">
+	<androidx.constraintlayout.widget.ConstraintLayout
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:minHeight="@dimen/manga_list_details_item_height"
+		android:orientation="horizontal"
+		android:padding="4dp">
 
-		<ImageView
+		<com.google.android.material.imageview.ShapeableImageView
 			android:id="@+id/imageView_cover"
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:contentDescription="@null"
+			android:layout_width="92dp"
+			android:layout_height="0dp"
+			android:orientation="vertical"
 			android:scaleType="centerCrop"
+			app:layout_constraintDimensionRatio="H,13:18"
+			app:layout_constraintStart_toStartOf="parent"
+			app:layout_constraintTop_toTopOf="parent"
+			app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.Kotatsu.Cover"
 			tools:src="@tools:sample/backgrounds/scenic" />
 
-	</com.google.android.material.card.MaterialCardView>
+		<TextView
+			android:id="@+id/textView_title"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="16dp"
+			android:layout_marginTop="4dp"
+			android:layout_marginEnd="8dp"
+			android:ellipsize="end"
+			android:singleLine="true"
+			android:textAppearance="?attr/textAppearanceTitleSmall"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toEndOf="@id/imageView_cover"
+			app:layout_constraintTop_toTopOf="parent"
+			tools:text="@tools:sample/lorem" />
 
-	<TextView
-		android:id="@+id/textView_title"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:layout_marginStart="16dp"
-		android:layout_marginTop="4dp"
-		android:layout_marginEnd="8dp"
-		android:ellipsize="end"
-		android:singleLine="true"
-		android:textAppearance="?attr/textAppearanceBodyLarge"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toEndOf="@id/card_cover"
-		app:layout_constraintTop_toTopOf="parent"
-		tools:text="@tools:sample/lorem" />
+		<com.google.android.material.progressindicator.LinearProgressIndicator
+			android:id="@+id/progressBar"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="16dp"
+			android:layout_marginTop="4dp"
+			android:layout_marginEnd="8dp"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toEndOf="@id/imageView_cover"
+			app:layout_constraintTop_toBottomOf="@id/textView_title" />
 
-	<com.google.android.material.progressindicator.LinearProgressIndicator
-		android:id="@+id/progressBar"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:layout_marginStart="16dp"
-		android:layout_marginTop="4dp"
-		android:layout_marginEnd="8dp"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toEndOf="@id/card_cover"
-		app:layout_constraintTop_toBottomOf="@id/textView_title" />
+		<TextView
+			android:id="@+id/textView_status"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="16dp"
+			android:layout_marginTop="4dp"
+			android:layout_marginEnd="8dp"
+			android:ellipsize="end"
+			android:singleLine="true"
+			android:textAppearance="?attr/textAppearanceBodySmall"
+			app:layout_constraintEnd_toStartOf="@id/textView_percent"
+			app:layout_constraintStart_toEndOf="@id/imageView_cover"
+			app:layout_constraintTop_toBottomOf="@id/progressBar"
+			tools:text="@string/manga_downloading_" />
 
-	<TextView
-		android:id="@+id/textView_status"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:layout_marginStart="16dp"
-		android:layout_marginTop="4dp"
-		android:layout_marginEnd="8dp"
-		android:ellipsize="end"
-		android:singleLine="true"
-		android:textAppearance="?attr/textAppearanceBodySmall"
-		app:layout_constraintEnd_toStartOf="@id/textView_percent"
-		app:layout_constraintStart_toEndOf="@id/card_cover"
-		app:layout_constraintTop_toBottomOf="@id/progressBar"
-		tools:text="@string/manga_downloading_" />
+		<TextView
+			android:id="@+id/textView_percent"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginEnd="8dp"
+			android:textAppearance="?attr/textAppearanceBodyMedium"
+			app:layout_constraintBaseline_toBaselineOf="@id/textView_status"
+			app:layout_constraintEnd_toEndOf="parent"
+			tools:text="25%" />
 
-	<TextView
-		android:id="@+id/textView_percent"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:textAppearance="?attr/textAppearanceBodyMedium"
-		app:layout_constraintBaseline_toBaselineOf="@id/textView_status"
-		app:layout_constraintEnd_toEndOf="parent"
-		android:layout_marginEnd="8dp"
-		tools:text="25%" />
+		<TextView
+			android:id="@+id/textView_details"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_marginStart="16dp"
+			android:layout_marginTop="4dp"
+			android:layout_marginEnd="8dp"
+			android:ellipsize="end"
+			android:maxLines="4"
+			android:textAppearance="?attr/textAppearanceBodySmall"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintStart_toEndOf="@id/imageView_cover"
+			app:layout_constraintTop_toBottomOf="@id/textView_status"
+			tools:text="@tools:sample/lorem[3]" />
 
-	<TextView
-		android:id="@+id/textView_details"
-		android:layout_width="0dp"
-		android:layout_height="wrap_content"
-		android:layout_marginStart="16dp"
-		android:layout_marginTop="4dp"
-		android:layout_marginEnd="8dp"
-		android:ellipsize="end"
-		android:maxLines="4"
-		android:textAppearance="?attr/textAppearanceBodySmall"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintStart_toEndOf="@id/card_cover"
-		app:layout_constraintTop_toBottomOf="@id/textView_status"
-		tools:text="@tools:sample/lorem[3]" />
+		<Button
+			android:id="@+id/button_resume"
+			style="@style/Widget.Material3.Button.TextButton"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@string/try_again"
+			android:visibility="gone"
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintEnd_toStartOf="@id/button_cancel"
+			app:layout_constraintTop_toBottomOf="@id/textView_details"
+			app:layout_constraintVertical_bias="1"
+			tools:visibility="visible" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+		<Button
+			android:id="@+id/button_cancel"
+			style="@style/Widget.Material3.Button.TextButton"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="@android:string/cancel"
+			android:visibility="gone"
+			app:layout_constraintBottom_toBottomOf="parent"
+			app:layout_constraintEnd_toEndOf="parent"
+			app:layout_constraintTop_toBottomOf="@id/textView_details"
+			app:layout_constraintVertical_bias="1"
+			tools:visibility="visible" />
+
+	</androidx.constraintlayout.widget.ConstraintLayout>
+
+</com.google.android.material.card.MaterialCardView>