diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchAdapter.kt
index 99c381a9b..035238676 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchAdapter.kt
@@ -37,7 +37,7 @@ class TrackSearchAdapter(context: Context) :
         } else {
             holder = v.tag as TrackSearchHolder
         }
-        holder.onSetValues(track)
+        holder.onSetValues(track!!)
         return v
     }
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/PreMigrationController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/PreMigrationController.kt
index 167db498b..f0da75eff 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/PreMigrationController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/design/PreMigrationController.kt
@@ -62,15 +62,15 @@ class PreMigrationController(bundle: Bundle? = null) : BaseController<PreMigrati
         ourAdapter.itemTouchHelperCallback = null // Reset adapter touch adapter to fix drag after rotation
         ourAdapter.isHandleDragEnabled = true
         dialog = null
-        val fabBaseMarginBottom = binding.fab?.marginBottom ?: 0
+        val fabBaseMarginBottom = binding.fab.marginBottom
         binding.recycler.doOnApplyWindowInsets { v, insets, padding ->
 
-            binding.fab?.updateLayoutParams<ViewGroup.MarginLayoutParams> {
+            binding.fab.updateLayoutParams<ViewGroup.MarginLayoutParams> {
                 bottomMargin = fabBaseMarginBottom + insets.systemWindowInsetBottom
             }
             // offset the recycler by the fab's inset + some inset on top
-            v.updatePaddingRelative(bottom = padding.bottom + (binding.fab?.marginBottom ?: 0) +
-                fabBaseMarginBottom + (binding.fab?.height ?: 0))
+            v.updatePaddingRelative(bottom = padding.bottom + (binding.fab.marginBottom) +
+                fabBaseMarginBottom + (binding.fab.height))
         }
 
         binding.fab.setOnClickListener {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessAdapter.kt
index 220f7d478..27ccfacc7 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/migration/manga/process/MigrationProcessAdapter.kt
@@ -84,7 +84,7 @@ class MigrationProcessAdapter(
     fun removeManga(position: Int) {
         val item = getItem(position) ?: return
         menuItemListener.removeManga(item)
-        item?.manga?.migrationJob?.cancel()
+        item.manga.migrationJob.cancel()
         removeItem(position)
         items = currentItems
         sourceFinished()
diff --git a/app/src/main/java/exh/debug/SettingsDebugController.kt b/app/src/main/java/exh/debug/SettingsDebugController.kt
index 31d1ef9c5..d7c92d572 100644
--- a/app/src/main/java/exh/debug/SettingsDebugController.kt
+++ b/app/src/main/java/exh/debug/SettingsDebugController.kt
@@ -6,6 +6,7 @@ import android.text.Html
 import android.util.Log
 import android.widget.HorizontalScrollView
 import android.widget.TextView
+import androidx.core.text.HtmlCompat
 import androidx.preference.PreferenceScreen
 import com.afollestad.materialdialogs.MaterialDialog
 import eu.kanade.tachiyomi.ui.setting.SettingsController
@@ -76,6 +77,6 @@ class SettingsDebugController : SettingsController() {
     }
 
     companion object {
-        private val MODIFIED_TEXT = Html.fromHtml("<font color='red'>MODIFIED</font>")
+        private val MODIFIED_TEXT = HtmlCompat.fromHtml("<font color='red'>MODIFIED</font>", HtmlCompat.FROM_HTML_MODE_LEGACY)
     }
 }
diff --git a/app/src/main/java/exh/favorites/FavoritesIntroDialog.kt b/app/src/main/java/exh/favorites/FavoritesIntroDialog.kt
index a458f63ea..d38095881 100644
--- a/app/src/main/java/exh/favorites/FavoritesIntroDialog.kt
+++ b/app/src/main/java/exh/favorites/FavoritesIntroDialog.kt
@@ -2,6 +2,7 @@ package exh.favorites
 
 import android.content.Context
 import android.text.Html
+import androidx.core.text.HtmlCompat
 import com.afollestad.materialdialogs.MaterialDialog
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import uy.kohesive.injekt.injectLazy
@@ -11,7 +12,7 @@ class FavoritesIntroDialog {
 
     fun show(context: Context) = MaterialDialog.Builder(context)
             .title("IMPORTANT FAVORITES SYNC NOTES")
-            .content(Html.fromHtml(FAVORITES_INTRO_TEXT))
+            .content(HtmlCompat.fromHtml(FAVORITES_INTRO_TEXT, HtmlCompat.FROM_HTML_MODE_LEGACY))
             .positiveText("Ok")
             .onPositive { _, _ ->
                 prefs.eh_showSyncIntro().set(false)
diff --git a/app/src/main/java/exh/log/EHDebugModeOverlay.kt b/app/src/main/java/exh/log/EHDebugModeOverlay.kt
index 6a846a61f..2d63c283a 100644
--- a/app/src/main/java/exh/log/EHDebugModeOverlay.kt
+++ b/app/src/main/java/exh/log/EHDebugModeOverlay.kt
@@ -6,6 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import android.widget.TextView
+import androidx.core.text.HtmlCompat
 import com.ms_square.debugoverlay.DataObserver
 import com.ms_square.debugoverlay.OverlayModule
 import eu.kanade.tachiyomi.BuildConfig
@@ -26,7 +27,7 @@ class EHDebugModeOverlay(private val context: Context) : OverlayModule<String>(n
     }
     override fun removeObserver(observer: DataObserver<Any>) {}
     override fun onDataAvailable(data: String?) {
-        textView?.text = Html.fromHtml(data)
+        textView?.text = HtmlCompat.fromHtml(data!!, HtmlCompat.FROM_HTML_MODE_LEGACY)
     }
 
     override fun createView(root: ViewGroup, textColor: Int, textSize: Float, textAlpha: Float): View {
@@ -40,7 +41,7 @@ class EHDebugModeOverlay(private val context: Context) : OverlayModule<String>(n
         textView.setTextColor(textColor)
         textView.textSize = textSize
         textView.alpha = textAlpha
-        textView.text = Html.fromHtml(buildInfo())
+        textView.text = HtmlCompat.fromHtml(buildInfo(), HtmlCompat.FROM_HTML_MODE_LEGACY)
         textView.layoutParams = LinearLayout.LayoutParams(
                 ViewGroup.LayoutParams.WRAP_CONTENT,
                 ViewGroup.LayoutParams.WRAP_CONTENT