diff --git a/app/src/main/java/com/deniscerri/ytdlnis/adapter/ActiveDownloadAdapter.kt b/app/src/main/java/com/deniscerri/ytdlnis/adapter/ActiveDownloadAdapter.kt
index cc82153b..327c50fb 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/adapter/ActiveDownloadAdapter.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/adapter/ActiveDownloadAdapter.kt
@@ -20,6 +20,7 @@ import com.google.android.material.button.MaterialButton
 import com.google.android.material.card.MaterialCardView
 import com.google.android.material.progressindicator.LinearProgressIndicator
 import com.squareup.picasso.Picasso
+import java.util.zip.GZIPOutputStream
 
 class ActiveDownloadAdapter(onItemClickListener: OnItemClickListener, activity: Activity) : ListAdapter<DownloadItem?, ActiveDownloadAdapter.ViewHolder>(AsyncDifferConfig.Builder(DIFF_CALLBACK).build()) {
     private val onItemClickListener: OnItemClickListener
@@ -103,6 +104,7 @@ class ActiveDownloadAdapter(onItemClickListener: OnItemClickListener, activity:
 
         val fileSize = card.findViewById<TextView>(R.id.file_size)
         fileSize.text = fileUtil.convertFileSize(item.format.filesize)
+        if (fileSize.text == "?") fileSize.visibility = View.GONE
 
         //OUTPUT
         val output = card.findViewById<TextView>(R.id.output)
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/adapter/GenericDownloadAdapter.kt b/app/src/main/java/com/deniscerri/ytdlnis/adapter/GenericDownloadAdapter.kt
index 45eefe2f..2e9a69aa 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/adapter/GenericDownloadAdapter.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/adapter/GenericDownloadAdapter.kt
@@ -74,7 +74,9 @@ class GenericDownloadAdapter(onItemClickListener: OnItemClickListener, activity:
         itemUrl.text = item.url
 
         val formatNote = card.findViewById<Chip>(R.id.format_note)
-        formatNote!!.text = item.format.format_note.uppercase()
+        if (item.format.format_note == "?" || item.format.format_note == "") formatNote!!.visibility =
+            View.GONE
+        else formatNote!!.text = item.format.format_note.uppercase()
 
         val codec = card.findViewById<Chip>(R.id.codec)
         val codecText =
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadBottomSheetDialog.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadBottomSheetDialog.kt
index 2249b742..23c3b2e7 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadBottomSheetDialog.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadBottomSheetDialog.kt
@@ -22,6 +22,8 @@ import com.deniscerri.ytdlnis.database.models.ResultItem
 import com.deniscerri.ytdlnis.database.viewmodel.DownloadViewModel
 import com.deniscerri.ytdlnis.database.viewmodel.DownloadViewModel.Type
 import com.deniscerri.ytdlnis.receiver.ShareActivity
+import com.deniscerri.ytdlnis.util.FileUtil
+import com.deniscerri.ytdlnis.util.UiUtil
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.google.android.material.button.MaterialButton
@@ -34,6 +36,7 @@ import com.google.android.material.timepicker.TimeFormat
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import java.io.File
 import java.util.*
 
 
@@ -44,11 +47,13 @@ class DownloadBottomSheetDialog(private val resultItem: ResultItem, private val
     private lateinit var downloadViewModel: DownloadViewModel
     private lateinit var behavior: BottomSheetBehavior<View>
     private lateinit var commandTemplateDao : CommandTemplateDao
+    private lateinit var uiUtil: UiUtil
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         downloadViewModel = ViewModelProvider(this)[DownloadViewModel::class.java]
         commandTemplateDao = DBManager.getInstance(requireContext()).commandTemplateDao
+        uiUtil = UiUtil(FileUtil())
     }
 
     @SuppressLint("RestrictedApi")
@@ -139,43 +144,12 @@ class DownloadBottomSheetDialog(private val resultItem: ResultItem, private val
 
         val scheduleBtn = view.findViewById<MaterialButton>(R.id.bottomsheet_schedule_button)
         scheduleBtn.setOnClickListener{
-            val currentDate = Calendar.getInstance()
-            val date = Calendar.getInstance()
-
-            val datepicker = MaterialDatePicker.Builder.datePicker()
-                .setCalendarConstraints(
-                    CalendarConstraints.Builder()
-                        .setValidator(DateValidatorPointForward.now())
-                        .build()
-                )
-                .setSelection(MaterialDatePicker.todayInUtcMilliseconds())
-                .build()
-
-            datepicker.addOnPositiveButtonClickListener{
-                date.timeInMillis = it
-
-
-                val timepicker = MaterialTimePicker.Builder()
-                    .setTimeFormat(TimeFormat.CLOCK_24H)
-                    .setHour(currentDate.get(Calendar.HOUR_OF_DAY))
-                    .setMinute(currentDate.get(Calendar.MINUTE))
-                    .build()
-
-                timepicker.addOnPositiveButtonClickListener{
-                    date[Calendar.HOUR_OF_DAY] = timepicker.hour
-                    date[Calendar.MINUTE] = timepicker.minute
-
-
-                    val item: DownloadItem = getDownloadItem();
-                    item.downloadStartTime = date.timeInMillis
-                    downloadViewModel.queueDownloads(listOf(item))
-                    dismiss()
-                }
-                timepicker.show(fragmentManager, "timepicker")
-
+            uiUtil.showDatePicker(fragmentManager) {
+                val item: DownloadItem = getDownloadItem();
+                item.downloadStartTime = it.timeInMillis
+                downloadViewModel.queueDownloads(listOf(item))
+                dismiss()
             }
-            datepicker.show(fragmentManager, "datepicker")
-
         }
 
         val download = view.findViewById<Button>(R.id.bottomsheet_download_button)
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/FormatSelectionBottomSheetDialog.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/FormatSelectionBottomSheetDialog.kt
index 202abc91..482b1fd2 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/FormatSelectionBottomSheetDialog.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/FormatSelectionBottomSheetDialog.kt
@@ -69,6 +69,7 @@ class FormatSelectionBottomSheetDialog(private val item: DownloadItem, private v
                        Type.audio -> formats.filter { it.format_note.contains("audio", ignoreCase = true) }
                        else -> formats.filter { !it.format_note.contains("audio", ignoreCase = true) }
                    }
+                   if (formats.isEmpty()) throw Exception()
                    addFormatsToView(linearLayout)
                    refreshBtn.visibility = View.GONE
                }catch (e: Exception){
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/CancelledDownloadsFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/CancelledDownloadsFragment.kt
index 9ce6e8b3..8466186b 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/CancelledDownloadsFragment.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/CancelledDownloadsFragment.kt
@@ -27,6 +27,7 @@ import com.deniscerri.ytdlnis.util.FileUtil
 import com.deniscerri.ytdlnis.util.UiUtil
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.button.MaterialButton
+import com.google.android.material.chip.Chip
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 
@@ -113,9 +114,12 @@ class CancelledDownloadsFragment : Fragment(), GenericDownloadAdapter.OnItemClic
             btn.icon = ContextCompat.getDrawable(requireContext(), R.drawable.ic_terminal)
         }
 
-        val formatNote = bottomSheet.findViewById<TextView>(R.id.format_note)
-        val codec = bottomSheet.findViewById<TextView>(R.id.codec)
-        val fileSize = bottomSheet.findViewById<TextView>(R.id.file_size)
+        val time = bottomSheet.findViewById<Chip>(R.id.time)
+        val formatNote = bottomSheet.findViewById<Chip>(R.id.format_note)
+        val codec = bottomSheet.findViewById<Chip>(R.id.codec)
+        val fileSize = bottomSheet.findViewById<Chip>(R.id.file_size)
+
+        time!!.visibility = View.GONE
 
         if (item.format.format_note == "?" || item.format.format_note == "") formatNote!!.visibility =
             View.GONE
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/ErroredDownloadsFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/ErroredDownloadsFragment.kt
index bdaeb6e1..fbf6c529 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/ErroredDownloadsFragment.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/ErroredDownloadsFragment.kt
@@ -30,6 +30,7 @@ import com.deniscerri.ytdlnis.util.FileUtil
 import com.deniscerri.ytdlnis.util.UiUtil
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.button.MaterialButton
+import com.google.android.material.chip.Chip
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import java.io.File
 
@@ -115,10 +116,13 @@ class ErroredDownloadsFragment() : Fragment(), GenericDownloadAdapter.OnItemClic
             btn.icon = ContextCompat.getDrawable(requireContext(), R.drawable.ic_terminal)
         }
 
+        val time = bottomSheet.findViewById<Chip>(R.id.time)
         val formatNote = bottomSheet.findViewById<TextView>(R.id.format_note)
         val codec = bottomSheet.findViewById<TextView>(R.id.codec)
         val fileSize = bottomSheet.findViewById<TextView>(R.id.file_size)
 
+        time!!.visibility = View.GONE
+
         if (item.format.format_note == "?" || item.format.format_note == "") formatNote!!.visibility =
             View.GONE
         else formatNote!!.text = item.format.format_note
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/HistoryFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/HistoryFragment.kt
index c3b559ae..08404954 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/HistoryFragment.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/HistoryFragment.kt
@@ -8,6 +8,7 @@ import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import android.text.InputType
+import android.text.format.DateUtils
 import android.util.Log
 import android.view.*
 import android.view.View.*
@@ -400,10 +401,18 @@ class HistoryFragment : Fragment(), HistoryAdapter.OnItemClickListener{
             btn.icon = ContextCompat.getDrawable(requireContext(), R.drawable.ic_terminal)
         }
 
+        val time = bottomSheet!!.findViewById<TextView>(R.id.time)
         val formatNote = bottomSheet!!.findViewById<TextView>(R.id.format_note)
         val codec = bottomSheet!!.findViewById<TextView>(R.id.codec)
         val fileSize = bottomSheet!!.findViewById<TextView>(R.id.file_size)
 
+        time!!.text = DateUtils.getRelativeTimeSpanString(
+            item.time * 1000L,
+            System.currentTimeMillis(),
+            DateUtils.MINUTE_IN_MILLIS
+        )
+        time.isClickable = false
+
         if (item.format.format_note == "?" || item.format.format_note == "") formatNote!!.visibility = GONE
         else formatNote!!.text = item.format.format_note
 
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/QueuedDownloadsFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/QueuedDownloadsFragment.kt
index 2abb5719..e2e15412 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/QueuedDownloadsFragment.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/QueuedDownloadsFragment.kt
@@ -3,6 +3,7 @@ package com.deniscerri.ytdlnis.ui.downloads
 import android.app.Activity
 import android.content.res.Configuration
 import android.os.Bundle
+import android.text.format.DateUtils
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -10,6 +11,7 @@ import android.view.Window
 import android.widget.Button
 import android.widget.LinearLayout
 import android.widget.TextView
+import android.widget.Toast
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
@@ -28,10 +30,12 @@ import com.deniscerri.ytdlnis.util.NotificationUtil
 import com.deniscerri.ytdlnis.util.UiUtil
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.button.MaterialButton
+import com.google.android.material.chip.Chip
 import com.yausername.youtubedl_android.YoutubeDL
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import org.w3c.dom.Text
 
 
 class QueuedDownloadsFragment : Fragment(), GenericDownloadAdapter.OnItemClickListener {
@@ -119,9 +123,30 @@ class QueuedDownloadsFragment : Fragment(), GenericDownloadAdapter.OnItemClickLi
             btn.icon = ContextCompat.getDrawable(requireContext(), R.drawable.ic_terminal)
         }
 
-        val formatNote = bottomSheet.findViewById<TextView>(R.id.format_note)
-        val codec = bottomSheet.findViewById<TextView>(R.id.codec)
-        val fileSize = bottomSheet.findViewById<TextView>(R.id.file_size)
+        val time = bottomSheet.findViewById<Chip>(R.id.time)
+        val formatNote = bottomSheet.findViewById<Chip>(R.id.format_note)
+        val codec = bottomSheet.findViewById<Chip>(R.id.codec)
+        val fileSize = bottomSheet.findViewById<Chip>(R.id.file_size)
+
+        if (item.downloadStartTime <= System.currentTimeMillis() / 1000) time!!.visibility = View.GONE
+        else {
+            time!!.text = DateUtils.getRelativeTimeSpanString(
+                item.downloadStartTime,
+                System.currentTimeMillis(),
+                DateUtils.MINUTE_IN_MILLIS
+            )
+
+            time.setOnClickListener {
+                uiUtil.showDatePicker(parentFragmentManager) {
+                    bottomSheet.dismiss()
+                    Toast.makeText(context, getString(R.string.download_rescheduled_to) + " " + it.time, Toast.LENGTH_LONG).show()
+                    downloadViewModel.deleteDownload(item)
+                    item.downloadStartTime = it.timeInMillis
+                    WorkManager.getInstance(requireContext()).cancelUniqueWork(item.id.toString())
+                    downloadViewModel.queueDownloads(listOf(item))
+                }
+            }
+        }
 
         if (item.format.format_note == "?" || item.format.format_note == "") formatNote!!.visibility =
             View.GONE
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/util/UiUtil.kt b/app/src/main/java/com/deniscerri/ytdlnis/util/UiUtil.kt
index c3ae092b..78cd5806 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/util/UiUtil.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/util/UiUtil.kt
@@ -18,17 +18,25 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.FileProvider
+import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.LifecycleOwner
 import com.deniscerri.ytdlnis.R
 import com.deniscerri.ytdlnis.database.models.CommandTemplate
+import com.deniscerri.ytdlnis.database.models.DownloadItem
 import com.deniscerri.ytdlnis.database.models.Format
 import com.deniscerri.ytdlnis.database.models.TemplateShortcut
 import com.deniscerri.ytdlnis.database.viewmodel.CommandTemplateViewModel
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.chip.Chip
 import com.google.android.material.chip.ChipGroup
+import com.google.android.material.datepicker.CalendarConstraints
+import com.google.android.material.datepicker.DateValidatorPointForward
+import com.google.android.material.datepicker.MaterialDatePicker
 import com.google.android.material.textfield.TextInputLayout
+import com.google.android.material.timepicker.MaterialTimePicker
+import com.google.android.material.timepicker.TimeFormat
 import java.io.File
+import java.util.*
 
 class UiUtil(private val fileUtil: FileUtil) {
     fun populateFormatCard(formatCard : ConstraintLayout, chosenFormat: Format){
@@ -214,4 +222,38 @@ class UiUtil(private val fileUtil: FileUtil) {
         i.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
         fragmentContext.startActivity(i)
     }
+
+    fun showDatePicker(fragmentManager: FragmentManager , onSubmit : (chosenDate: Calendar) -> Unit ){
+        val currentDate = Calendar.getInstance()
+        val date = Calendar.getInstance()
+
+        val datePicker = MaterialDatePicker.Builder.datePicker()
+            .setCalendarConstraints(
+                CalendarConstraints.Builder()
+                    .setValidator(DateValidatorPointForward.now())
+                    .build()
+            )
+            .setSelection(MaterialDatePicker.todayInUtcMilliseconds())
+            .build()
+
+        datePicker.addOnPositiveButtonClickListener{
+            date.timeInMillis = it
+
+
+            val timepicker = MaterialTimePicker.Builder()
+                .setTimeFormat(TimeFormat.CLOCK_24H)
+                .setHour(currentDate.get(Calendar.HOUR_OF_DAY))
+                .setMinute(currentDate.get(Calendar.MINUTE))
+                .build()
+
+            timepicker.addOnPositiveButtonClickListener{
+                date[Calendar.HOUR_OF_DAY] = timepicker.hour
+                date[Calendar.MINUTE] = timepicker.minute
+                onSubmit(date)
+            }
+            timepicker.show(fragmentManager, "timepicker")
+
+        }
+        datePicker.show(fragmentManager, "datepicker")
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
index cc0288b2..f528de41 100644
--- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -9,7 +9,7 @@
     <path
         android:name="path"
         android:pathData="M 73.977 46.512 C 75.734 48.222 76.781 50.662 76.872 53.315 C 76.945 55.412 77 57.629 77 59.482 C 77 61.335 76.945 63.552 76.872 65.649 C 76.718 70.133 73.835 74.006 69.404 74.78 C 65.706 75.426 60.571 76 54 76 C 47.429 76 42.294 75.426 38.596 74.78 C 34.165 74.006 31.282 70.133 31.128 65.649 C 31.055 63.552 31 61.335 31 59.482 C 31 57.629 31.055 55.412 31.128 53.315 C 31.282 48.831 34.165 44.957 38.596 44.183 C 41.576 43.663 45.489 43.189 50.335 43.025 C 51.232 37.348 56.145 33 62.083 33 C 68.658 33 73.977 38.331 73.977 44.895 L 73.977 46.512 Z M 52.345 42.976 C 52.886 42.968 53.438 42.963 54 42.963 L 54.086 42.963 C 53.495 42.964 52.915 42.969 52.347 42.978 C 52.224 43.601 52.16 44.244 52.16 44.902 L 52.16 51.756 L 48.489 51.76 C 46.26 51.763 44.867 54.174 45.98 56.106 L 51.541 65.764 C 52.656 67.699 55.448 67.701 56.565 65.767 L 62.15 56.095 C 63.267 54.161 61.869 51.744 59.636 51.747 L 55.803 51.752 L 55.803 44.902 L 55.803 44.895 L 55.782 44.895 C 55.782 41.413 58.603 38.59 62.083 38.59 C 65.26 38.59 67.888 40.943 68.322 44.003 C 68.695 44.062 69.056 44.122 69.404 44.183 C 70.345 44.347 71.216 44.651 72.006 45.071 L 72.006 44.895 C 72.006 39.412 67.563 34.967 62.083 34.967 C 57.259 34.967 53.239 38.411 52.345 42.976 Z M 66.248 43.705 C 65.731 41.885 64.058 40.557 62.083 40.557 C 60.356 40.557 58.86 41.571 58.166 43.043 C 61.248 43.162 63.941 43.407 66.248 43.705 Z"
-        android:fillColor="#d43c3c"
+        android:fillColor="@color/icon_fg"
         android:strokeWidth="1"
         android:fillType="evenOdd"/>
 </vector>
diff --git a/app/src/main/res/drawable/image_gradient_shape.xml b/app/src/main/res/drawable/image_gradient_shape.xml
new file mode 100644
index 00000000..b6370a0d
--- /dev/null
+++ b/app/src/main/res/drawable/image_gradient_shape.xml
@@ -0,0 +1,11 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+
+    <gradient
+        android:angle="90"
+        android:endColor="#00ffffff"
+        android:startColor="?attr/colorSurfaceContainer"
+        android:centerColor="#00ffffff" />
+
+    <corners android:radius="0dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/active_download_card.xml b/app/src/main/res/layout/active_download_card.xml
index e5b6209a..414137d8 100644
--- a/app/src/main/res/layout/active_download_card.xml
+++ b/app/src/main/res/layout/active_download_card.xml
@@ -30,6 +30,7 @@
                 android:id="@+id/image_view"
                 android:adjustViewBounds="true"
                 android:scaleType="centerCrop"
+                android:foreground="@drawable/image_gradient_shape"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" />
 
@@ -45,109 +46,97 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
-                <TextView
-                    android:id="@+id/title"
+                <LinearLayout
                     android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:paddingStart="10dp"
-                    android:paddingTop="10dp"
-                    android:paddingEnd="10dp"
-                    android:paddingBottom="10dp"
-                    android:shadowColor="@color/black"
-                    android:shadowDx="4"
-                    android:shadowDy="4"
-                    android:shadowRadius="2"
-                    android:textColor="@color/white"
-                    android:textSize="15sp"
-                    android:textStyle="bold"
-                    app:layout_constraintEnd_toStartOf="@+id/active_download_cancel"
-                    app:layout_constraintHorizontal_bias="0.0"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <TextView
-                    android:id="@+id/author"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:gravity="bottom"
-                    android:paddingLeft="10dp"
-                    android:paddingTop="10dp"
-                    android:paddingRight="10dp"
-                    android:paddingBottom="10dp"
-                    android:shadowColor="@color/black"
-                    android:shadowDx="4"
-                    android:shadowDy="4"
-                    android:shadowRadius="1.5"
-                    android:textColor="@color/white"
-                    android:textSize="12sp"
-                    android:textStyle="bold"
+                    android:layout_height="0dp"
+                    android:orientation="vertical"
                     app:layout_constraintBottom_toTopOf="@+id/linearLayout2"
                     app:layout_constraintEnd_toStartOf="@+id/active_download_cancel"
-                    app:layout_constraintHorizontal_bias="0.0"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/title" />
+                    app:layout_constraintTop_toTopOf="parent">
 
-                <TextView
-                    android:id="@+id/format_note"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingVertical="10dp"
-                    android:paddingStart="10dp"
-                    android:paddingEnd="0dp"
-                    android:textSize="15sp"
-                    android:shadowColor="@color/black"
-                    android:shadowDx="4"
-                    android:shadowDy="4"
-                    android:shadowRadius="2"
-                    android:textColor="@color/white"
-                    android:textStyle="bold"
-                    app:layout_constraintBottom_toTopOf="@+id/output"
-                    app:layout_constraintStart_toStartOf="parent" />
+                    <TextView
+                        android:id="@+id/title"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:ellipsize="end"
+                        android:maxLines="2"
+                        android:paddingStart="10dp"
+                        android:scrollbars="none"
+                        android:paddingTop="10dp"
+                        android:paddingEnd="10dp"
+                        android:shadowColor="@color/black"
+                        android:shadowDx="4"
+                        android:shadowDy="4"
+                        android:shadowRadius="2"
+                        android:textColor="@color/white"
+                        android:textSize="17sp"
+                        android:textStyle="bold" />
 
-                <LinearLayout
+                    <TextView
+                        android:id="@+id/author"
+                        android:layout_width="296dp"
+                        android:layout_height="20dp"
+                        android:ellipsize="end"
+                        android:gravity="bottom"
+                        android:maxLines="1"
+                        android:paddingStart="10dp"
+                        android:scrollbars="none"
+                        android:paddingEnd="10dp"
+                        android:paddingBottom="5dp"
+                        android:shadowColor="@color/black"
+                        android:shadowDx="4"
+                        android:shadowDy="4"
+                        android:shadowRadius="1.5"
+                        android:textColor="@color/white"
+                        android:textSize="13sp"
+                        android:textStyle="bold" />
+
+
+                </LinearLayout>
+
+
+                <com.google.android.material.chip.ChipGroup
                     android:id="@+id/linearLayout2"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:paddingHorizontal="10dp"
                     android:layout_gravity="bottom"
                     android:orientation="horizontal"
-                    android:padding="10dp"
                     app:layout_constraintBottom_toTopOf="@+id/output"
-                    app:layout_constraintStart_toEndOf="@+id/format_note">
+                    app:layout_constraintStart_toStartOf="parent">
+
+                    <com.google.android.material.chip.Chip
+                        android:id="@+id/format_note"
+                        style="@style/Widget.Material3.FloatingActionButton.Large.Secondary"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:clickable="false"
+                        app:layout_constraintBottom_toTopOf="@+id/output"
+                        app:layout_constraintStart_toStartOf="parent" />
 
 
-                    <TextView
+                    <com.google.android.material.chip.Chip
                         android:id="@+id/codec"
                         style="@style/Widget.Material3.FloatingActionButton.Large.Secondary"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginEnd="5dp"
-                        android:background="?attr/colorSecondary"
                         android:clickable="false"
-                        android:gravity="center"
-                        android:minWidth="30dp"
-                        android:paddingHorizontal="10dp"
-                        app:cornerRadius="10dp"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
-                    <TextView
+                    <com.google.android.material.chip.Chip
                         android:id="@+id/file_size"
                         style="@style/Widget.Material3.FloatingActionButton.Large.Tertiary"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginEnd="5dp"
-                        android:background="?attr/colorSecondary"
                         android:clickable="false"
-                        android:gravity="center"
-                        android:minWidth="30dp"
-                        android:paddingHorizontal="10dp"
-                        app:cornerRadius="10dp"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
-                </LinearLayout>
+                </com.google.android.material.chip.ChipGroup>
 
 
                 <TextView
@@ -159,12 +148,7 @@
                     android:paddingRight="10dp"
                     android:paddingBottom="10dp"
                     android:textSize="12sp"
-                    android:textStyle="bold"
-                    android:shadowColor="@color/black"
-                    android:shadowDx="4"
-                    android:shadowDy="4"
-                    android:shadowRadius="2"
-                    android:textColor="@color/white"
+                    android:fontFamily="monospace"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent" />
diff --git a/app/src/main/res/layout/history_card.xml b/app/src/main/res/layout/history_card.xml
index fe32e84c..8b97d119 100644
--- a/app/src/main/res/layout/history_card.xml
+++ b/app/src/main/res/layout/history_card.xml
@@ -109,7 +109,7 @@
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintVertical_bias="0.2" />
+                    app:layout_constraintVertical_bias="0.375" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/history_item_details_bottom_sheet.xml b/app/src/main/res/layout/history_item_details_bottom_sheet.xml
index 2180e5b6..76a29928 100644
--- a/app/src/main/res/layout/history_item_details_bottom_sheet.xml
+++ b/app/src/main/res/layout/history_item_details_bottom_sheet.xml
@@ -83,6 +83,20 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/url">
 
+                <com.google.android.material.chip.Chip
+                    android:id="@+id/time"
+                    style="@style/Widget.Material3.FloatingActionButton.Large.Primary"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:clickable="true"
+                    android:minWidth="30dp"
+                    app:cornerRadius="10dp"
+                    app:chipIcon="@drawable/ic_clock"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    android:focusable="true" />
+
                 <com.google.android.material.chip.Chip
                     android:id="@+id/format_note"
                     style="@style/Widget.Material3.FloatingActionButton.Large.Primary"
diff --git a/app/src/main/res/layout/search_suggestion_item.xml b/app/src/main/res/layout/search_suggestion_item.xml
index 314a9d6e..edb96636 100644
--- a/app/src/main/res/layout/search_suggestion_item.xml
+++ b/app/src/main/res/layout/search_suggestion_item.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/search_suggestions_constraintLayout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -30,34 +30,32 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
-                <ImageButton
-                    style="?attr/materialIconButtonStyle"
-                    android:layout_width="40dp"
-                    android:scrollbars="none"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0.01"
-                    android:src="@drawable/ic_search"
-                    />
-
                 <TextView
                     android:id="@+id/suggestion_text"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
                     android:maxLines="1"
+                    android:background="?attr/selectableItemBackground"
+                    android:focusable="true"
+                    android:clickable="true"
                     android:ellipsize="end"
                     android:layout_gravity="center_vertical"
                     android:gravity="center_vertical"
-                    android:paddingStart="20dp"
                     android:paddingEnd="20dp"
                     android:textSize="16sp"
-                    android:textStyle="bold" />
+                    android:textStyle="bold"
+                    android:drawablePadding="20dp"
+                    app:drawableLeftCompat="@drawable/ic_search" />
 
                 <ImageButton
                     style="?attr/materialIconButtonStyle"
                     android:id="@+id/set_search_query_button"
                     android:layout_width="40dp"
                     android:scrollbars="none"
+                    android:background="?attr/selectableItemBackground"
+                    android:focusable="true"
+                    android:clickable="true"
                     android:layout_height="match_parent"
                     android:src="@drawable/ic_arrow_up"
                     android:layout_weight="0.01"
diff --git a/app/src/main/res/values-night-v31/colors.xml b/app/src/main/res/values-night-v31/colors.xml
new file mode 100644
index 00000000..d64bff24
--- /dev/null
+++ b/app/src/main/res/values-night-v31/colors.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="white">#FFFFFF</color>
+    <color name="black">#000000</color>
+    <color name="grey">#323232</color>
+    <color name="light_grey">#A6A6A6</color>
+	<color name="icon_bg">@android:color/system_neutral1_800</color>
+	<color name="icon_fg">@android:color/system_accent1_100</color>
+</resources>
diff --git a/app/src/main/res/values-notnight-v31/colors.xml b/app/src/main/res/values-notnight-v31/colors.xml
new file mode 100644
index 00000000..30cdd0b6
--- /dev/null
+++ b/app/src/main/res/values-notnight-v31/colors.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="white">#FFFFFF</color>
+    <color name="black">#000000</color>
+    <color name="grey">#323232</color>
+    <color name="light_grey">#A6A6A6</color>
+	<color name="icon_bg">@android:color/system_accent1_100</color>
+	<color name="icon_fg">@android:color/system_neutral1_700</color>
+</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 8ac5d0a1..60602520 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -5,4 +5,5 @@
     <color name="grey">#323232</color>
     <color name="light_grey">#A6A6A6</color>
 	<color name="icon_bg">@android:color/background_dark</color>
+	<color name="icon_fg">#d43c3c</color>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c10017f0..4233a3b1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -219,4 +219,5 @@
     <string name="help_translate_summary">Translate this app on your language using Weblate</string>
     <string name="workmanager_updated">You need to restart the app and have no active downloads for this preference to take effect!</string>
     <string name="restart">Restart</string>
+    <string name="download_rescheduled_to">Download rescheduled to:</string>
 </resources>
\ No newline at end of file