diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/QuickAnswerActivity.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/QuickAnswerActivity.kt
index 79247bafd..f8698eb19 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/QuickAnswerActivity.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/QuickAnswerActivity.kt
@@ -174,7 +174,11 @@ class QuickAnswerActivity : AppCompatActivity() {
                 AttachmentsViewBinder(this, object : OnAttachmentsActionCallback {
                     override fun onPollOpen(poll: Poll) {}
                     override fun onVideoPlay(video: Video) {}
-                    override fun onAudioPlay(position: Int, audios: ArrayList<Audio>) {
+                    override fun onAudioPlay(
+                        position: Int,
+                        audios: ArrayList<Audio>,
+                        holderPosition: Int?
+                    ) {
                         startForPlayList(this@QuickAnswerActivity, audios, position, false)
                     }
 
@@ -245,7 +249,7 @@ class QuickAnswerActivity : AppCompatActivity() {
                 attachmentsHolder,
                 true,
                 msg.getObjectId(),
-                msg.peerId
+                msg.peerId, null
             )
             attachmentsViewBinder.displayForwards(msg.fwd, forwardMessagesRoot, true)
         }
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/dialog/base/AccountDependencyDialogFragment.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/dialog/base/AccountDependencyDialogFragment.kt
index 855f77afc..2850cb786 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/dialog/base/AccountDependencyDialogFragment.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/dialog/base/AccountDependencyDialogFragment.kt
@@ -116,10 +116,10 @@ abstract class AccountDependencyDialogFragment : BaseDialogFragment(), OnAttachm
         getVideoPreviewPlace(accountId, video).tryOpenWith(requireActivity())
     }
 
-    override fun onAudioPlay(position: Int, audios: ArrayList<Audio>) {
+    override fun onAudioPlay(position: Int, audios: ArrayList<Audio>, holderPosition: Int?) {
         startForPlayList(requireActivity(), audios, position, false)
         if (!Settings.get().other().isShow_mini_player) getPlayerPlace(
-            Settings.get().accounts().current
+            accountId
         ).tryOpenWith(requireActivity())
     }
 
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/PreferencesFragment.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/PreferencesFragment.kt
index baa76bfca..8f8fdb763 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/PreferencesFragment.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/PreferencesFragment.kt
@@ -1668,11 +1668,11 @@ class PreferencesFragment : AbsPreferencesFragment(), PreferencesAdapter.OnScree
                 selItems(R.array.array_rendering_mode_names, R.array.array_rendering_mode_items),
                 parentFragmentManager
             ) {
-                initialSelection = "2"
+                initialSelection = "0"
                 titleRes = R.string.rendering_mode
                 visible = Utils.hasPie()
                 onSelectionChange { it ->
-                    var sz = 2
+                    var sz = 0
                     try {
                         sz = it.trim { it <= ' ' }.toInt()
                     } catch (ignored: NumberFormatException) {
@@ -2570,8 +2570,12 @@ class PreferencesFragment : AbsPreferencesFragment(), PreferencesAdapter.OnScree
                     progress: Int,
                     fromUser: Boolean
                 ) {
-                    textVerticalSensitive.text =
-                        getString(R.string.slidr_sensitive, progress)
+                    if (fromUser && progress < 20) {
+                        verticalSensitive.progress = 20
+                        textVerticalSensitive.text = getString(R.string.slidr_sensitive, 20)
+                    } else {
+                        textVerticalSensitive.text = getString(R.string.slidr_sensitive, progress)
+                    }
                 }
 
                 override fun onStartTrackingTouch(seekBar: SeekBar?) {}
@@ -2584,8 +2588,12 @@ class PreferencesFragment : AbsPreferencesFragment(), PreferencesAdapter.OnScree
                     progress: Int,
                     fromUser: Boolean
                 ) {
-                    textHorizontalSensitive.text =
-                        getString(R.string.slidr_sensitive, progress)
+                    if (fromUser && progress < 20) {
+                        horizontalSensitive.progress = 20
+                        textHorizontalSensitive.text = getString(R.string.slidr_sensitive, 20)
+                    } else {
+                        textHorizontalSensitive.text = getString(R.string.slidr_sensitive, progress)
+                    }
                 }
 
                 override fun onStartTrackingTouch(seekBar: SeekBar) {}
@@ -2598,8 +2606,14 @@ class PreferencesFragment : AbsPreferencesFragment(), PreferencesAdapter.OnScree
                     progress: Int,
                     fromUser: Boolean
                 ) {
-                    textVerticalVelocityThreshold.text =
-                        getString(R.string.slidr_velocity_threshold, progress)
+                    if (fromUser && progress < 4) {
+                        verticalVelocityThreshold.progress = 4
+                        textVerticalVelocityThreshold.text =
+                            getString(R.string.slidr_velocity_threshold, 4)
+                    } else {
+                        textVerticalVelocityThreshold.text =
+                            getString(R.string.slidr_velocity_threshold, progress)
+                    }
                 }
 
                 override fun onStartTrackingTouch(seekBar: SeekBar?) {}
@@ -2612,8 +2626,14 @@ class PreferencesFragment : AbsPreferencesFragment(), PreferencesAdapter.OnScree
                     progress: Int,
                     fromUser: Boolean
                 ) {
-                    textHorizontalVelocityThreshold.text =
-                        getString(R.string.slidr_velocity_threshold, progress)
+                    if (fromUser && progress < 4) {
+                        horizontalVelocityThreshold.progress = 4
+                        textHorizontalVelocityThreshold.text =
+                            getString(R.string.slidr_velocity_threshold, 4)
+                    } else {
+                        textHorizontalVelocityThreshold.text =
+                            getString(R.string.slidr_velocity_threshold, progress)
+                    }
                 }
 
                 override fun onStartTrackingTouch(seekBar: SeekBar) {}
@@ -2626,8 +2646,14 @@ class PreferencesFragment : AbsPreferencesFragment(), PreferencesAdapter.OnScree
                     progress: Int,
                     fromUser: Boolean
                 ) {
-                    textVerticalDistanceThreshold.text =
-                        getString(R.string.slidr_distance_threshold, progress)
+                    if (fromUser && progress < 4) {
+                        verticalDistanceThreshold.progress = 4
+                        textVerticalDistanceThreshold.text =
+                            getString(R.string.slidr_distance_threshold, 4)
+                    } else {
+                        textVerticalDistanceThreshold.text =
+                            getString(R.string.slidr_distance_threshold, progress)
+                    }
                 }
 
                 override fun onStartTrackingTouch(seekBar: SeekBar?) {}
@@ -2640,8 +2666,14 @@ class PreferencesFragment : AbsPreferencesFragment(), PreferencesAdapter.OnScree
                     progress: Int,
                     fromUser: Boolean
                 ) {
-                    textHorizontalDistanceThreshold.text =
-                        getString(R.string.slidr_distance_threshold, progress)
+                    if (fromUser && progress < 4) {
+                        horizontalDistanceThreshold.progress = 4
+                        textHorizontalDistanceThreshold.text =
+                            getString(R.string.slidr_distance_threshold, 4)
+                    } else {
+                        textHorizontalDistanceThreshold.text =
+                            getString(R.string.slidr_distance_threshold, progress)
+                    }
                 }
 
                 override fun onStartTrackingTouch(seekBar: SeekBar) {}
@@ -2696,8 +2728,7 @@ class PreferencesFragment : AbsPreferencesFragment(), PreferencesAdapter.OnScree
                 .setNegativeButton(R.string.button_cancel, null)
                 .setNeutralButton(R.string.set_default) { _: DialogInterface?, _: Int ->
                     Settings.get()
-                        .other().slidrSettings =
-                        SlidrSettings().set_default()
+                        .other().slidrSettings = SlidrSettings().set_default()
                     parentFragmentManager.setFragmentResult(
                         PreferencesExtra.RECREATE_ACTIVITY_REQUEST,
                         Bundle()
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/audio/local/localaudioalbums/LocalAudioAlbumsAdapter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/audio/local/localaudioalbums/LocalAudioAlbumsAdapter.kt
index c7dfbcbc8..c0b47f625 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/audio/local/localaudioalbums/LocalAudioAlbumsAdapter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/audio/local/localaudioalbums/LocalAudioAlbumsAdapter.kt
@@ -30,6 +30,19 @@ class LocalAudioAlbumsAdapter(
         notifyDataSetChanged()
     }
 
+    fun getFirstWithCurrentId(): Int {
+        var ret = 0
+        var iter = 0
+        for (i in data) {
+            if (i.getId() == currentId) {
+                ret = iter
+                break
+            }
+            iter++
+        }
+        return ret
+    }
+
     fun updateCurrentId(currentId: Int) {
         this.currentId = currentId
         notifyDataSetChanged()
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/audio/local/localaudioalbums/LocalAudioAlbumsFragment.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/audio/local/localaudioalbums/LocalAudioAlbumsFragment.kt
index 74fa3d6e6..8831794b7 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/audio/local/localaudioalbums/LocalAudioAlbumsFragment.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/audio/local/localaudioalbums/LocalAudioAlbumsFragment.kt
@@ -17,6 +17,7 @@ import dev.ragnarok.fenrir.fragment.base.core.IPresenterFactory
 import dev.ragnarok.fenrir.fragment.photos.localimagealbums.LocalPhotoAlbumsAdapter
 import dev.ragnarok.fenrir.listener.PicassoPauseOnScrollListener
 import dev.ragnarok.fenrir.model.LocalImageAlbum
+import dev.ragnarok.fenrir.orZero
 import dev.ragnarok.fenrir.settings.Settings
 import dev.ragnarok.fenrir.util.AppPerms.requestPermissionsAbs
 import dev.ragnarok.fenrir.view.MySearchView
@@ -34,6 +35,7 @@ class LocalAudioAlbumsFragment :
     private var mRecyclerView: RecyclerView? = null
     private var mAlbumsAdapter: LocalAudioAlbumsAdapter? = null
     private var listener: Listener? = null
+    private var manager: RecyclerView.LayoutManager? = null
     override fun onCreateDialog(savedInstanceState: Bundle?): BottomSheetDialog {
         val dialog = BottomSheetDialog(requireActivity(), theme)
         val behavior = dialog.behavior
@@ -74,8 +76,7 @@ class LocalAudioAlbumsFragment :
             }
         })
         val columnCount = resources.getInteger(R.integer.photos_albums_column_count)
-        val manager: RecyclerView.LayoutManager =
-            StaggeredGridLayoutManager(columnCount, StaggeredGridLayoutManager.VERTICAL)
+        manager = StaggeredGridLayoutManager(columnCount, StaggeredGridLayoutManager.VERTICAL)
         mRecyclerView = view.findViewById(R.id.recycler_view)
         mRecyclerView?.layoutManager = manager
         mRecyclerView?.addOnScrollListener(PicassoPauseOnScrollListener(LocalPhotoAlbumsAdapter.PICASSO_TAG))
@@ -109,6 +110,8 @@ class LocalAudioAlbumsFragment :
 
     override fun notifyDataChanged() {
         mAlbumsAdapter?.notifyDataSetChanged()
+        val pos = mAlbumsAdapter?.getFirstWithCurrentId().orZero()
+        manager?.scrollToPosition(pos)
     }
 
     override fun requestReadExternalStoragePermission() {
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/base/AttachmentsViewBinder.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/base/AttachmentsViewBinder.kt
index 005bca2cb..adb6765e4 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/base/AttachmentsViewBinder.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/base/AttachmentsViewBinder.kt
@@ -68,7 +68,8 @@ class AttachmentsViewBinder(
         containers: AttachmentsHolder,
         postsAsLinks: Boolean,
         messageId: Int?,
-        peerId: Long?
+        peerId: Long?,
+        holderPosition: Int?
     ) {
         if (attachments == null) {
             safeSetVisibitity(containers.vgAudios, View.GONE)
@@ -84,7 +85,11 @@ class AttachmentsViewBinder(
             containers.vgAudios?.dispose()
         } else {
             displayArticles(attachments.articles, containers.vgArticles)
-            containers.vgAudios?.displayAudios(attachments.audios, mAttachmentsActionCallback)
+            containers.vgAudios?.displayAudios(
+                attachments.audios,
+                mAttachmentsActionCallback,
+                holderPosition
+            )
             displayVoiceMessages(
                 attachments.voiceMessages,
                 containers.voiceMessageRoot,
@@ -400,7 +405,14 @@ class AttachmentsViewBinder(
                 ) View.VISIBLE else View.GONE
                 check.ownerName.text = copy.authorName
                 check.buttonDots.tag = copy
-                displayAttachments(copy.attachments, check.attachmentsHolder, false, null, null)
+                displayAttachments(
+                    copy.attachments,
+                    check.attachmentsHolder,
+                    false,
+                    null,
+                    null,
+                    null
+                )
             } else {
                 postViewGroup.visibility = View.GONE
             }
@@ -537,7 +549,8 @@ class AttachmentsViewBinder(
                     attachmentContainers,
                     postsAsLinks,
                     message.getObjectId(),
-                    message.peerId
+                    message.peerId,
+                    null
                 )
             } else {
                 itemView.visibility = View.GONE
@@ -566,7 +579,6 @@ class AttachmentsViewBinder(
                 val tvDetails = itemView.findViewById<TextView>(R.id.item_document_ext_size)
                 val tvPostText: EmojiconTextView = itemView.findViewById(R.id.item_message_text)
                 val ivPhotoT: ShapeableImageView = itemView.findViewById(R.id.item_document_image)
-                val ivGraffiti = itemView.findViewById<ImageView>(R.id.item_document_graffiti)
                 val ivPhoto_Post = itemView.findViewById<ImageView>(R.id.item_post_avatar_image)
                 val ivType = itemView.findViewById<ImageView>(R.id.item_document_type)
                 val tvShowMore = itemView.findViewById<TextView>(R.id.item_post_show_more)
@@ -650,7 +662,6 @@ class AttachmentsViewBinder(
                 attachmentsRoot.visibility = View.GONE
                 itemView.setOnClickListener { openDocLink(doc) }
                 ivPhoto_Post.visibility = View.GONE
-                ivGraffiti.visibility = View.GONE
                 when (doc.type) {
                     AttachmentsTypes.DOC -> if (imageUrl != null) {
                         ivType.visibility = View.GONE
@@ -666,8 +677,8 @@ class AttachmentsViewBinder(
                         ivPhotoT.visibility = View.GONE
                         if (imageUrl != null) {
                             ivType.visibility = View.GONE
-                            ivGraffiti.visibility = View.VISIBLE
-                            displayAvatar(ivGraffiti, null, imageUrl, Constants.PICASSO_TAG)
+                            ivPhotoT.visibility = View.VISIBLE
+                            displayAvatar(ivPhotoT, null, imageUrl, Constants.PICASSO_TAG)
                         } else {
                             ivType.visibility = View.VISIBLE
                             ivType.setImageResource(R.drawable.counter)
@@ -772,7 +783,7 @@ class AttachmentsViewBinder(
                             post.attachments,
                             attachmentsHolder,
                             false,
-                            null, null
+                            null, null, null
                         )
                     }
 
@@ -799,7 +810,7 @@ class AttachmentsViewBinder(
                             comment.attachments,
                             attachmentsHolder,
                             false,
-                            null, null
+                            null, null, null
                         )
                     }
 
@@ -1023,7 +1034,7 @@ class AttachmentsViewBinder(
     interface OnAttachmentsActionCallback {
         fun onPollOpen(poll: Poll)
         fun onVideoPlay(video: Video)
-        fun onAudioPlay(position: Int, audios: ArrayList<Audio>)
+        fun onAudioPlay(position: Int, audios: ArrayList<Audio>, holderPosition: Int?)
         fun onForwardMessagesOpen(messages: ArrayList<Message>)
         fun onOpenOwner(ownerId: Long)
         fun onGoToMessagesLookup(message: Message)
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/base/DocLink.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/base/DocLink.kt
index 0bce9edde..b0ba2b2e4 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/base/DocLink.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/base/DocLink.kt
@@ -69,7 +69,7 @@ class DocLink(val attachment: AbsModel) {
                         val sizes = link.photo?.sizes
                         return sizes?.getUrlForSize(
                             Settings.get().main().prefPreviewImageSize,
-                            true
+                            false
                         )
                     }
                     return null
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/base/PlaceSupportMvpFragment.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/base/PlaceSupportMvpFragment.kt
index ff0287afa..66deefa72 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/base/PlaceSupportMvpFragment.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/base/PlaceSupportMvpFragment.kt
@@ -110,7 +110,7 @@ abstract class PlaceSupportMvpFragment<P : PlaceSupportPresenter<V>, V> : BaseMv
         presenter?.fireVideoClick(video)
     }
 
-    override fun onAudioPlay(position: Int, audios: ArrayList<Audio>) {
+    override fun onAudioPlay(position: Int, audios: ArrayList<Audio>, holderPosition: Int?) {
         presenter?.fireAudioPlayClick(position, audios)
     }
 
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/base/PostImage.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/base/PostImage.kt
index 4e89a03ad..3e447a020 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/base/PostImage.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/base/PostImage.kt
@@ -47,7 +47,7 @@ class PostImage(val attachment: AbsModel, val type: Int) {
 
             TYPE_GIF -> {
                 val document = attachment as Document
-                return document.getPreviewWithSize(PhotoSize.Q, false)
+                return document.getPreviewWithSize(photoPreviewSize, false)
             }
         }
         throw UnsupportedOperationException()
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/comments/CommentsAdapter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/comments/CommentsAdapter.kt
index 6117b082f..58d6f1564 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/comments/CommentsAdapter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/comments/CommentsAdapter.kt
@@ -92,7 +92,7 @@ class CommentsAdapter(
                 comment.attachments,
                 holder.attachmentContainers,
                 true,
-                null, null
+                null, null, null
             )
         }
         holder.tvOwnerName.text = comment.fullAuthorName
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/fave/favepages/FavePagesAdapter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/fave/favepages/FavePagesAdapter.kt
index e84b9e3df..f20a68b41 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/fave/favepages/FavePagesAdapter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/fave/favepages/FavePagesAdapter.kt
@@ -21,15 +21,12 @@ import dev.ragnarok.fenrir.model.Owner
 import dev.ragnarok.fenrir.module.FenrirNative
 import dev.ragnarok.fenrir.orZero
 import dev.ragnarok.fenrir.settings.CurrentTheme
-import dev.ragnarok.fenrir.settings.CurrentTheme.getColorPrimary
-import dev.ragnarok.fenrir.settings.CurrentTheme.getColorSecondary
 import dev.ragnarok.fenrir.settings.Settings
 import dev.ragnarok.fenrir.util.Utils
 import dev.ragnarok.fenrir.util.ViewUtils.displayAvatar
 import dev.ragnarok.fenrir.util.ViewUtils.getOnlineIcon
 import dev.ragnarok.fenrir.view.AspectRatioImageView
 import dev.ragnarok.fenrir.view.OnlineView
-import dev.ragnarok.fenrir.view.natives.rlottie.RLottieImageView
 
 class FavePagesAdapter(private var data: List<FavePage>, private val context: Context) :
     RecyclerView.Adapter<FavePagesAdapter.Holder>() {
@@ -67,21 +64,8 @@ class FavePagesAdapter(private var data: List<FavePage>, private val context: Co
                 .isOwnerInChangesMonitor(favePage.owner?.ownerId ?: favePage.getOwnerObjectId())
         ) {
             holder.ivMonitor.visibility = View.VISIBLE
-            holder.ivMonitor.fromRes(
-                dev.ragnarok.fenrir_common.R.raw.eye,
-                Utils.dp(24f),
-                Utils.dp(24f),
-                intArrayOf(
-                    0x333333,
-                    Color.parseColor("#ffffff"),
-                    0x777777,
-                    Color.parseColor("#000000")
-                )
-            )
-            holder.ivMonitor.playAnimation()
         } else {
             holder.ivMonitor.visibility = View.GONE
-            holder.ivMonitor.clearAnimationDrawable()
         }
         holder.blacklisted.clearColorFilter()
         if (favePage.type == FavePageType.USER) {
@@ -96,35 +80,14 @@ class FavePagesAdapter(private var data: List<FavePage>, private val context: Co
             holder.ivOnline.visibility = View.VISIBLE
             if (user?.blacklisted == true) {
                 holder.blacklisted.visibility = View.VISIBLE
-                if (Utils.hasMarshmallow() && FenrirNative.isNativeLoaded) {
-                    holder.blacklisted.fromRes(
-                        dev.ragnarok.fenrir_common.R.raw.skull,
-                        Utils.dp(48f),
-                        Utils.dp(48f),
-                        null
-                    )
-                    holder.blacklisted.playAnimation()
-                } else {
-                    holder.blacklisted.setImageResource(R.drawable.audio_died)
-                    holder.blacklisted.setColorFilter(Color.parseColor("#AAFF0000"))
-                }
+                holder.blacklisted.setImageResource(R.drawable.audio_died)
+                Utils.setColorFilter(holder.blacklisted, Color.parseColor("#ff0000"))
             } else if (user?.isFriend == true && Utils.hasMarshmallow() && FenrirNative.isNativeLoaded) {
                 holder.blacklisted.visibility = View.VISIBLE
-                holder.blacklisted.fromRes(
-                    dev.ragnarok.fenrir_common.R.raw.is_friend,
-                    Utils.dp(48f),
-                    Utils.dp(48f),
-                    intArrayOf(
-                        0x000000,
-                        getColorPrimary(context),
-                        0xffffff,
-                        getColorSecondary(context)
-                    )
-                )
-                holder.blacklisted.playAnimation()
+                holder.blacklisted.setImageResource(R.drawable.is_friend)
+                holder.blacklisted.clearColorFilter()
             } else {
                 holder.blacklisted.visibility = View.GONE
-                holder.blacklisted.clearAnimationDrawable()
             }
 
             val onlineIcon = getOnlineIcon(
@@ -160,22 +123,11 @@ class FavePagesAdapter(private var data: List<FavePage>, private val context: Co
             holder.name.setTextColor(Utils.getVerifiedColor(context, false))
             holder.ivOnline.visibility = View.GONE
             if (group?.isBlacklisted == true) {
+                holder.blacklisted.setImageResource(R.drawable.audio_died)
                 holder.blacklisted.visibility = View.VISIBLE
-                if (Utils.hasMarshmallow() && FenrirNative.isNativeLoaded) {
-                    holder.blacklisted.fromRes(
-                        dev.ragnarok.fenrir_common.R.raw.skull,
-                        Utils.dp(48f),
-                        Utils.dp(48f),
-                        null
-                    )
-                    holder.blacklisted.playAnimation()
-                } else {
-                    holder.blacklisted.setImageResource(R.drawable.audio_died)
-                    holder.blacklisted.setColorFilter(Color.parseColor("#AAFF0000"))
-                }
+                Utils.setColorFilter(holder.blacklisted, Color.parseColor("#ff0000"))
             } else {
                 holder.blacklisted.visibility = View.GONE
-                holder.blacklisted.clearAnimationDrawable()
             }
         }
         addSelectionProfileSupport(context, holder.avatar_root, favePage)
@@ -223,12 +175,12 @@ class FavePagesAdapter(private var data: List<FavePage>, private val context: Co
         OnCreateContextMenuListener {
         val avatar_root: ViewGroup
         val avatar: AspectRatioImageView
-        val blacklisted: RLottieImageView
+        val blacklisted: ImageView
         val name: TextView
         val description: TextView
         val ivOnline: OnlineView
         val ivVerified: ImageView
-        val ivMonitor: RLottieImageView
+        val ivMonitor: ImageView
         override fun onCreateContextMenu(menu: ContextMenu, v: View, menuInfo: ContextMenuInfo?) {
             val position = recyclerView?.getChildAdapterPosition(v) ?: 0
             val favePage = data[position]
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/fave/faveposts/FavePostAdapter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/fave/faveposts/FavePostAdapter.kt
index 5b7e06c9f..4cdaa7b95 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/fave/faveposts/FavePostAdapter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/fave/faveposts/FavePostAdapter.kt
@@ -65,7 +65,7 @@ class FavePostAdapter(
             holder.attachmentContainers,
             false,
             null,
-            null
+            null, null
         )
         attachmentsViewBinder.displayCopyHistory(
             post.getCopyHierarchy(),
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/feed/FeedAdapter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/feed/FeedAdapter.kt
index 3683c6713..ae42b3829 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/feed/FeedAdapter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/feed/FeedAdapter.kt
@@ -53,7 +53,7 @@ class FeedAdapter(
             item.attachments,
             viewHolder.attachmentsHolder,
             false,
-            null, null
+            null, null, null
         )
         attachmentsViewBinder.displayCopyHistory(
             item.getCopyHistory(),
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/feed/newsfeedcomments/NewsfeedCommentsAdapter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/feed/newsfeedcomments/NewsfeedCommentsAdapter.kt
index 3bb58be2a..1de945d72 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/feed/newsfeedcomments/NewsfeedCommentsAdapter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/feed/newsfeedcomments/NewsfeedCommentsAdapter.kt
@@ -201,7 +201,7 @@ class NewsfeedCommentsAdapter(
             holder.commentAttachmentHolder,
             true,
             null,
-            null
+            null, null
         )
         displayAvatar(
             holder.commentAvatar,
@@ -241,7 +241,7 @@ class NewsfeedCommentsAdapter(
             holder.postAttachmentsHolder,
             false,
             null,
-            null
+            null, null
         )
         attachmentsViewBinder.displayCopyHistory(
             post.getCopyHierarchy(),
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/feedback/FeedbackViewBinder.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/feedback/FeedbackViewBinder.kt
index 6c4daf25a..5d0e6a262 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/feedback/FeedbackViewBinder.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/feedback/FeedbackViewBinder.kt
@@ -80,7 +80,7 @@ class FeedbackViewBinder(
             containers,
             true,
             null,
-            null
+            null, null
         )
         setupAttachmentViewWithVideo(notification.commentOf as Video, holder.ivRightAttachment)
         feedback?.maxAuthorAvaUrl?.let { showUserAvatarOnImageView(it, holder.cOwnerAvatar) }
@@ -153,7 +153,7 @@ class FeedbackViewBinder(
             containers,
             true,
             null,
-            null
+            null, null
         )
         setupAttachmentViewWithPhoto(notification.commentOf as Photo, holder.ivRightAttachment)
         feedback?.fromId?.let { solveOwnerOpenByAvatar(holder.cOwnerAvatar, it) }
@@ -215,7 +215,7 @@ class FeedbackViewBinder(
             containers,
             true,
             null,
-            null
+            null, null
         )
         holder.ivRightAttachment.visibility = View.GONE
         feedback?.fromId?.let { solveOwnerOpenByAvatar(holder.cOwnerAvatar, it) }
@@ -252,7 +252,14 @@ class FeedbackViewBinder(
             .transform(transformation)
             .into(holder.cOwnerAvatar)
         val containers = AttachmentsHolder.forFeedback(holder.vAttachmentsRoot)
-        attachmentsViewBinder.displayAttachments(feedback.attachments, containers, true, null, null)
+        attachmentsViewBinder.displayAttachments(
+            feedback.attachments,
+            containers,
+            true,
+            null,
+            null,
+            null
+        )
         holder.ivRightAttachment.visibility = View.GONE
         solveOwnerOpenByAvatar(holder.cOwnerAvatar, feedback.authorId)
         configReply(notification.reply, holder)
@@ -295,7 +302,7 @@ class FeedbackViewBinder(
             containers,
             true,
             null,
-            null
+            null, null
         )
         holder.ivRightAttachment.visibility = View.GONE
         feedback?.authorId?.let { solveOwnerOpenByAvatar(holder.cOwnerAvatar, it) }
@@ -343,7 +350,7 @@ class FeedbackViewBinder(
             containers,
             true,
             null,
-            null
+            null, null
         )
         holder.ivRightAttachment.visibility = View.GONE
         feedback?.authorId?.let { solveOwnerOpenByAvatar(holder.cOwnerAvatar, it) }
@@ -388,7 +395,7 @@ class FeedbackViewBinder(
             containers,
             true,
             null,
-            null
+            null, null
         )
         feedback?.maxAuthorAvaUrl?.let { showUserAvatarOnImageView(it, holder.cOwnerAvatar) }
         setupAttachmentViewWithVideo(notification.commentOf as Video, holder.ivRightAttachment)
@@ -433,7 +440,7 @@ class FeedbackViewBinder(
             containers,
             true,
             null,
-            null
+            null, null
         )
         feedback?.maxAuthorAvaUrl?.let { showUserAvatarOnImageView(it, holder.cOwnerAvatar) }
         setupAttachmentViewWithPhoto(notification.commentOf as Photo, holder.ivRightAttachment)
@@ -482,7 +489,7 @@ class FeedbackViewBinder(
             containers,
             true,
             null,
-            null
+            null, null
         )
         val postImage = post.findFirstImageCopiesInclude()
         if (postImage.isNullOrEmpty()) {
@@ -540,7 +547,7 @@ class FeedbackViewBinder(
             containers,
             true,
             null,
-            null
+            null, null
         )
         setupAttachmentViewWithVideo(notification.commentsOf as Video, holder.ivRightAttachment)
         feedback?.maxAuthorAvaUrl?.let { showUserAvatarOnImageView(it, holder.cOwnerAvatar) }
@@ -590,7 +597,7 @@ class FeedbackViewBinder(
             containers,
             true,
             null,
-            null
+            null, null
         )
         feedback?.maxAuthorAvaUrl?.let { showUserAvatarOnImageView(it, holder.cOwnerAvatar) }
         feedback?.fromId?.let { solveOwnerOpenByAvatar(holder.cOwnerAvatar, it) }
@@ -625,7 +632,7 @@ class FeedbackViewBinder(
             containers,
             true,
             null,
-            null
+            null, null
         )
         var action = AppTextUtils.getDateFromUnixTime(feedback?.date.orZero())
         action = action + SPACE + context.getString(R.string.in_reply_to_your_message_in_topic)
@@ -693,7 +700,7 @@ class FeedbackViewBinder(
             containers,
             true,
             null,
-            null
+            null, null
         )
         holder.ivRightAttachment.visibility = View.GONE
         feedback?.fromId?.let { solveOwnerOpenByAvatar(holder.cOwnerAvatar, it) }
@@ -740,7 +747,7 @@ class FeedbackViewBinder(
                 replyContainers,
                 true,
                 null,
-                null
+                null, null
             )
             holder.cReplyOwnerAvatar.setOnClickListener { openOwner(reply.fromId) }
         }
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/messages/AbsMessageListPresenter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/messages/AbsMessageListPresenter.kt
index fc0466d71..db9a8248a 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/messages/AbsMessageListPresenter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/messages/AbsMessageListPresenter.kt
@@ -13,9 +13,11 @@ import dev.ragnarok.fenrir.fragment.base.PlaceSupportPresenter
 import dev.ragnarok.fenrir.fromIOToMain
 import dev.ragnarok.fenrir.media.voice.IVoicePlayer
 import dev.ragnarok.fenrir.media.voice.IVoicePlayer.IPlayerStatusListener
+import dev.ragnarok.fenrir.model.Audio
 import dev.ragnarok.fenrir.model.LastReadId
 import dev.ragnarok.fenrir.model.Message
 import dev.ragnarok.fenrir.model.VoiceMessage
+import dev.ragnarok.fenrir.nonNullNoEmpty
 import dev.ragnarok.fenrir.settings.Settings
 import dev.ragnarok.fenrir.util.Lookup
 import dev.ragnarok.fenrir.util.Utils
@@ -282,6 +284,48 @@ abstract class AbsMessageListPresenter<V : IBasicMessageListView> internal const
         mVoicePlayer?.setCallback(this)
     }
 
+    private fun checkForwardedMessageForAudio(
+        toFirst: Boolean,
+        position: Int,
+        audiosList: ArrayList<Audio>,
+        message: Message
+    ): Int {
+        var tmpPosition = position
+        message.attachments?.audios.nonNullNoEmpty {
+            if (toFirst) {
+                tmpPosition += it.size
+                audiosList.addAll(0, it)
+            } else {
+                audiosList.addAll(it)
+            }
+        }
+        message.fwd?.nonNullNoEmpty {
+            for (i in it) {
+                tmpPosition = checkForwardedMessageForAudio(toFirst, position, audiosList, i)
+            }
+        }
+        return tmpPosition
+    }
+
+    fun fireAudioPlayClick(position: Int, audiosList: ArrayList<Audio>, holderPosition: Int?) {
+        if (holderPosition == null) {
+            view?.playAudioList(accountId, position, audiosList)
+            return
+        }
+        var tmpPos = position
+        val comboAudios = ArrayList<Audio>()
+        comboAudios.addAll(audiosList)
+        for (i in (holderPosition + 1)..<data.size.coerceAtMost(100)) {
+            tmpPos = checkForwardedMessageForAudio(true, tmpPos, comboAudios, data[i])
+        }
+        if (holderPosition - 1 >= 0) {
+            for (i in (holderPosition - 1) downTo 0) {
+                tmpPos = checkForwardedMessageForAudio(false, tmpPos, comboAudios, data[i])
+            }
+        }
+        view?.playAudioList(accountId, tmpPos, comboAudios)
+    }
+
     init {
         createVoicePlayer()
         mVoiceMessageLookup = Lookup(500)
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/messages/chat/ChatFragment.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/messages/chat/ChatFragment.kt
index 1ba67e6df..2cd2f6777 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/messages/chat/ChatFragment.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/messages/chat/ChatFragment.kt
@@ -766,6 +766,10 @@ class ChatFragment : PlaceSupportMvpFragment<ChatPresenter, IChatView>(), IChatV
         }
     }
 
+    override fun onAudioPlay(position: Int, audios: ArrayList<Audio>, holderPosition: Int?) {
+        presenter?.fireAudioPlayClick(position, audios, holderPosition)
+    }
+
     override fun goToUnreadMessages(
         accountId: Long,
         messageId: Int,
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/messages/chat/MessagesAdapter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/messages/chat/MessagesAdapter.kt
index 7eff03ae0..77eae0d33 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/messages/chat/MessagesAdapter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/messages/chat/MessagesAdapter.kt
@@ -155,7 +155,8 @@ class MessagesAdapter(
                 holder.attachmentsHolder,
                 true,
                 message.getObjectId(),
-                message.peerId
+                message.peerId,
+                getItemRawPosition(holder.bindingAdapterPosition)
             )
             attachmentsViewBinder.displayForwards(message.fwd, holder.forwardMessagesRoot, true)
         }
@@ -396,7 +397,8 @@ class MessagesAdapter(
                 holder.attachmentsHolder,
                 true,
                 message.getObjectId(),
-                message.peerId
+                message.peerId,
+                getItemRawPosition(holder.bindingAdapterPosition)
             )
             attachmentsViewBinder.displayForwards(message.fwd, holder.forwardMessagesRoot, true)
         }
@@ -450,7 +452,8 @@ class MessagesAdapter(
             holder.mAttachmentsHolder,
             true,
             message.getObjectId(),
-            message.peerId
+            message.peerId,
+            getItemRawPosition(holder.bindingAdapterPosition)
         )
     }
 
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/wall/AbsWallFragment.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/wall/AbsWallFragment.kt
index 5305d6d87..93e0a252e 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/wall/AbsWallFragment.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/wall/AbsWallFragment.kt
@@ -358,6 +358,9 @@ abstract class AbsWallFragment<V : IWallView, P : AbsWallPresenter<V>> :
         return root
     }
 
+    override fun onAudioPlay(position: Int, audios: ArrayList<Audio>, holderPosition: Int?) {
+        presenter?.fireAudioPlayClick(position, audios, holderPosition)
+    }
 
     override fun onAvatarClick(ownerId: Long) {
         super.onOwnerClick(ownerId)
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/wall/AbsWallPresenter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/wall/AbsWallPresenter.kt
index cb643b2d2..01507b7e9 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/wall/AbsWallPresenter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/wall/AbsWallPresenter.kt
@@ -895,6 +895,48 @@ abstract class AbsWallPresenter<V : IWallView> internal constructor(
         resolveUploadDataVisibility()
     }
 
+    private fun checkPostsForAudio(
+        toFirst: Boolean,
+        position: Int,
+        audiosList: ArrayList<Audio>,
+        post: Post
+    ): Int {
+        var tmpPosition = position
+        post.attachments?.audios.nonNullNoEmpty {
+            if (toFirst) {
+                tmpPosition += it.size
+                audiosList.addAll(0, it)
+            } else {
+                audiosList.addAll(it)
+            }
+        }
+        post.getCopyHierarchy()?.nonNullNoEmpty {
+            for (i in it) {
+                tmpPosition = checkPostsForAudio(toFirst, position, audiosList, i)
+            }
+        }
+        return tmpPosition
+    }
+
+    fun fireAudioPlayClick(position: Int, audiosList: ArrayList<Audio>, holderPosition: Int?) {
+        if (holderPosition == null) {
+            view?.playAudioList(accountId, position, audiosList)
+            return
+        }
+        var tmpPos = position
+        val comboAudios = ArrayList<Audio>()
+        comboAudios.addAll(audiosList)
+        for (i in (holderPosition + 1)..<wall.size.coerceAtMost(100)) {
+            tmpPos = checkPostsForAudio(false, tmpPos, comboAudios, wall[i])
+        }
+        if (holderPosition - 1 >= 0) {
+            for (i in (holderPosition - 1) downTo 0) {
+                tmpPos = checkPostsForAudio(true, tmpPos, comboAudios, wall[i])
+            }
+        }
+        view?.playAudioList(accountId, tmpPos, comboAudios)
+    }
+
     init {
         wall = ArrayList()
         stories = ArrayList()
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/wall/WallAdapter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/wall/WallAdapter.kt
index 0cdab4458..c9237e6c9 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/wall/WallAdapter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/wall/WallAdapter.kt
@@ -102,7 +102,7 @@ class WallAdapter(
             post.attachments,
             holder.attachmentContainers,
             false,
-            null, null
+            null, null, getItemRawPosition(holder.bindingAdapterPosition)
         )
         attachmentsViewBinder.displayCopyHistory(
             post.getCopyHierarchy(),
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/wall/wallpost/WallPostFragment.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/wall/wallpost/WallPostFragment.kt
index ce76e215b..f65f77666 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/wall/wallpost/WallPostFragment.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/wall/wallpost/WallPostFragment.kt
@@ -415,7 +415,7 @@ class WallPostFragment : PlaceSupportMvpFragment<WallPostPresenter, IWallPostVie
                 it,
                 false,
                 null,
-                null
+                null, null
             )
         }
         attachmentsViewBinder?.displayCopyHistory(
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/picasso/PicassoFileManagerHandler.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/picasso/PicassoFileManagerHandler.kt
index adb2cbeab..66c1f56f4 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/picasso/PicassoFileManagerHandler.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/picasso/PicassoFileManagerHandler.kt
@@ -3,11 +3,15 @@ package dev.ragnarok.fenrir.picasso
 import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
+import android.graphics.ImageDecoder
 import android.graphics.Matrix
 import android.media.MediaMetadataRetriever
 import android.net.Uri
+import android.os.Build
+import androidx.annotation.RequiresApi
 import androidx.core.net.toFile
 import androidx.exifinterface.media.ExifInterface
+import com.squareup.picasso3.BitmapSafeResize
 import com.squareup.picasso3.BitmapUtils
 import com.squareup.picasso3.Picasso
 import com.squareup.picasso3.Request
@@ -19,9 +23,10 @@ import dev.ragnarok.fenrir.module.StringHash
 import dev.ragnarok.fenrir.module.animation.AnimatedFileFrame
 import dev.ragnarok.fenrir.settings.Settings
 import dev.ragnarok.fenrir.util.CoverSafeResize
-import dev.ragnarok.fenrir.util.Utils
+import okio.buffer
 import okio.source
 import java.io.*
+import java.nio.ByteBuffer
 
 class PicassoFileManagerHandler(val context: Context) : RequestHandler() {
     companion object {
@@ -99,6 +104,14 @@ class PicassoFileManagerHandler(val context: Context) : RequestHandler() {
             else -> 0
         }
 
+    private fun getExifTranslation(orientation: Int) =
+        when (orientation) {
+            ExifInterface.ORIENTATION_FLIP_HORIZONTAL, ExifInterface.ORIENTATION_FLIP_VERTICAL,
+            ExifInterface.ORIENTATION_TRANSPOSE, ExifInterface.ORIENTATION_TRANSVERSE -> -1
+
+            else -> 1
+        }
+
     private fun isExtension(str: String, ext: Set<String>): Boolean {
         var ret = false
         for (i in ext) {
@@ -110,6 +123,36 @@ class PicassoFileManagerHandler(val context: Context) : RequestHandler() {
         return ret
     }
 
+    @RequiresApi(Build.VERSION_CODES.P)
+    private fun decodeImageSource(imageSource: ImageDecoder.Source): Bitmap {
+        return ImageDecoder.decodeBitmap(imageSource) { imageDecoder, imageInfo, _ ->
+            imageDecoder.allocator = when {
+                BitmapSafeResize.isHardwareRendering() == 1 -> {
+                    imageDecoder.isMutableRequired = true
+                    ImageDecoder.ALLOCATOR_DEFAULT
+                }
+
+                BitmapSafeResize.isHardwareRendering() == 2 -> {
+                    imageDecoder.isMutableRequired = false
+                    ImageDecoder.ALLOCATOR_HARDWARE
+                }
+
+                else -> {
+                    imageDecoder.isMutableRequired = true
+                    ImageDecoder.ALLOCATOR_SOFTWARE
+                }
+            }
+            val resWidth = imageInfo.size.width
+            val resHeight = imageInfo.size.height
+            CoverSafeResize.checkSizeOfBitmapP(resWidth, resHeight, object :
+                CoverSafeResize.ResizeBitmap {
+                override fun doResize(resizedWidth: Int, resizedHeight: Int) {
+                    imageDecoder.setTargetSize(resizedWidth, resizedHeight)
+                }
+            })
+        }
+    }
+
     private fun work(requestUri: Uri, dir: File, request: Request, callback: Callback) {
         if (dir.exists()) {
             if (dir.length() <= 0) {
@@ -144,7 +187,7 @@ class PicassoFileManagerHandler(val context: Context) : RequestHandler() {
                     target = CoverSafeResize.checkBitmap(target)
                     val fOutputStream = FileOutputStream(dir)
                     target.compress(
-                        if (Utils.hasR()) Bitmap.CompressFormat.WEBP_LOSSY else Bitmap.CompressFormat.JPEG,
+                        Bitmap.CompressFormat.JPEG,
                         95,
                         fOutputStream
                     )
@@ -170,7 +213,7 @@ class PicassoFileManagerHandler(val context: Context) : RequestHandler() {
                     target = CoverSafeResize.checkBitmap(target)
                     val fOutputStream = FileOutputStream(dir)
                     target.compress(
-                        if (Utils.hasR()) Bitmap.CompressFormat.WEBP_LOSSY else Bitmap.CompressFormat.JPEG,
+                        Bitmap.CompressFormat.JPEG,
                         95,
                         fOutputStream
                     )
@@ -186,33 +229,62 @@ class PicassoFileManagerHandler(val context: Context) : RequestHandler() {
                 val s = getSource(requestUri)
                 var target: Bitmap
                 try {
-                    target = BitmapUtils.decodeStream(s.source(), request)
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                        val exceptionCatchingSource =
+                            BitmapUtils.ExceptionCatchingSource(s.source())
+                        val bufferedSource = exceptionCatchingSource.buffer()
+                        val imageSource =
+                            ImageDecoder.createSource(ByteBuffer.wrap(bufferedSource.readByteArray()))
+                        target = decodeImageSource(imageSource)
+                        exceptionCatchingSource.throwIfCaught()
+                    } else {
+                        target = CoverSafeResize.checkBitmap(
+                            BitmapUtils.decodeStream(
+                                s.source(),
+                                request
+                            )
+                        )
+                    }
                     s.close()
                 } catch (e: Exception) {
                     dir.createNewFile()
                     callback.onError(Throwable("Thumb work error"))
                     return
                 }
-                var exifOrientation = 0
-                try {
-                    exifOrientation = getExifRotation(getExifOrientation(requestUri))
-                } catch (e: Exception) {
-                    if (Constants.IS_DEBUG) {
-                        e.printStackTrace()
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
+                    try {
+                        val exifOrientation = getExifOrientation(requestUri)
+                        val exifRotation = getExifRotation(exifOrientation)
+                        val exifTranslation = getExifTranslation(exifOrientation)
+                        if (exifRotation != 0 || exifTranslation != 1) {
+                            val matrix = Matrix()
+                            if (exifRotation != 0) {
+                                matrix.preRotate(exifRotation.toFloat())
+                            }
+                            if (exifTranslation != 1) {
+                                matrix.postScale(exifTranslation.toFloat(), 1f)
+                            }
+                            /*
+                            if (exifRotation == 90 || exifRotation == 270) {
+                                val tmpHeight = target.height
+                                target.height = target.width
+                                target.width = tmpHeight
+                            }
+                             */
+                            target = Bitmap.createBitmap(
+                                target, 0, 0,
+                                target.width, target.height, matrix, true
+                            )
+                        }
+                    } catch (e: Exception) {
+                        if (Constants.IS_DEBUG) {
+                            e.printStackTrace()
+                        }
                     }
                 }
-                target = CoverSafeResize.checkBitmap(target)
-                if (exifOrientation > 0) {
-                    val matrix = Matrix()
-                    matrix.postRotate(exifOrientation.toFloat())
-                    target = Bitmap.createBitmap(
-                        target, 0, 0,
-                        target.width, target.height, matrix, true
-                    )
-                }
                 val fOutputStream = FileOutputStream(dir)
                 target.compress(
-                    if (Utils.hasR()) Bitmap.CompressFormat.WEBP_LOSSY else Bitmap.CompressFormat.JPEG,
+                    Bitmap.CompressFormat.JPEG,
                     95,
                     fOutputStream
                 )
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/picasso/PicassoFullLocalRequestHandler.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/picasso/PicassoFullLocalRequestHandler.kt
index 924b136f5..56ae32ccb 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/picasso/PicassoFullLocalRequestHandler.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/picasso/PicassoFullLocalRequestHandler.kt
@@ -2,12 +2,14 @@ package dev.ragnarok.fenrir.picasso
 
 import android.content.Context
 import android.net.Uri
+import android.os.Build
+import androidx.exifinterface.media.ExifInterface
 import com.squareup.picasso3.BitmapUtils.decodeStream
 import com.squareup.picasso3.Picasso
 import com.squareup.picasso3.Request
 import com.squareup.picasso3.RequestHandler
-import com.yalantis.ucrop.util.BitmapLoadUtils.getExifOrientation
 import okio.source
+import java.io.FileNotFoundException
 import java.io.IOException
 
 class PicassoFullLocalRequestHandler(val context: Context) : RequestHandler() {
@@ -17,19 +19,32 @@ class PicassoFullLocalRequestHandler(val context: Context) : RequestHandler() {
         ) == true
     }
 
+    private fun getExifOrientation(uri: Uri): Int {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            return 0
+        }
+        val contentResolver = context.contentResolver
+        contentResolver.openInputStream(uri)?.use { input ->
+            return ExifInterface(input).getAttributeInt(
+                ExifInterface.TAG_ORIENTATION,
+                ExifInterface.ORIENTATION_NORMAL
+            )
+        } ?: throw FileNotFoundException("can't open input stream, uri: $uri")
+    }
+
     override fun load(picasso: Picasso, request: Request, callback: Callback) {
         val requestUri = Uri.parse(
             checkNotNull(request.uri) { "request.uri == null" }.toString()
                 .replace("full_", "")
         )
         try {
-            val exifOrientation = getExifOrientation(context, requestUri)
             val i = context.contentResolver.openInputStream(requestUri) ?: return
             val bitmap = decodeStream(i.source(), request)
             i.close()
+            val exifOrientation = getExifOrientation(requestUri)
             callback.onSuccess(Result.Bitmap(bitmap, Picasso.LoadedFrom.DISK, exifOrientation))
         } catch (e: IOException) {
             callback.onError(e)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/picasso/PicassoLocalRequestHandler.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/picasso/PicassoLocalRequestHandler.kt
index a4ebfa1aa..c1f2e6a6c 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/picasso/PicassoLocalRequestHandler.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/picasso/PicassoLocalRequestHandler.kt
@@ -18,7 +18,7 @@ class PicassoLocalRequestHandler : RequestHandler() {
             if (target == null) {
                 callback.onError(Throwable("Picasso Thumb Not Support"))
             } else {
-                callback.onSuccess(Result.Bitmap(target, Picasso.LoadedFrom.DISK, 0))
+                callback.onSuccess(Result.Bitmap(target, Picasso.LoadedFrom.DISK))
             }
         } else {
             val contentId = requestUri.lastPathSegment?.toLong()
@@ -46,7 +46,7 @@ class PicassoLocalRequestHandler : RequestHandler() {
                 callback.onError(Throwable("Picasso Thumb Not Support"))
                 return
             }
-            callback.onSuccess(Result.Bitmap(target, Picasso.LoadedFrom.DISK, 0))
+            callback.onSuccess(Result.Bitmap(target, Picasso.LoadedFrom.DISK))
         }
     }
 }
\ No newline at end of file
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/picasso/PicassoMediaMetadataHandler.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/picasso/PicassoMediaMetadataHandler.kt
index c49a5f0dc..eabc55ae2 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/picasso/PicassoMediaMetadataHandler.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/picasso/PicassoMediaMetadataHandler.kt
@@ -35,6 +35,6 @@ class PicassoMediaMetadataHandler : RequestHandler() {
             callback.onError(Throwable("Picasso Thumb Not Support"))
             return
         }
-        callback.onSuccess(Result.Bitmap(target, Picasso.LoadedFrom.DISK, 0))
+        callback.onSuccess(Result.Bitmap(target, Picasso.LoadedFrom.DISK))
     }
 }
\ No newline at end of file
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/settings/OtherSettings.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/settings/OtherSettings.kt
index a2a70bb4a..762d47531 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/settings/OtherSettings.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/settings/OtherSettings.kt
@@ -633,10 +633,10 @@ internal class OtherSettings(context: Context) : IOtherSettings {
         }
     override val rendering_mode: Int
         get() = try {
-            getPreferences(app).getString("rendering_bitmap_mode", "2")!!
+            getPreferences(app).getString("rendering_bitmap_mode", "0")!!
                 .trim { it <= ' ' }.toInt()
         } catch (e: Exception) {
-            2
+            0
         }
     override val endListAnimation: Int
         get() = try {
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/util/CoverSafeResize.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/util/CoverSafeResize.kt
index 0645be557..126f29c6b 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/util/CoverSafeResize.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/util/CoverSafeResize.kt
@@ -18,11 +18,11 @@ object CoverSafeResize {
         }
     }
 
-    fun isOverflowCanvas(Resolution: Int): Boolean {
+    fun isOverflowCanvas(resolution: Int): Boolean {
         val canvas = Canvas()
         val maxCanvasSize = canvas.maximumBitmapWidth.coerceAtMost(canvas.maximumBitmapHeight)
         return if (maxCanvasSize > 0) {
-            maxCanvasSize < Resolution
+            maxCanvasSize < resolution
         } else false
     }
 
@@ -47,4 +47,28 @@ object CoverSafeResize {
         bitmap.recycle()
         return tmp
     }
-}
\ No newline at end of file
+
+    interface ResizeBitmap {
+        fun doResize(resizedWidth: Int, resizedHeight: Int)
+    }
+
+    fun checkSizeOfBitmapP(sourceWidth: Int, sourceHeight: Int, callback: ResizeBitmap) {
+        if (maxResolution < 0 || sourceWidth <= 0 || sourceHeight <= 0 || sourceWidth <= maxResolution && sourceHeight <= maxResolution) {
+            return
+        }
+        var mWidth = sourceWidth
+        var mHeight = sourceHeight
+        val mCo = mHeight.coerceAtMost(mWidth).toFloat() / mHeight.coerceAtLeast(mWidth)
+        if (mWidth > mHeight) {
+            mWidth = maxResolution
+            mHeight = (maxResolution * mCo).toInt()
+        } else {
+            mHeight = maxResolution
+            mWidth = (maxResolution * mCo).toInt()
+        }
+        if (mWidth <= 0 || mHeight <= 0) {
+            return
+        }
+        callback.doResize(mWidth, mHeight)
+    }
+}
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/view/AudioContainer.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/view/AudioContainer.kt
index 7f4ca67e7..9775db5c9 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/view/AudioContainer.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/view/AudioContainer.kt
@@ -78,6 +78,7 @@ class AudioContainer : LinearLayout {
     private var audioListDisposable = Disposable.disposed()
     private var audios: List<Audio> = emptyList()
     private var currAudio = currentAudio
+    private var holderPosition: Int? = null
     private val isAudio_round_icon: Boolean =
         if (isInEditMode) true else Settings.get().main().isAudio_round_icon
 
@@ -379,7 +380,11 @@ class AudioContainer : LinearLayout {
                 override fun onModalOptionSelected(option: Option) {
                     when (option.id) {
                         AudioOption.play_item_audio -> {
-                            mAttachmentsActionCallback?.onAudioPlay(position, audios)
+                            mAttachmentsActionCallback?.onAudioPlay(
+                                position,
+                                audios,
+                                holderPosition
+                            )
                             getPlayerPlace(Settings.get().accounts().current).tryOpenWith(
                                 context
                             )
@@ -575,13 +580,14 @@ class AudioContainer : LinearLayout {
             }
         } else {
             updateAudioStatus(holder, audio)
-            mAttachmentsActionCallback?.onAudioPlay(position, audios)
+            mAttachmentsActionCallback?.onAudioPlay(position, audios, holderPosition)
         }
     }
 
     fun displayAudios(
         audios: ArrayList<Audio>?,
-        mAttachmentsActionCallback: OnAttachmentsActionCallback?
+        mAttachmentsActionCallback: OnAttachmentsActionCallback?,
+        holderPosition: Int?
     ) {
         if (audios.isNullOrEmpty()) {
             visibility = View.GONE
@@ -590,6 +596,7 @@ class AudioContainer : LinearLayout {
         }
         visibility = View.VISIBLE
         this.audios = audios
+        this.holderPosition = holderPosition
         val i = audios.size - childCount
         for (j in 0 until i) {
             val itemView = LayoutInflater.from(context).inflate(R.layout.item_audio, this, false)
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/view/CommentContainer.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/view/CommentContainer.kt
index 8f225ca4e..ca478c603 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/view/CommentContainer.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/view/CommentContainer.kt
@@ -132,7 +132,7 @@ class CommentContainer : LinearLayout {
                         comment.attachments,
                         check.attachmentContainers,
                         true,
-                        null, null
+                        null, null, null
                     )
                 }
                 check.tvOwnerName.text = comment.fullAuthorName
diff --git a/app_fenrir/src/main/res/drawable-v24/is_friend.xml b/app_fenrir/src/main/res/drawable-v24/is_friend.xml
new file mode 100644
index 000000000..d0aa1ec2e
--- /dev/null
+++ b/app_fenrir/src/main/res/drawable-v24/is_friend.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillAlpha="0.90"
+        android:pathData="m15.031,8.371c0,-2.191 -1.763,-3.984 -3.918,-3.984 -2.155,0 -3.918,1.793 -3.918,3.984 0,2.191 1.763,3.984 3.918,3.984 2.155,0 3.918,-1.793 3.918,-3.984zM3.277,18.331v0.996c0,0.598 0.392,0.996 0.979,0.996L17.969,20.323c0.588,0 0.979,-0.398 0.979,-0.996L18.948,18.331c0,-3.486 -5.191,-4.482 -7.836,-4.482 -2.645,0 -7.836,0.996 -7.836,4.482zM20.32,20.323v0c-0.392,-0.1 -0.45,-0.247 -0.45,-0.546 0.784,-5.179 -4.251,-6.625 -4.545,-6.725 -0.294,-0.1 -0.392,-0.199 -0.392,-0.398 0,-0.199 0.098,-0.398 0.196,-0.598 2.449,-1.494 2.253,-3.785 2.253,-3.785 -0.294,-3.585 -3.428,-3.785 -3.624,-3.785 -0.784,-0.1 -0.784,-1.096 0.098,-1.096 0.196,0 4.016,0.1 4.604,4.581 0,0.1 0.294,2.589 -1.959,4.382 1.665,0.797 5.032,2.822 4.347,7.404 0.294,0.299 -0.233,0.564 -0.527,0.564z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:centerX="30"
+                android:centerY="60"
+                android:gradientRadius="90"
+                android:type="radial">
+                <item
+                    android:color="?colorPrimary"
+                    android:offset="0.1" />
+                <item
+                    android:color="?colorSecondary"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+</vector>
diff --git a/app_fenrir/src/main/res/drawable/eye.xml b/app_fenrir/src/main/res/drawable/eye.xml
new file mode 100644
index 000000000..49215c87c
--- /dev/null
+++ b/app_fenrir/src/main/res/drawable/eye.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+    <path
+        android:fillColor="#fff"
+        android:pathData="m8,5.5a2.5,2.5 0,1 0,0 5,2.5 2.5,0 0,0 0,-5zM4.5,8a3.5,3.5 0,1 1,7 0,3.5 3.5,0 0,1 -7,0zM16,8C16,8 13,2.5 8,2.5 3,2.5 0,8 0,8 0,8 3,13.5 8,13.5 13,13.5 16,8 16,8ZM1.173,8A13.133,13.133 0,0 1,2.833 5.957C4.12,4.668 5.88,3.5 8,3.5c2.12,0 3.879,1.168 5.168,2.457A13.133,13.133 0,0 1,14.828 8c-0.058,0.087 -0.122,0.183 -0.195,0.288 -0.335,0.48 -0.83,1.12 -1.465,1.755C11.879,11.332 10.119,12.5 8,12.5 5.88,12.5 4.121,11.332 2.832,10.043A13.134,13.134 0,0 1,1.172 8Z"
+        android:strokeWidth="0.1"
+        android:strokeColor="#000" />
+</vector>
diff --git a/app_fenrir/src/main/res/drawable/is_friend.xml b/app_fenrir/src/main/res/drawable/is_friend.xml
new file mode 100644
index 000000000..511b7da73
--- /dev/null
+++ b/app_fenrir/src/main/res/drawable/is_friend.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="?colorPrimary"
+        android:pathData="m15.031,8.371c0,-2.191 -1.763,-3.984 -3.918,-3.984 -2.155,0 -3.918,1.793 -3.918,3.984 0,2.191 1.763,3.984 3.918,3.984 2.155,0 3.918,-1.793 3.918,-3.984zM3.277,18.331v0.996c0,0.598 0.392,0.996 0.979,0.996L17.969,20.323c0.588,0 0.979,-0.398 0.979,-0.996L18.948,18.331c0,-3.486 -5.191,-4.482 -7.836,-4.482 -2.645,0 -7.836,0.996 -7.836,4.482zM20.32,20.323v0c-0.392,-0.1 -0.45,-0.247 -0.45,-0.546 0.784,-5.179 -4.251,-6.625 -4.545,-6.725 -0.294,-0.1 -0.392,-0.199 -0.392,-0.398 0,-0.199 0.098,-0.398 0.196,-0.598 2.449,-1.494 2.253,-3.785 2.253,-3.785 -0.294,-3.585 -3.428,-3.785 -3.624,-3.785 -0.784,-0.1 -0.784,-1.096 0.098,-1.096 0.196,0 4.016,0.1 4.604,4.581 0,0.1 0.294,2.589 -1.959,4.382 1.665,0.797 5.032,2.822 4.347,7.404 0.294,0.299 -0.233,0.564 -0.527,0.564z" />
+</vector>
diff --git a/app_fenrir/src/main/res/layout/entry_slidr_settings.xml b/app_fenrir/src/main/res/layout/entry_slidr_settings.xml
index 2a761c593..99e7b20f1 100644
--- a/app_fenrir/src/main/res/layout/entry_slidr_settings.xml
+++ b/app_fenrir/src/main/res/layout/entry_slidr_settings.xml
@@ -34,7 +34,6 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="5dp"
             android:max="200"
-            android:min="20"
             android:paddingTop="8dp"
             android:paddingBottom="8dp"
             android:progress="80" />
@@ -51,7 +50,6 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="5dp"
             android:max="100"
-            android:min="4"
             android:paddingTop="8dp"
             android:paddingBottom="8dp"
             android:progress="50" />
@@ -68,7 +66,6 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="10dp"
             android:max="100"
-            android:min="4"
             android:paddingTop="8dp"
             android:paddingBottom="8dp"
             android:progress="50" />
@@ -94,7 +91,6 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="5dp"
             android:max="200"
-            android:min="20"
             android:paddingTop="8dp"
             android:paddingBottom="8dp"
             android:progress="50" />
@@ -111,7 +107,6 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="5dp"
             android:max="100"
-            android:min="4"
             android:paddingTop="8dp"
             android:paddingBottom="8dp"
             android:progress="50" />
@@ -128,9 +123,8 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="5dp"
             android:max="100"
-            android:min="4"
             android:paddingTop="8dp"
             android:paddingBottom="8dp"
             android:progress="50" />
     </LinearLayout>
-</ScrollView>
\ No newline at end of file
+</ScrollView>
diff --git a/app_fenrir/src/main/res/layout/item_document.xml b/app_fenrir/src/main/res/layout/item_document.xml
index 85b4135ae..81e128bef 100644
--- a/app_fenrir/src/main/res/layout/item_document.xml
+++ b/app_fenrir/src/main/res/layout/item_document.xml
@@ -9,7 +9,6 @@
     android:paddingTop="4dp"
     android:paddingBottom="4dp">
 
-
     <ImageView
         android:id="@+id/item_post_avatar_image"
         android:layout_width="@dimen/avatar_size_chat"
@@ -27,17 +26,6 @@
         android:scaleType="centerCrop"
         app:shapeAppearanceOverlay="@style/ShapeAppearance.MediumRoundedPictures" />
 
-    <ImageView
-        android:id="@+id/item_document_graffiti"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="4dp"
-        android:contentDescription="@null"
-        android:minWidth="96dp"
-        android:minHeight="96dp"
-        android:scaleType="centerCrop"
-        android:visibility="gone" />
-
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content">
@@ -63,7 +51,7 @@
             android:layout_gravity="center_vertical"
             android:layout_marginStart="2dp"
             android:ellipsize="end"
-            android:maxLines="1"
+            android:maxLines="2"
             android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
             tools:text="Title" />
 
diff --git a/app_fenrir/src/main/res/layout/item_fave_page.xml b/app_fenrir/src/main/res/layout/item_fave_page.xml
index aee6ce31c..d05ba3b67 100644
--- a/app_fenrir/src/main/res/layout/item_fave_page.xml
+++ b/app_fenrir/src/main/res/layout/item_fave_page.xml
@@ -55,19 +55,18 @@
                 android:visibility="gone"
                 app:tint="@color/white" />
 
-            <dev.ragnarok.fenrir.view.natives.rlottie.RLottieImageView
+            <ImageView
                 android:id="@+id/item_blacklisted"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
+                android:layout_width="36dp"
+                android:layout_height="36dp"
                 android:layout_gravity="end|bottom"
                 android:layout_marginStart="4dp"
                 android:layout_marginBottom="4dp"
                 android:contentDescription="@null"
-                android:visibility="gone"
-                app:loopAnimation="true"
-                tools:src="@drawable/audio_died" />
+                android:src="@drawable/audio_died"
+                android:visibility="gone" />
 
-            <dev.ragnarok.fenrir.view.natives.rlottie.RLottieImageView
+            <ImageView
                 android:id="@+id/item_monitor"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
@@ -75,8 +74,8 @@
                 android:layout_marginTop="6dp"
                 android:layout_marginEnd="6dp"
                 android:contentDescription="@null"
-                android:visibility="gone"
-                app:loopAnimation="true" />
+                android:src="@drawable/eye"
+                android:visibility="gone" />
         </FrameLayout>
 
         <LinearLayout
diff --git a/app_fenrir/src/main/res/layout/local_audio_album_item.xml b/app_fenrir/src/main/res/layout/local_audio_album_item.xml
index eefab187c..b9ebbeb0b 100644
--- a/app_fenrir/src/main/res/layout/local_audio_album_item.xml
+++ b/app_fenrir/src/main/res/layout/local_audio_album_item.xml
@@ -28,15 +28,6 @@
             app:dominantMeasurement="width"
             app:shapeAppearanceOverlay="@style/ShapeAppearance.MediumRoundedPictures" />
 
-        <dev.ragnarok.fenrir.view.natives.rlottie.RLottieImageView
-            android:id="@+id/selected"
-            android:layout_width="120dp"
-            android:layout_height="120dp"
-            android:layout_centerInParent="true"
-            android:visibility="visible"
-            app:loopAnimation="true"
-            tools:src="@drawable/theme_select" />
-
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -70,6 +61,15 @@
 
         </LinearLayout>
 
+        <dev.ragnarok.fenrir.view.natives.rlottie.RLottieImageView
+            android:id="@+id/selected"
+            android:layout_width="120dp"
+            android:layout_height="120dp"
+            android:layout_centerInParent="true"
+            android:visibility="visible"
+            app:loopAnimation="true"
+            tools:src="@drawable/theme_select" />
+
     </RelativeLayout>
 
 </com.google.android.material.card.MaterialCardView>
diff --git a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/fragment/PreferencesFragment.kt b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/fragment/PreferencesFragment.kt
index c68a1435d..4d2076658 100644
--- a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/fragment/PreferencesFragment.kt
+++ b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/fragment/PreferencesFragment.kt
@@ -705,12 +705,12 @@ class PreferencesFragment : AbsPreferencesFragment(), PreferencesAdapter.OnScree
                 ),
                 parentFragmentManager
             ) {
-                initialSelection = "2"
+                initialSelection = "0"
                 titleRes = R.string.rendering_mode
                 dependency = "developer_mode"
                 visible = Utils.hasPie()
                 onSelectionChange { it ->
-                    var sz = 2
+                    var sz = 0
                     try {
                         sz = it.trim { it <= ' ' }.toInt()
                     } catch (ignored: NumberFormatException) {
@@ -1201,8 +1201,12 @@ class PreferencesFragment : AbsPreferencesFragment(), PreferencesAdapter.OnScree
                     progress: Int,
                     fromUser: Boolean
                 ) {
-                    textVerticalSensitive.text =
-                        getString(R.string.slidr_sensitive, progress)
+                    if (fromUser && progress < 20) {
+                        verticalSensitive.progress = 20
+                        textVerticalSensitive.text = getString(R.string.slidr_sensitive, 20)
+                    } else {
+                        textVerticalSensitive.text = getString(R.string.slidr_sensitive, progress)
+                    }
                 }
 
                 override fun onStartTrackingTouch(seekBar: SeekBar?) {}
@@ -1215,8 +1219,12 @@ class PreferencesFragment : AbsPreferencesFragment(), PreferencesAdapter.OnScree
                     progress: Int,
                     fromUser: Boolean
                 ) {
-                    textHorizontalSensitive.text =
-                        getString(R.string.slidr_sensitive, progress)
+                    if (fromUser && progress < 20) {
+                        horizontalSensitive.progress = 20
+                        textHorizontalSensitive.text = getString(R.string.slidr_sensitive, 20)
+                    } else {
+                        textHorizontalSensitive.text = getString(R.string.slidr_sensitive, progress)
+                    }
                 }
 
                 override fun onStartTrackingTouch(seekBar: SeekBar) {}
@@ -1229,8 +1237,14 @@ class PreferencesFragment : AbsPreferencesFragment(), PreferencesAdapter.OnScree
                     progress: Int,
                     fromUser: Boolean
                 ) {
-                    textVerticalVelocityThreshold.text =
-                        getString(R.string.slidr_velocity_threshold, progress)
+                    if (fromUser && progress < 4) {
+                        verticalVelocityThreshold.progress = 4
+                        textVerticalVelocityThreshold.text =
+                            getString(R.string.slidr_velocity_threshold, 4)
+                    } else {
+                        textVerticalVelocityThreshold.text =
+                            getString(R.string.slidr_velocity_threshold, progress)
+                    }
                 }
 
                 override fun onStartTrackingTouch(seekBar: SeekBar?) {}
@@ -1243,8 +1257,14 @@ class PreferencesFragment : AbsPreferencesFragment(), PreferencesAdapter.OnScree
                     progress: Int,
                     fromUser: Boolean
                 ) {
-                    textHorizontalVelocityThreshold.text =
-                        getString(R.string.slidr_velocity_threshold, progress)
+                    if (fromUser && progress < 4) {
+                        horizontalVelocityThreshold.progress = 4
+                        textHorizontalVelocityThreshold.text =
+                            getString(R.string.slidr_velocity_threshold, 4)
+                    } else {
+                        textHorizontalVelocityThreshold.text =
+                            getString(R.string.slidr_velocity_threshold, progress)
+                    }
                 }
 
                 override fun onStartTrackingTouch(seekBar: SeekBar) {}
@@ -1257,8 +1277,14 @@ class PreferencesFragment : AbsPreferencesFragment(), PreferencesAdapter.OnScree
                     progress: Int,
                     fromUser: Boolean
                 ) {
-                    textVerticalDistanceThreshold.text =
-                        getString(R.string.slidr_distance_threshold, progress)
+                    if (fromUser && progress < 4) {
+                        verticalDistanceThreshold.progress = 4
+                        textVerticalDistanceThreshold.text =
+                            getString(R.string.slidr_distance_threshold, 4)
+                    } else {
+                        textVerticalDistanceThreshold.text =
+                            getString(R.string.slidr_distance_threshold, progress)
+                    }
                 }
 
                 override fun onStartTrackingTouch(seekBar: SeekBar?) {}
@@ -1271,8 +1297,14 @@ class PreferencesFragment : AbsPreferencesFragment(), PreferencesAdapter.OnScree
                     progress: Int,
                     fromUser: Boolean
                 ) {
-                    textHorizontalDistanceThreshold.text =
-                        getString(R.string.slidr_distance_threshold, progress)
+                    if (fromUser && progress < 4) {
+                        horizontalDistanceThreshold.progress = 4
+                        textHorizontalDistanceThreshold.text =
+                            getString(R.string.slidr_distance_threshold, 4)
+                    } else {
+                        textHorizontalDistanceThreshold.text =
+                            getString(R.string.slidr_distance_threshold, progress)
+                    }
                 }
 
                 override fun onStartTrackingTouch(seekBar: SeekBar) {}
diff --git a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/picasso/PicassoFileManagerHandler.kt b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/picasso/PicassoFileManagerHandler.kt
index 6c6eee581..676c971a0 100644
--- a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/picasso/PicassoFileManagerHandler.kt
+++ b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/picasso/PicassoFileManagerHandler.kt
@@ -3,11 +3,15 @@ package dev.ragnarok.filegallery.picasso
 import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
+import android.graphics.ImageDecoder
 import android.graphics.Matrix
 import android.media.MediaMetadataRetriever
 import android.net.Uri
+import android.os.Build
+import androidx.annotation.RequiresApi
 import androidx.core.net.toFile
 import androidx.exifinterface.media.ExifInterface
+import com.squareup.picasso3.BitmapSafeResize
 import com.squareup.picasso3.BitmapUtils
 import com.squareup.picasso3.Picasso
 import com.squareup.picasso3.Request
@@ -20,9 +24,10 @@ import dev.ragnarok.filegallery.Includes
 import dev.ragnarok.filegallery.fragment.filemanager.FileManagerFragment.Companion.isExtension
 import dev.ragnarok.filegallery.settings.Settings
 import dev.ragnarok.filegallery.util.CoverSafeResize
-import dev.ragnarok.filegallery.util.Utils
+import okio.buffer
 import okio.source
 import java.io.*
+import java.nio.ByteBuffer
 
 class PicassoFileManagerHandler(val context: Context) : RequestHandler() {
     companion object {
@@ -100,6 +105,44 @@ class PicassoFileManagerHandler(val context: Context) : RequestHandler() {
             else -> 0
         }
 
+    private fun getExifTranslation(orientation: Int) =
+        when (orientation) {
+            ExifInterface.ORIENTATION_FLIP_HORIZONTAL, ExifInterface.ORIENTATION_FLIP_VERTICAL,
+            ExifInterface.ORIENTATION_TRANSPOSE, ExifInterface.ORIENTATION_TRANSVERSE -> -1
+
+            else -> 1
+        }
+
+    @RequiresApi(Build.VERSION_CODES.P)
+    private fun decodeImageSource(imageSource: ImageDecoder.Source): Bitmap {
+        return ImageDecoder.decodeBitmap(imageSource) { imageDecoder, imageInfo, _ ->
+            imageDecoder.allocator = when {
+                BitmapSafeResize.isHardwareRendering() == 1 -> {
+                    imageDecoder.isMutableRequired = true
+                    ImageDecoder.ALLOCATOR_DEFAULT
+                }
+
+                BitmapSafeResize.isHardwareRendering() == 2 -> {
+                    imageDecoder.isMutableRequired = false
+                    ImageDecoder.ALLOCATOR_HARDWARE
+                }
+
+                else -> {
+                    imageDecoder.isMutableRequired = true
+                    ImageDecoder.ALLOCATOR_SOFTWARE
+                }
+            }
+            val resWidth = imageInfo.size.width
+            val resHeight = imageInfo.size.height
+            CoverSafeResize.checkSizeOfBitmapP(resWidth, resHeight, object :
+                CoverSafeResize.ResizeBitmap {
+                override fun doResize(resizedWidth: Int, resizedHeight: Int) {
+                    imageDecoder.setTargetSize(resizedWidth, resizedHeight)
+                }
+            })
+        }
+    }
+
     private fun work(requestUri: Uri, dir: File, request: Request, callback: Callback) {
         if (dir.exists()) {
             if (dir.length() <= 0) {
@@ -134,7 +177,7 @@ class PicassoFileManagerHandler(val context: Context) : RequestHandler() {
                     target = CoverSafeResize.checkBitmap(target)
                     val fOutputStream = FileOutputStream(dir)
                     target.compress(
-                        if (Utils.hasR()) Bitmap.CompressFormat.WEBP_LOSSY else Bitmap.CompressFormat.JPEG,
+                        Bitmap.CompressFormat.JPEG,
                         95,
                         fOutputStream
                     )
@@ -160,7 +203,7 @@ class PicassoFileManagerHandler(val context: Context) : RequestHandler() {
                     target = CoverSafeResize.checkBitmap(target)
                     val fOutputStream = FileOutputStream(dir)
                     target.compress(
-                        if (Utils.hasR()) Bitmap.CompressFormat.WEBP_LOSSY else Bitmap.CompressFormat.JPEG,
+                        Bitmap.CompressFormat.JPEG,
                         95,
                         fOutputStream
                     )
@@ -176,33 +219,62 @@ class PicassoFileManagerHandler(val context: Context) : RequestHandler() {
                 val s = getSource(requestUri)
                 var target: Bitmap
                 try {
-                    target = BitmapUtils.decodeStream(s.source(), request)
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                        val exceptionCatchingSource =
+                            BitmapUtils.ExceptionCatchingSource(s.source())
+                        val bufferedSource = exceptionCatchingSource.buffer()
+                        val imageSource =
+                            ImageDecoder.createSource(ByteBuffer.wrap(bufferedSource.readByteArray()))
+                        target = decodeImageSource(imageSource)
+                        exceptionCatchingSource.throwIfCaught()
+                    } else {
+                        target = CoverSafeResize.checkBitmap(
+                            BitmapUtils.decodeStream(
+                                s.source(),
+                                request
+                            )
+                        )
+                    }
                     s.close()
                 } catch (e: Exception) {
                     dir.createNewFile()
                     callback.onError(Throwable("Thumb work error"))
                     return
                 }
-                var exifOrientation = 0
-                try {
-                    exifOrientation = getExifRotation(getExifOrientation(requestUri))
-                } catch (e: Exception) {
-                    if (Constants.IS_DEBUG) {
-                        e.printStackTrace()
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
+                    try {
+                        val exifOrientation = getExifOrientation(requestUri)
+                        val exifRotation = getExifRotation(exifOrientation)
+                        val exifTranslation = getExifTranslation(exifOrientation)
+                        if (exifRotation != 0 || exifTranslation != 1) {
+                            val matrix = Matrix()
+                            if (exifRotation != 0) {
+                                matrix.preRotate(exifRotation.toFloat())
+                            }
+                            if (exifTranslation != 1) {
+                                matrix.postScale(exifTranslation.toFloat(), 1f)
+                            }
+                            /*
+                            if (exifRotation == 90 || exifRotation == 270) {
+                                val tmpHeight = target.height
+                                target.height = target.width
+                                target.width = tmpHeight
+                            }
+                             */
+                            target = Bitmap.createBitmap(
+                                target, 0, 0,
+                                target.width, target.height, matrix, true
+                            )
+                        }
+                    } catch (e: Exception) {
+                        if (Constants.IS_DEBUG) {
+                            e.printStackTrace()
+                        }
                     }
                 }
-                target = CoverSafeResize.checkBitmap(target)
-                if (exifOrientation > 0) {
-                    val matrix = Matrix()
-                    matrix.postRotate(exifOrientation.toFloat())
-                    target = Bitmap.createBitmap(
-                        target, 0, 0,
-                        target.width, target.height, matrix, true
-                    )
-                }
                 val fOutputStream = FileOutputStream(dir)
                 target.compress(
-                    if (Utils.hasR()) Bitmap.CompressFormat.WEBP_LOSSY else Bitmap.CompressFormat.JPEG,
+                    Bitmap.CompressFormat.JPEG,
                     95,
                     fOutputStream
                 )
diff --git a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/settings/MainSettings.kt b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/settings/MainSettings.kt
index 8d88d26a8..f9d566547 100644
--- a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/settings/MainSettings.kt
+++ b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/settings/MainSettings.kt
@@ -209,9 +209,9 @@ internal class MainSettings(context: Context) : IMainSettings {
 
     override fun getRendering_mode(): Int {
         return try {
-            getPreferences(app).getString("rendering_bitmap_mode", "2")!!.trim().toInt()
+            getPreferences(app).getString("rendering_bitmap_mode", "0")!!.trim().toInt()
         } catch (e: Exception) {
-            2
+            0
         }
     }
 
diff --git a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/util/CoverSafeResize.kt b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/util/CoverSafeResize.kt
index 3e9e3d7ae..7444e1c33 100644
--- a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/util/CoverSafeResize.kt
+++ b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/util/CoverSafeResize.kt
@@ -18,11 +18,11 @@ object CoverSafeResize {
         }
     }
 
-    fun isOverflowCanvas(Resolution: Int): Boolean {
+    fun isOverflowCanvas(resolution: Int): Boolean {
         val canvas = Canvas()
         val maxCanvasSize = canvas.maximumBitmapWidth.coerceAtMost(canvas.maximumBitmapHeight)
         return if (maxCanvasSize > 0) {
-            maxCanvasSize < Resolution
+            maxCanvasSize < resolution
         } else false
     }
 
@@ -47,4 +47,28 @@ object CoverSafeResize {
         bitmap.recycle()
         return tmp
     }
+
+    interface ResizeBitmap {
+        fun doResize(resizedWidth: Int, resizedHeight: Int)
+    }
+
+    fun checkSizeOfBitmapP(sourceWidth: Int, sourceHeight: Int, callback: ResizeBitmap) {
+        if (maxResolution < 0 || sourceWidth <= 0 || sourceHeight <= 0 || sourceWidth <= maxResolution && sourceHeight <= maxResolution) {
+            return
+        }
+        var mWidth = sourceWidth
+        var mHeight = sourceHeight
+        val mCo = mHeight.coerceAtMost(mWidth).toFloat() / mHeight.coerceAtLeast(mWidth)
+        if (mWidth > mHeight) {
+            mWidth = maxResolution
+            mHeight = (maxResolution * mCo).toInt()
+        } else {
+            mHeight = maxResolution
+            mWidth = (maxResolution * mCo).toInt()
+        }
+        if (mWidth <= 0 || mHeight <= 0) {
+            return
+        }
+        callback.doResize(mWidth, mHeight)
+    }
 }
\ No newline at end of file
diff --git a/app_filegallery/src/main/res/layout/entry_slidr_settings.xml b/app_filegallery/src/main/res/layout/entry_slidr_settings.xml
index 2a761c593..c7be00653 100644
--- a/app_filegallery/src/main/res/layout/entry_slidr_settings.xml
+++ b/app_filegallery/src/main/res/layout/entry_slidr_settings.xml
@@ -34,7 +34,6 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="5dp"
             android:max="200"
-            android:min="20"
             android:paddingTop="8dp"
             android:paddingBottom="8dp"
             android:progress="80" />
@@ -51,7 +50,6 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="5dp"
             android:max="100"
-            android:min="4"
             android:paddingTop="8dp"
             android:paddingBottom="8dp"
             android:progress="50" />
@@ -68,7 +66,6 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="10dp"
             android:max="100"
-            android:min="4"
             android:paddingTop="8dp"
             android:paddingBottom="8dp"
             android:progress="50" />
@@ -94,7 +91,6 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="5dp"
             android:max="200"
-            android:min="20"
             android:paddingTop="8dp"
             android:paddingBottom="8dp"
             android:progress="50" />
@@ -111,7 +107,6 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="5dp"
             android:max="100"
-            android:min="4"
             android:paddingTop="8dp"
             android:paddingBottom="8dp"
             android:progress="50" />
@@ -128,7 +123,6 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="5dp"
             android:max="100"
-            android:min="4"
             android:paddingTop="8dp"
             android:paddingBottom="8dp"
             android:progress="50" />
diff --git a/build.gradle b/build.gradle
index 36b50ae3c..b065c9bf0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -63,7 +63,7 @@ buildscript {
     ext.okhttpLibraryVersion = "5.0.0-alpha.11"
     ext.okioVersion = "3.3.0"
     ext.rxJavaVersion = "3.1.6"
-    ext.guavaVersion = "32.0.0-android"
+    ext.guavaVersion = "32.0.1-android"
     ext.errorproneVersion = "2.15.0"
     ext.checkerCompatQualVersion = "2.5.5"
     ext.checkerQualAndroidVersion = "3.35.0"
@@ -91,7 +91,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:8.1.0-beta04"
+        classpath "com.android.tools.build:gradle:8.1.0-beta05"
         classpath "com.google.gms:google-services:4.3.15"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
diff --git a/fenrir_common/src/main/res/raw/eye.json_lz4 b/fenrir_common/src/main/res/raw/eye.json_lz4
deleted file mode 100644
index ba39c5b2d..000000000
Binary files a/fenrir_common/src/main/res/raw/eye.json_lz4 and /dev/null differ
diff --git a/fenrir_common/src/main/res/raw/is_friend.json_lz4 b/fenrir_common/src/main/res/raw/is_friend.json_lz4
deleted file mode 100644
index 053be76c7..000000000
Binary files a/fenrir_common/src/main/res/raw/is_friend.json_lz4 and /dev/null differ
diff --git a/image/src/main/java/com/yalantis/ucrop/util/FastBitmapDrawable.java b/image/src/main/java/com/yalantis/ucrop/util/FastBitmapDrawable.java
index 74913c118..c8daef330 100644
--- a/image/src/main/java/com/yalantis/ucrop/util/FastBitmapDrawable.java
+++ b/image/src/main/java/com/yalantis/ucrop/util/FastBitmapDrawable.java
@@ -49,15 +49,18 @@ public void setColorFilter(ColorFilter cf) {
         mPaint.setColorFilter(cf);
     }
 
+    @Deprecated
     @Override
     public int getOpacity() {
         return PixelFormat.TRANSLUCENT;
     }
 
+    @Override
     public void setFilterBitmap(boolean filterBitmap) {
         mPaint.setFilterBitmap(filterBitmap);
     }
 
+    @Override
     public int getAlpha() {
         return mAlpha;
     }
diff --git a/libfenrir/src/main/jni/CMakeLists.txt b/libfenrir/src/main/jni/CMakeLists.txt
index a83960000..5a1155abb 100644
--- a/libfenrir/src/main/jni/CMakeLists.txt
+++ b/libfenrir/src/main/jni/CMakeLists.txt
@@ -168,6 +168,7 @@ add_library(libyuv STATIC
         animation/libyuv/source/scale_neon64.cc
         animation/libyuv/source/scale_neon.cc
         animation/libyuv/source/scale_rgb.cc
+        animation/libyuv/source/scale_rvv.cc
         animation/libyuv/source/scale_uv.cc
         animation/libyuv/source/video_common.cc)
 target_compile_options(libyuv PRIVATE
diff --git a/libfenrir/src/main/jni/animation/libyuv/include/libyuv/scale_row.h b/libfenrir/src/main/jni/animation/libyuv/include/libyuv/scale_row.h
index a7957c3fe..dbe664def 100644
--- a/libfenrir/src/main/jni/animation/libyuv/include/libyuv/scale_row.h
+++ b/libfenrir/src/main/jni/animation/libyuv/include/libyuv/scale_row.h
@@ -175,6 +175,19 @@ extern "C" {
 #define HAS_SCALEROWDOWN34_LSX
 #endif
 
+#if !defined(LIBYUV_DISABLE_RVV) && defined(__riscv_vector)
+#define HAS_SCALEADDROW_RVV
+#define HAS_SCALEARGBROWDOWN2_RVV
+#define HAS_SCALEARGBROWDOWNEVEN_RVV
+#define HAS_SCALEROWDOWN2_RVV
+#define HAS_SCALEROWDOWN34_RVV
+#define HAS_SCALEROWDOWN4_RVV
+#define HAS_SCALEUVROWDOWN2_RVV
+#define HAS_SCALEUVROWDOWN2LINEAR_RVV
+#define HAS_SCALEUVROWDOWN2BOX_RVV
+#define HAS_SCALEUVROWDOWNEVEN_RVV
+#endif
+
 // Scale ARGB vertically with bilinear interpolation.
 void ScalePlaneVertical(int src_height,
                         int dst_width,
@@ -949,6 +962,18 @@ void ScaleARGBRowDown2Box_NEON(const uint8_t* src_ptr,
                                ptrdiff_t src_stride,
                                uint8_t* dst,
                                int dst_width);
+void ScaleARGBRowDown2_RVV(const uint8_t* src_argb,
+                           ptrdiff_t src_stride,
+                           uint8_t* dst_argb,
+                           int dst_width);
+void ScaleARGBRowDown2Linear_RVV(const uint8_t* src_argb,
+                                 ptrdiff_t src_stride,
+                                 uint8_t* dst_argb,
+                                 int dst_width);
+void ScaleARGBRowDown2Box_RVV(const uint8_t* src_argb,
+                              ptrdiff_t src_stride,
+                              uint8_t* dst_argb,
+                              int dst_width);
 void ScaleARGBRowDown2_MSA(const uint8_t* src_argb,
                            ptrdiff_t src_stride,
                            uint8_t* dst_argb,
@@ -1061,6 +1086,16 @@ void ScaleARGBRowDownEvenBox_LSX(const uint8_t* src_argb,
                                  int src_stepx,
                                  uint8_t* dst_argb,
                                  int dst_width);
+void ScaleARGBRowDownEven_RVV(const uint8_t* src_argb,
+                              ptrdiff_t src_stride,
+                              int32_t src_stepx,
+                              uint8_t* dst_argb,
+                              int dst_width);
+void ScaleARGBRowDownEvenBox_RVV(const uint8_t* src_argb,
+                                 ptrdiff_t src_stride,
+                                 int src_stepx,
+                                 uint8_t* dst_argb,
+                                 int dst_width);
 void ScaleARGBRowDownEven_Any_SSE2(const uint8_t* src_ptr,
                                    ptrdiff_t src_stride,
                                    int src_stepx,
@@ -1143,6 +1178,18 @@ void ScaleUVRowDown2Box_MSA(const uint8_t* src_ptr,
                             ptrdiff_t src_stride,
                             uint8_t* dst_uv,
                             int dst_width);
+void ScaleUVRowDown2_RVV(const uint8_t* src_ptr,
+                         ptrdiff_t src_stride,
+                         uint8_t* dst_uv,
+                         int dst_width);
+void ScaleUVRowDown2Linear_RVV(const uint8_t* src_ptr,
+                               ptrdiff_t src_stride,
+                               uint8_t* dst_uv,
+                               int dst_width);
+void ScaleUVRowDown2Box_RVV(const uint8_t* src_ptr,
+                            ptrdiff_t src_stride,
+                            uint8_t* dst,
+                            int dst_width);
 void ScaleUVRowDown2_Any_SSSE3(const uint8_t* src_ptr,
                                ptrdiff_t src_stride,
                                uint8_t* dst_ptr,
@@ -1203,6 +1250,16 @@ void ScaleUVRowDownEvenBox_NEON(const uint8_t* src_ptr,
                                 int src_stepx,
                                 uint8_t* dst_uv,
                                 int dst_width);
+void ScaleUVRowDown4_RVV(const uint8_t* src_ptr,
+                         ptrdiff_t src_stride,
+                         int32_t src_stepx,
+                         uint8_t* dst_uv,
+                         int dst_width);
+void ScaleUVRowDownEven_RVV(const uint8_t* src_ptr,
+                            ptrdiff_t src_stride,
+                            int32_t src_stepx,
+                            uint8_t* dst_uv,
+                            int dst_width);
 void ScaleUVRowDownEven_MSA(const uint8_t* src_ptr,
                             ptrdiff_t src_stride,
                             int32_t src_stepx,
@@ -1744,6 +1801,41 @@ void ScaleRowDown34_1_Box_Any_LSX(const uint8_t* src_ptr,
                                   uint8_t* dst_ptr,
                                   int dst_width);
 
+void ScaleAddRow_RVV(const uint8_t* src_ptr, uint16_t* dst_ptr, int src_width);
+void ScaleRowDown2_RVV(const uint8_t* src_ptr,
+                       ptrdiff_t src_stride,
+                       uint8_t* dst,
+                       int dst_width);
+void ScaleRowDown2Linear_RVV(const uint8_t* src_ptr,
+                             ptrdiff_t src_stride,
+                             uint8_t* dst,
+                             int dst_width);
+void ScaleRowDown2Box_RVV(const uint8_t* src_ptr,
+                          ptrdiff_t src_stride,
+                          uint8_t* dst,
+                          int dst_width);
+
+void ScaleRowDown4_RVV(const uint8_t* src_ptr,
+                       ptrdiff_t src_stride,
+                       uint8_t* dst_ptr,
+                       int dst_width);
+void ScaleRowDown4Box_RVV(const uint8_t* src_ptr,
+                          ptrdiff_t src_stride,
+                          uint8_t* dst_ptr,
+                          int dst_width);
+void ScaleRowDown34_RVV(const uint8_t* src_ptr,
+                        ptrdiff_t src_stride,
+                        uint8_t* dst_ptr,
+                        int dst_width);
+void ScaleRowDown34_0_Box_RVV(const uint8_t* src_ptr,
+                              ptrdiff_t src_stride,
+                              uint8_t* dst_ptr,
+                              int dst_width);
+void ScaleRowDown34_1_Box_RVV(const uint8_t* src_ptr,
+                              ptrdiff_t src_stride,
+                              uint8_t* dst_ptr,
+                              int dst_width);
+
 #ifdef __cplusplus
 }  // extern "C"
 }  // namespace libyuv
diff --git a/libfenrir/src/main/jni/animation/libyuv/include/libyuv/version.h b/libfenrir/src/main/jni/animation/libyuv/include/libyuv/version.h
index b6623dbbe..8df341d40 100644
--- a/libfenrir/src/main/jni/animation/libyuv/include/libyuv/version.h
+++ b/libfenrir/src/main/jni/animation/libyuv/include/libyuv/version.h
@@ -11,6 +11,6 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 1871
+#define LIBYUV_VERSION 1872
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_
diff --git a/libfenrir/src/main/jni/animation/libyuv/source/rotate_argb.cc b/libfenrir/src/main/jni/animation/libyuv/source/rotate_argb.cc
index c72390108..034d53e88 100644
--- a/libfenrir/src/main/jni/animation/libyuv/source/rotate_argb.cc
+++ b/libfenrir/src/main/jni/animation/libyuv/source/rotate_argb.cc
@@ -69,6 +69,11 @@ static int ARGBTranspose(const uint8_t* src_argb,
     }
   }
 #endif
+#if defined(HAS_SCALEARGBROWDOWNEVEN_RVV)
+  if (TestCpuFlag(kCpuHasRVV)) {
+    ScaleARGBRowDownEven = ScaleARGBRowDownEven_RVV;
+  }
+#endif
 
   for (i = 0; i < width; ++i) {  // column of source to row of dest.
     ScaleARGBRowDownEven(src_argb, 0, src_pixel_step, dst_argb, height);
diff --git a/libfenrir/src/main/jni/animation/libyuv/source/scale.cc b/libfenrir/src/main/jni/animation/libyuv/source/scale.cc
index 80b030dc2..fe706dd65 100644
--- a/libfenrir/src/main/jni/animation/libyuv/source/scale.cc
+++ b/libfenrir/src/main/jni/animation/libyuv/source/scale.cc
@@ -135,6 +135,14 @@ static void ScalePlaneDown2(int src_width,
     }
   }
 #endif
+#if defined(HAS_SCALEROWDOWN2_RVV)
+  if (TestCpuFlag(kCpuHasRVV)) {
+    ScaleRowDown2 = filtering == kFilterNone
+                        ? ScaleRowDown2_RVV
+                        : (filtering == kFilterLinear ? ScaleRowDown2Linear_RVV
+                                                      : ScaleRowDown2Box_RVV);
+  }
+#endif
 
   if (filtering == kFilterLinear) {
     src_stride = 0;
@@ -312,6 +320,11 @@ static void ScalePlaneDown4(int src_width,
     }
   }
 #endif
+#if defined(HAS_SCALEROWDOWN4_RVV)
+  if (TestCpuFlag(kCpuHasRVV)) {
+    ScaleRowDown4 = filtering ? ScaleRowDown4Box_RVV : ScaleRowDown4_RVV;
+  }
+#endif
 
   if (filtering == kFilterLinear) {
     src_stride = 0;
@@ -472,6 +485,17 @@ static void ScalePlaneDown34(int src_width,
     }
   }
 #endif
+#if defined(HAS_SCALEROWDOWN34_RVV)
+  if (TestCpuFlag(kCpuHasRVV)) {
+    if (!filtering) {
+      ScaleRowDown34_0 = ScaleRowDown34_RVV;
+      ScaleRowDown34_1 = ScaleRowDown34_RVV;
+    } else {
+      ScaleRowDown34_0 = ScaleRowDown34_0_Box_RVV;
+      ScaleRowDown34_1 = ScaleRowDown34_1_Box_RVV;
+    }
+  }
+#endif
 
   for (y = 0; y < dst_height - 2; y += 3) {
     ScaleRowDown34_0(src_ptr, filter_stride, dst_ptr, dst_width);
@@ -971,6 +995,11 @@ static void ScalePlaneBox(int src_width,
       }
     }
 #endif
+#if defined(HAS_SCALEADDROW_RVV)
+    if (TestCpuFlag(kCpuHasRVV)) {
+      ScaleAddRow = ScaleAddRow_RVV;
+    }
+#endif
 
     for (j = 0; j < dst_height; ++j) {
       int boxheight;
diff --git a/libfenrir/src/main/jni/animation/libyuv/source/scale_argb.cc b/libfenrir/src/main/jni/animation/libyuv/source/scale_argb.cc
index ddd8d29ed..214f932cb 100644
--- a/libfenrir/src/main/jni/animation/libyuv/source/scale_argb.cc
+++ b/libfenrir/src/main/jni/animation/libyuv/source/scale_argb.cc
@@ -127,6 +127,15 @@ static void ScaleARGBDown2(int src_width,
     }
   }
 #endif
+#if defined(HAS_SCALEARGBROWDOWN2_RVV)
+  if (TestCpuFlag(kCpuHasRVV)) {
+    ScaleARGBRowDown2 =
+        filtering == kFilterNone
+            ? ScaleARGBRowDown2_RVV
+            : (filtering == kFilterLinear ? ScaleARGBRowDown2Linear_RVV
+                                          : ScaleARGBRowDown2Box_RVV);
+  }
+#endif
 
   if (filtering == kFilterLinear) {
     src_stride = 0;
@@ -184,6 +193,11 @@ static void ScaleARGBDown4Box(int src_width,
     }
   }
 #endif
+#if defined(HAS_SCALEARGBROWDOWN2_RVV)
+  if (TestCpuFlag(kCpuHasRVV)) {
+    ScaleARGBRowDown2 = ScaleARGBRowDown2Box_RVV;
+  }
+#endif
 
   for (j = 0; j < dst_height; ++j) {
     ScaleARGBRowDown2(src_argb, src_stride, row, dst_width * 2);
@@ -263,6 +277,12 @@ static void ScaleARGBDownEven(int src_width,
     }
   }
 #endif
+#if defined(HAS_SCALEARGBROWDOWNEVEN_RVV)
+  if (TestCpuFlag(kCpuHasRVV)) {
+    ScaleARGBRowDownEven =
+        filtering ? ScaleARGBRowDownEvenBox_RVV : ScaleARGBRowDownEven_RVV;
+  }
+#endif
 
   if (filtering == kFilterLinear) {
     src_stride = 0;
diff --git a/libfenrir/src/main/jni/animation/libyuv/source/scale_neon64.cc b/libfenrir/src/main/jni/animation/libyuv/source/scale_neon64.cc
index ad06ee83c..7c0723809 100644
--- a/libfenrir/src/main/jni/animation/libyuv/source/scale_neon64.cc
+++ b/libfenrir/src/main/jni/animation/libyuv/source/scale_neon64.cc
@@ -1118,101 +1118,6 @@ void ScaleFilterCols_NEON(uint8_t* dst_ptr,
 
 #undef LOAD2_DATA8_LANE
 
-// 16x2 -> 16x1
-void ScaleFilterRows_NEON(uint8_t* dst_ptr,
-                          const uint8_t* src_ptr,
-                          ptrdiff_t src_stride,
-                          int dst_width,
-                          int source_y_fraction) {
-  int y_fraction = 256 - source_y_fraction;
-  asm volatile(
-      "cmp         %w4, #0                       \n"
-      "b.eq        100f                          \n"
-      "add         %2, %2, %1                    \n"
-      "cmp         %w4, #64                      \n"
-      "b.eq        75f                           \n"
-      "cmp         %w4, #128                     \n"
-      "b.eq        50f                           \n"
-      "cmp         %w4, #192                     \n"
-      "b.eq        25f                           \n"
-
-      "dup         v5.8b, %w4                    \n"
-      "dup         v4.8b, %w5                    \n"
-      // General purpose row blend.
-      "1:                                        \n"
-      "ld1         {v0.16b}, [%1], #16           \n"
-      "ld1         {v1.16b}, [%2], #16           \n"
-      "subs        %w3, %w3, #16                 \n"
-      "umull       v6.8h, v0.8b, v4.8b           \n"
-      "umull2      v7.8h, v0.16b, v4.16b         \n"
-      "prfm        pldl1keep, [%1, 448]          \n"  // prefetch 7 lines ahead
-      "umlal       v6.8h, v1.8b, v5.8b           \n"
-      "umlal2      v7.8h, v1.16b, v5.16b         \n"
-      "prfm        pldl1keep, [%2, 448]          \n"
-      "rshrn       v0.8b, v6.8h, #8              \n"
-      "rshrn2      v0.16b, v7.8h, #8             \n"
-      "st1         {v0.16b}, [%0], #16           \n"
-      "b.gt        1b                            \n"
-      "b           99f                           \n"
-
-      // Blend 25 / 75.
-      "25:                                       \n"
-      "ld1         {v0.16b}, [%1], #16           \n"
-      "ld1         {v1.16b}, [%2], #16           \n"
-      "subs        %w3, %w3, #16                 \n"
-      "urhadd      v0.16b, v0.16b, v1.16b        \n"
-      "prfm        pldl1keep, [%1, 448]          \n"  // prefetch 7 lines ahead
-      "urhadd      v0.16b, v0.16b, v1.16b        \n"
-      "prfm        pldl1keep, [%2, 448]          \n"
-      "st1         {v0.16b}, [%0], #16           \n"
-      "b.gt        25b                           \n"
-      "b           99f                           \n"
-
-      // Blend 50 / 50.
-      "50:                                       \n"
-      "ld1         {v0.16b}, [%1], #16           \n"
-      "ld1         {v1.16b}, [%2], #16           \n"
-      "subs        %w3, %w3, #16                 \n"
-      "prfm        pldl1keep, [%1, 448]          \n"  // prefetch 7 lines ahead
-      "urhadd      v0.16b, v0.16b, v1.16b        \n"
-      "prfm        pldl1keep, [%2, 448]          \n"
-      "st1         {v0.16b}, [%0], #16           \n"
-      "b.gt        50b                           \n"
-      "b           99f                           \n"
-
-      // Blend 75 / 25.
-      "75:                                       \n"
-      "ld1         {v1.16b}, [%1], #16           \n"
-      "ld1         {v0.16b}, [%2], #16           \n"
-      "subs        %w3, %w3, #16                 \n"
-      "urhadd      v0.16b, v0.16b, v1.16b        \n"
-      "prfm        pldl1keep, [%1, 448]          \n"  // prefetch 7 lines ahead
-      "urhadd      v0.16b, v0.16b, v1.16b        \n"
-      "prfm        pldl1keep, [%2, 448]          \n"
-      "st1         {v0.16b}, [%0], #16           \n"
-      "b.gt        75b                           \n"
-      "b           99f                           \n"
-
-      // Blend 100 / 0 - Copy row unchanged.
-      "100:                                      \n"
-      "ld1         {v0.16b}, [%1], #16           \n"
-      "subs        %w3, %w3, #16                 \n"
-      "prfm        pldl1keep, [%1, 448]          \n"  // prefetch 7 lines ahead
-      "st1         {v0.16b}, [%0], #16           \n"
-      "b.gt        100b                          \n"
-
-      "99:                                       \n"
-      "st1         {v0.b}[15], [%0]              \n"
-      : "+r"(dst_ptr),            // %0
-        "+r"(src_ptr),            // %1
-        "+r"(src_stride),         // %2
-        "+r"(dst_width),          // %3
-        "+r"(source_y_fraction),  // %4
-        "+r"(y_fraction)          // %5
-      :
-      : "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "memory", "cc");
-}
-
 void ScaleARGBRowDown2_NEON(const uint8_t* src_ptr,
                             ptrdiff_t src_stride,
                             uint8_t* dst,
diff --git a/libfenrir/src/main/jni/animation/libyuv/source/scale_rvv.cc b/libfenrir/src/main/jni/animation/libyuv/source/scale_rvv.cc
new file mode 100644
index 000000000..99316c485
--- /dev/null
+++ b/libfenrir/src/main/jni/animation/libyuv/source/scale_rvv.cc
@@ -0,0 +1,606 @@
+/*
+ *  Copyright 2023 The LibYuv Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS. All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+/*
+ * Copyright (c) 2023 SiFive, Inc. All rights reserved.
+ *
+ * Contributed by Darren Hsieh <darren.hsieh@sifive.com>
+ * Contributed by Bruce Lai <bruce.lai@sifive.com>
+ */
+
+#include "libyuv/row.h"
+#include "libyuv/scale_row.h"
+
+// This module is for gcc/clang rvv.
+#if !defined(LIBYUV_DISABLE_RVV) && defined(__riscv_vector)
+#include <riscv_vector.h>
+
+#ifdef __cplusplus
+namespace libyuv {
+extern "C" {
+#endif
+
+void ScaleAddRow_RVV(const uint8_t* src_ptr, uint16_t* dst_ptr, int src_width) {
+  size_t w = (size_t)src_width;
+  do {
+    size_t vl = __riscv_vsetvl_e8m4(w);
+    vuint8m4_t v_src = __riscv_vle8_v_u8m4(src_ptr, vl);
+    vuint16m8_t v_dst = __riscv_vle16_v_u16m8(dst_ptr, vl);
+    // Use widening multiply-add instead of widening + add
+    v_dst = __riscv_vwmaccu_vx_u16m8(v_dst, 1, v_src, vl);
+    __riscv_vse16_v_u16m8(dst_ptr, v_dst, vl);
+    w -= vl;
+    src_ptr += vl;
+    dst_ptr += vl;
+  } while (w > 0);
+}
+
+void ScaleARGBRowDown2_RVV(const uint8_t* src_argb,
+                           ptrdiff_t src_stride,
+                           uint8_t* dst_argb,
+                           int dst_width) {
+  (void)src_stride;
+  size_t w = (size_t)dst_width;
+  const uint64_t* src = (const uint64_t*)(src_argb);
+  uint32_t* dst = (uint32_t*)(dst_argb);
+  do {
+    vuint64m8_t v_data;
+    vuint32m4_t v_dst;
+    size_t vl = __riscv_vsetvl_e64m8(w);
+    v_data = __riscv_vle64_v_u64m8(src, vl);
+    v_dst = __riscv_vnsrl_wx_u32m4(v_data, 32, vl);
+    __riscv_vse32_v_u32m4(dst, v_dst, vl);
+    w -= vl;
+    src += vl;
+    dst += vl;
+  } while (w > 0);
+}
+
+void ScaleARGBRowDown2Linear_RVV(const uint8_t* src_argb,
+                                 ptrdiff_t src_stride,
+                                 uint8_t* dst_argb,
+                                 int dst_width) {
+  (void)src_stride;
+  size_t w = (size_t)dst_width;
+  const uint32_t* src = (const uint32_t*)(src_argb);
+  // NOTE: To match behavior on other platforms, vxrm (fixed-point rounding mode
+  // register) is set to round-to-nearest-up mode(0).
+  asm volatile("csrwi vxrm, 0");
+  do {
+    vuint8m4_t v_odd, v_even, v_dst;
+    vuint16m8_t v_sum;
+    vuint32m4_t v_odd_32, v_even_32;
+    size_t vl = __riscv_vsetvl_e32m4(w);
+    __riscv_vlseg2e32_v_u32m4(&v_even_32, &v_odd_32, src, vl);
+    v_even = __riscv_vreinterpret_v_u32m4_u8m4(v_even_32);
+    v_odd = __riscv_vreinterpret_v_u32m4_u8m4(v_odd_32);
+    // Use round-to-nearest-up mode for averaging add
+    v_dst = __riscv_vaaddu_vv_u8m4(v_even, v_odd, vl * 4);
+    __riscv_vse8_v_u8m4(dst_argb, v_dst, vl * 4);
+    w -= vl;
+    src += vl * 2;
+    dst_argb += vl * 4;
+  } while (w > 0);
+}
+
+void ScaleARGBRowDown2Box_RVV(const uint8_t* src_argb,
+                              ptrdiff_t src_stride,
+                              uint8_t* dst_argb,
+                              int dst_width) {
+  size_t w = (size_t)dst_width;
+  const uint32_t* src0 = (const uint32_t*)(src_argb);
+  const uint32_t* src1 = (const uint32_t*)(src_argb + src_stride);
+  // NOTE: To match behavior on other platforms, vxrm (fixed-point rounding mode
+  // register) is set to round-to-nearest-up mode(0).
+  asm volatile("csrwi vxrm, 0");
+  do {
+    vuint8m4_t v_row0_odd, v_row0_even, v_row1_odd, v_row1_even, v_dst;
+    vuint16m8_t v_row0_sum, v_row1_sum, v_dst_16;
+    vuint32m4_t v_row0_odd_32, v_row0_even_32, v_row1_odd_32, v_row1_even_32;
+    size_t vl = __riscv_vsetvl_e32m4(w);
+    __riscv_vlseg2e32_v_u32m4(&v_row0_even_32, &v_row0_odd_32, src0, vl);
+    __riscv_vlseg2e32_v_u32m4(&v_row1_even_32, &v_row1_odd_32, src1, vl);
+    v_row0_even = __riscv_vreinterpret_v_u32m4_u8m4(v_row0_even_32);
+    v_row0_odd = __riscv_vreinterpret_v_u32m4_u8m4(v_row0_odd_32);
+    v_row1_even = __riscv_vreinterpret_v_u32m4_u8m4(v_row1_even_32);
+    v_row1_odd = __riscv_vreinterpret_v_u32m4_u8m4(v_row1_odd_32);
+    v_row0_sum = __riscv_vwaddu_vv_u16m8(v_row0_even, v_row0_odd, vl * 4);
+    v_row1_sum = __riscv_vwaddu_vv_u16m8(v_row1_even, v_row1_odd, vl * 4);
+    v_dst_16 = __riscv_vadd_vv_u16m8(v_row0_sum, v_row1_sum, vl * 4);
+    // Use round-to-nearest-up mode for vnclip
+    v_dst = __riscv_vnclipu_wx_u8m4(v_dst_16, 2, vl * 4);
+    __riscv_vse8_v_u8m4(dst_argb, v_dst, vl * 4);
+    w -= vl;
+    src0 += vl * 2;
+    src1 += vl * 2;
+    dst_argb += vl * 4;
+  } while (w > 0);
+}
+
+void ScaleARGBRowDownEven_RVV(const uint8_t* src_argb,
+                              ptrdiff_t src_stride,
+                              int src_stepx,
+                              uint8_t* dst_argb,
+                              int dst_width) {
+  size_t w = (size_t)dst_width;
+  const uint32_t* src = (const uint32_t*)(src_argb);
+  uint32_t* dst = (uint32_t*)(dst_argb);
+  const int stride_byte = src_stepx * 4;
+  do {
+    vuint32m8_t v_row;
+    size_t vl = __riscv_vsetvl_e32m8(w);
+    v_row = __riscv_vlse32_v_u32m8(src, stride_byte, vl);
+    __riscv_vse32_v_u32m8(dst, v_row, vl);
+    w -= vl;
+    src += vl * src_stepx;
+    dst += vl;
+  } while (w > 0);
+}
+
+void ScaleARGBRowDownEvenBox_RVV(const uint8_t* src_argb,
+                                 ptrdiff_t src_stride,
+                                 int src_stepx,
+                                 uint8_t* dst_argb,
+                                 int dst_width) {
+  size_t w = (size_t)dst_width;
+  const uint32_t* src0 = (const uint32_t*)(src_argb);
+  const uint32_t* src1 = (const uint32_t*)(src_argb + src_stride);
+  const int stride_byte = src_stepx * 4;
+  // NOTE: To match behavior on other platforms, vxrm (fixed-point rounding mode
+  // register) is set to round-to-nearest-up mode(0).
+  asm volatile("csrwi vxrm, 0");
+  do {
+    vuint8m4_t v_row0_low, v_row0_high, v_row1_low, v_row1_high, v_dst;
+    vuint16m8_t v_row0_sum, v_row1_sum, v_sum;
+    vuint32m4_t v_row0_low_32, v_row0_high_32, v_row1_low_32, v_row1_high_32;
+    size_t vl = __riscv_vsetvl_e32m4(w);
+    __riscv_vlsseg2e32_v_u32m4(&v_row0_low_32, &v_row0_high_32, src0,
+                               stride_byte, vl);
+    __riscv_vlsseg2e32_v_u32m4(&v_row1_low_32, &v_row1_high_32, src1,
+                               stride_byte, vl);
+    v_row0_low = __riscv_vreinterpret_v_u32m4_u8m4(v_row0_low_32);
+    v_row0_high = __riscv_vreinterpret_v_u32m4_u8m4(v_row0_high_32);
+    v_row1_low = __riscv_vreinterpret_v_u32m4_u8m4(v_row1_low_32);
+    v_row1_high = __riscv_vreinterpret_v_u32m4_u8m4(v_row1_high_32);
+    v_row0_sum = __riscv_vwaddu_vv_u16m8(v_row0_low, v_row0_high, vl * 4);
+    v_row1_sum = __riscv_vwaddu_vv_u16m8(v_row1_low, v_row1_high, vl * 4);
+    v_sum = __riscv_vadd_vv_u16m8(v_row0_sum, v_row1_sum, vl * 4);
+    // Use round-to-nearest-up mode for vnclip
+    v_dst = __riscv_vnclipu_wx_u8m4(v_sum, 2, vl * 4);
+    __riscv_vse8_v_u8m4(dst_argb, v_dst, vl * 4);
+    w -= vl;
+    src0 += vl * src_stepx;
+    src1 += vl * src_stepx;
+    dst_argb += vl * 4;
+  } while (w > 0);
+}
+
+void ScaleRowDown2_RVV(const uint8_t* src_ptr,
+                       ptrdiff_t src_stride,
+                       uint8_t* dst,
+                       int dst_width) {
+  size_t w = (size_t)dst_width;
+  const uint16_t* src = (const uint16_t*)src_ptr;
+  (void)src_stride;
+  do {
+    size_t vl = __riscv_vsetvl_e16m8(w);
+    vuint16m8_t v_src = __riscv_vle16_v_u16m8(src, vl);
+    vuint8m4_t v_dst = __riscv_vnsrl_wx_u8m4(v_src, 8, vl);
+    __riscv_vse8_v_u8m4(dst, v_dst, vl);
+    w -= vl;
+    src += vl;
+    dst += vl;
+  } while (w > 0);
+}
+
+void ScaleRowDown2Linear_RVV(const uint8_t* src_ptr,
+                             ptrdiff_t src_stride,
+                             uint8_t* dst,
+                             int dst_width) {
+  size_t w = (size_t)dst_width;
+  (void)src_stride;
+  // NOTE: To match behavior on other platforms, vxrm (fixed-point rounding mode
+  // register) is set to round-to-nearest-up mode(0).
+  asm volatile("csrwi vxrm, 0");
+  do {
+    vuint8m4_t v_s0, v_s1, v_dst;
+    size_t vl = __riscv_vsetvl_e8m4(w);
+    __riscv_vlseg2e8_v_u8m4(&v_s0, &v_s1, src_ptr, vl);
+    // Use round-to-nearest-up mode for averaging add
+    v_dst = __riscv_vaaddu_vv_u8m4(v_s0, v_s1, vl);
+    __riscv_vse8_v_u8m4(dst, v_dst, vl);
+    w -= vl;
+    src_ptr += 2 * vl;
+    dst += vl;
+  } while (w > 0);
+}
+
+void ScaleRowDown2Box_RVV(const uint8_t* src_ptr,
+                          ptrdiff_t src_stride,
+                          uint8_t* dst,
+                          int dst_width) {
+  const uint8_t* s = src_ptr;
+  const uint8_t* t = src_ptr + src_stride;
+  size_t w = (size_t)dst_width;
+  // NOTE: To match behavior on other platforms, vxrm (fixed-point rounding mode
+  // register) is set to round-to-nearest-up mode(0).
+  asm volatile("csrwi vxrm, 0");
+  do {
+    size_t vl = __riscv_vsetvl_e8m4(w);
+    vuint8m4_t v_s0, v_s1, v_t0, v_t1;
+    vuint16m8_t v_s01, v_t01, v_st01;
+    vuint8m4_t v_dst;
+    __riscv_vlseg2e8_v_u8m4(&v_s0, &v_s1, s, vl);
+    __riscv_vlseg2e8_v_u8m4(&v_t0, &v_t1, t, vl);
+    v_s01 = __riscv_vwaddu_vv_u16m8(v_s0, v_s1, vl);
+    v_t01 = __riscv_vwaddu_vv_u16m8(v_t0, v_t1, vl);
+    v_st01 = __riscv_vadd_vv_u16m8(v_s01, v_t01, vl);
+    // Use round-to-nearest-up mode for vnclip
+    v_dst = __riscv_vnclipu_wx_u8m4(v_st01, 2, vl);
+    __riscv_vse8_v_u8m4(dst, v_dst, vl);
+    w -= vl;
+    s += 2 * vl;
+    t += 2 * vl;
+    dst += vl;
+  } while (w > 0);
+}
+
+void ScaleRowDown4_RVV(const uint8_t* src_ptr,
+                       ptrdiff_t src_stride,
+                       uint8_t* dst_ptr,
+                       int dst_width) {
+  size_t w = (size_t)dst_width;
+  (void)src_stride;
+  do {
+    size_t vl = __riscv_vsetvl_e8m2(w);
+    vuint8m2_t v_s0, v_s1, v_s2, v_s3;
+    __riscv_vlseg4e8_v_u8m2(&v_s0, &v_s1, &v_s2, &v_s3, src_ptr, vl);
+    __riscv_vse8_v_u8m2(dst_ptr, v_s2, vl);
+    w -= vl;
+    src_ptr += (4 * vl);
+    dst_ptr += vl;
+  } while (w > 0);
+}
+
+void ScaleRowDown4Box_RVV(const uint8_t* src_ptr,
+                          ptrdiff_t src_stride,
+                          uint8_t* dst_ptr,
+                          int dst_width) {
+  const uint8_t* src_ptr1 = src_ptr + src_stride;
+  const uint8_t* src_ptr2 = src_ptr + src_stride * 2;
+  const uint8_t* src_ptr3 = src_ptr + src_stride * 3;
+  size_t w = (size_t)dst_width;
+  // NOTE: To match behavior on other platforms, vxrm (fixed-point rounding mode
+  // register) is set to round-to-nearest-up mode(0).
+  asm volatile("csrwi vxrm, 0");
+  do {
+    vuint8m2_t v_s0, v_s1, v_s2, v_s3;
+    vuint8m2_t v_t0, v_t1, v_t2, v_t3;
+    vuint8m2_t v_u0, v_u1, v_u2, v_u3;
+    vuint8m2_t v_v0, v_v1, v_v2, v_v3;
+    vuint16m4_t v_s01, v_s23, v_t01, v_t23;
+    vuint16m4_t v_u01, v_u23, v_v01, v_v23;
+    vuint16m4_t v_st01, v_st23, v_uv01, v_uv23;
+    vuint16m4_t v_st0123, v_uv0123, v_stuv0123;
+    vuint8m2_t v_dst;
+    size_t vl = __riscv_vsetvl_e8m2(w);
+
+    __riscv_vlseg4e8_v_u8m2(&v_s0, &v_s1, &v_s2, &v_s3, src_ptr, vl);
+    v_s01 = __riscv_vwaddu_vv_u16m4(v_s0, v_s1, vl);
+
+    __riscv_vlseg4e8_v_u8m2(&v_t0, &v_t1, &v_t2, &v_t3, src_ptr1, vl);
+    v_t01 = __riscv_vwaddu_vv_u16m4(v_t0, v_t1, vl);
+
+    __riscv_vlseg4e8_v_u8m2(&v_u0, &v_u1, &v_u2, &v_u3, src_ptr2, vl);
+    v_u01 = __riscv_vwaddu_vv_u16m4(v_u0, v_u1, vl);
+    v_u23 = __riscv_vwaddu_vv_u16m4(v_u2, v_u3, vl);
+
+    v_s23 = __riscv_vwaddu_vv_u16m4(v_s2, v_s3, vl);
+    v_t23 = __riscv_vwaddu_vv_u16m4(v_t2, v_t3, vl);
+    v_st01 = __riscv_vadd_vv_u16m4(v_s01, v_t01, vl);
+    v_st23 = __riscv_vadd_vv_u16m4(v_s23, v_t23, vl);
+
+    __riscv_vlseg4e8_v_u8m2(&v_v0, &v_v1, &v_v2, &v_v3, src_ptr3, vl);
+
+    v_v01 = __riscv_vwaddu_vv_u16m4(v_v0, v_v1, vl);
+    v_v23 = __riscv_vwaddu_vv_u16m4(v_v2, v_v3, vl);
+
+    v_uv01 = __riscv_vadd_vv_u16m4(v_u01, v_v01, vl);
+    v_uv23 = __riscv_vadd_vv_u16m4(v_u23, v_v23, vl);
+
+    v_st0123 = __riscv_vadd_vv_u16m4(v_st01, v_st23, vl);
+    v_uv0123 = __riscv_vadd_vv_u16m4(v_uv01, v_uv23, vl);
+    v_stuv0123 = __riscv_vadd_vv_u16m4(v_st0123, v_uv0123, vl);
+    // Use round-to-nearest-up mode for vnclip
+    v_dst = __riscv_vnclipu_wx_u8m2(v_stuv0123, 4, vl);
+    __riscv_vse8_v_u8m2(dst_ptr, v_dst, vl);
+    w -= vl;
+    src_ptr += 4 * vl;
+    src_ptr1 += 4 * vl;
+    src_ptr2 += 4 * vl;
+    src_ptr3 += 4 * vl;
+    dst_ptr += vl;
+  } while (w > 0);
+}
+
+void ScaleRowDown34_RVV(const uint8_t* src_ptr,
+                        ptrdiff_t src_stride,
+                        uint8_t* dst_ptr,
+                        int dst_width) {
+  size_t w = (size_t)dst_width / 3u;
+  do {
+    size_t vl = __riscv_vsetvl_e8m2(w);
+    vuint8m2_t v_s0, v_s1, v_s2, v_s3;
+    __riscv_vlseg4e8_v_u8m2(&v_s0, &v_s1, &v_s2, &v_s3, src_ptr, vl);
+    __riscv_vsseg3e8_v_u8m2(dst_ptr, v_s0, v_s1, v_s3, vl);
+    w -= vl;
+    src_ptr += 4 * vl;
+    dst_ptr += 3 * vl;
+  } while (w > 0);
+}
+
+void ScaleRowDown34_0_Box_RVV(const uint8_t* src_ptr,
+                              ptrdiff_t src_stride,
+                              uint8_t* dst_ptr,
+                              int dst_width) {
+  size_t w = (size_t)dst_width / 3u;
+  const uint8_t* s = src_ptr;
+  const uint8_t* t = src_ptr + src_stride;
+  // NOTE: To match behavior on other platforms, vxrm (fixed-point rounding mode
+  // register) is set to round-to-nearest-up mode(0).
+  asm volatile("csrwi vxrm, 0");
+  do {
+    vuint8m2_t v_s0, v_s1, v_s2, v_s3;
+    vuint16m4_t v_t0_u16, v_t1_u16, v_t2_u16, v_t3_u16;
+    vuint8m2_t v_u0, v_u1, v_u2, v_u3;
+    vuint16m4_t v_u1_u16;
+    vuint8m2_t v_a0, v_a1, v_a2;
+    size_t vl = __riscv_vsetvl_e8m2(w);
+    __riscv_vlseg4e8_v_u8m2(&v_s0, &v_s1, &v_s2, &v_s3, s, vl);
+
+    if (src_stride == 0) {
+      v_t0_u16 = __riscv_vwaddu_vx_u16m4(v_s0, 2, vl);
+      v_t1_u16 = __riscv_vwaddu_vx_u16m4(v_s1, 2, vl);
+      v_t2_u16 = __riscv_vwaddu_vx_u16m4(v_s2, 2, vl);
+      v_t3_u16 = __riscv_vwaddu_vx_u16m4(v_s3, 2, vl);
+    } else {
+      vuint8m2_t v_t0, v_t1, v_t2, v_t3;
+      __riscv_vlseg4e8_v_u8m2(&v_t0, &v_t1, &v_t2, &v_t3, t, vl);
+      v_t0_u16 = __riscv_vwaddu_vx_u16m4(v_t0, 0, vl);
+      v_t1_u16 = __riscv_vwaddu_vx_u16m4(v_t1, 0, vl);
+      v_t2_u16 = __riscv_vwaddu_vx_u16m4(v_t2, 0, vl);
+      v_t3_u16 = __riscv_vwaddu_vx_u16m4(v_t3, 0, vl);
+      t += 4 * vl;
+    }
+
+    v_t0_u16 = __riscv_vwmaccu_vx_u16m4(v_t0_u16, 3, v_s0, vl);
+    v_t1_u16 = __riscv_vwmaccu_vx_u16m4(v_t1_u16, 3, v_s1, vl);
+    v_t2_u16 = __riscv_vwmaccu_vx_u16m4(v_t2_u16, 3, v_s2, vl);
+    v_t3_u16 = __riscv_vwmaccu_vx_u16m4(v_t3_u16, 3, v_s3, vl);
+
+    // Use round-to-nearest-up mode for vnclip & averaging add
+    v_u0 = __riscv_vnclipu_wx_u8m2(v_t0_u16, 2, vl);
+    v_u1 = __riscv_vnclipu_wx_u8m2(v_t1_u16, 2, vl);
+    v_u2 = __riscv_vnclipu_wx_u8m2(v_t2_u16, 2, vl);
+    v_u3 = __riscv_vnclipu_wx_u8m2(v_t3_u16, 2, vl);
+
+    // a0 = (src[0] * 3 + s[1] * 1 + 2) >> 2
+    v_u1_u16 = __riscv_vwaddu_vx_u16m4(v_u1, 0, vl);
+    v_u1_u16 = __riscv_vwmaccu_vx_u16m4(v_u1_u16, 3, v_u0, vl);
+    v_a0 = __riscv_vnclipu_wx_u8m2(v_u1_u16, 2, vl);
+
+    // a1 = (src[1] * 1 + s[2] * 1 + 1) >> 1
+    v_a1 = __riscv_vaaddu_vv_u8m2(v_u1, v_u2, vl);
+
+    // a2 = (src[2] * 1 + s[3] * 3 + 2) >> 2
+    v_u1_u16 = __riscv_vwaddu_vx_u16m4(v_u2, 0, vl);
+    v_u1_u16 = __riscv_vwmaccu_vx_u16m4(v_u1_u16, 3, v_u3, vl);
+    v_a2 = __riscv_vnclipu_wx_u8m2(v_u1_u16, 2, vl);
+
+    __riscv_vsseg3e8_v_u8m2(dst_ptr, v_a0, v_a1, v_a2, vl);
+
+    w -= vl;
+    s += 4 * vl;
+    dst_ptr += 3 * vl;
+  } while (w > 0);
+}
+
+void ScaleRowDown34_1_Box_RVV(const uint8_t* src_ptr,
+                              ptrdiff_t src_stride,
+                              uint8_t* dst_ptr,
+                              int dst_width) {
+  size_t w = (size_t)dst_width / 3u;
+  const uint8_t* s = src_ptr;
+  const uint8_t* t = src_ptr + src_stride;
+  // NOTE: To match behavior on other platforms, vxrm (fixed-point rounding mode
+  // register) is set to round-to-nearest-up mode(0).
+  asm volatile("csrwi vxrm, 0");
+  do {
+    vuint8m2_t v_s0, v_s1, v_s2, v_s3;
+    vuint8m2_t v_ave0, v_ave1, v_ave2, v_ave3;
+    vuint16m4_t v_u1_u16;
+    vuint8m2_t v_a0, v_a1, v_a2;
+    size_t vl = __riscv_vsetvl_e8m2(w);
+    __riscv_vlseg4e8_v_u8m2(&v_s0, &v_s1, &v_s2, &v_s3, s, vl);
+
+    // Use round-to-nearest-up mode for vnclip & averaging add
+    if (src_stride == 0) {
+      v_ave0 = __riscv_vaaddu_vv_u8m2(v_s0, v_s0, vl);
+      v_ave1 = __riscv_vaaddu_vv_u8m2(v_s1, v_s1, vl);
+      v_ave2 = __riscv_vaaddu_vv_u8m2(v_s2, v_s2, vl);
+      v_ave3 = __riscv_vaaddu_vv_u8m2(v_s3, v_s3, vl);
+    } else {
+      vuint8m2_t v_t0, v_t1, v_t2, v_t3;
+      __riscv_vlseg4e8_v_u8m2(&v_t0, &v_t1, &v_t2, &v_t3, t, vl);
+      v_ave0 = __riscv_vaaddu_vv_u8m2(v_s0, v_t0, vl);
+      v_ave1 = __riscv_vaaddu_vv_u8m2(v_s1, v_t1, vl);
+      v_ave2 = __riscv_vaaddu_vv_u8m2(v_s2, v_t2, vl);
+      v_ave3 = __riscv_vaaddu_vv_u8m2(v_s3, v_t3, vl);
+      t += 4 * vl;
+    }
+    // a0 = (src[0] * 3 + s[1] * 1 + 2) >> 2
+    v_u1_u16 = __riscv_vwaddu_vx_u16m4(v_ave1, 0, vl);
+    v_u1_u16 = __riscv_vwmaccu_vx_u16m4(v_u1_u16, 3, v_ave0, vl);
+    v_a0 = __riscv_vnclipu_wx_u8m2(v_u1_u16, 2, vl);
+
+    // a1 = (src[1] * 1 + s[2] * 1 + 1) >> 1
+    v_a1 = __riscv_vaaddu_vv_u8m2(v_ave1, v_ave2, vl);
+
+    // a2 = (src[2] * 1 + s[3] * 3 + 2) >> 2
+    v_u1_u16 = __riscv_vwaddu_vx_u16m4(v_ave2, 0, vl);
+    v_u1_u16 = __riscv_vwmaccu_vx_u16m4(v_u1_u16, 3, v_ave3, vl);
+    v_a2 = __riscv_vnclipu_wx_u8m2(v_u1_u16, 2, vl);
+
+    __riscv_vsseg3e8_v_u8m2(dst_ptr, v_a0, v_a1, v_a2, vl);
+
+    w -= vl;
+    s += 4 * vl;
+    dst_ptr += 3 * vl;
+  } while (w > 0);
+}
+
+void ScaleUVRowDown2_RVV(const uint8_t* src_uv,
+                         ptrdiff_t src_stride,
+                         uint8_t* dst_uv,
+                         int dst_width) {
+  size_t w = (size_t)dst_width;
+  const uint32_t* src = (const uint32_t*)src_uv;
+  uint16_t* dst = (uint16_t*)dst_uv;
+  (void)src_stride;
+  do {
+    size_t vl = __riscv_vsetvl_e32m8(w);
+    vuint32m8_t v_data = __riscv_vle32_v_u32m8(src, vl);
+    vuint16m4_t v_u1v1 = __riscv_vnsrl_wx_u16m4(v_data, 16, vl);
+    __riscv_vse16_v_u16m4(dst, v_u1v1, vl);
+    w -= vl;
+    src += vl;
+    dst += vl;
+  } while (w > 0);
+}
+
+void ScaleUVRowDown2Linear_RVV(const uint8_t* src_uv,
+                               ptrdiff_t src_stride,
+                               uint8_t* dst_uv,
+                               int dst_width) {
+  size_t w = (size_t)dst_width;
+  const uint16_t* src = (const uint16_t*)src_uv;
+  (void)src_stride;
+  // NOTE: To match behavior on other platforms, vxrm (fixed-point rounding mode
+  // register) is set to round-to-nearest-up mode(0).
+  asm volatile("csrwi vxrm, 0");
+  do {
+    vuint8m4_t v_u0v0, v_u1v1, v_avg;
+    vuint16m4_t v_u0v0_16, v_u1v1_16;
+    size_t vl = __riscv_vsetvl_e16m4(w);
+    vlseg2e16_v_u16m4(&v_u0v0_16, &v_u1v1_16, src, vl);
+    v_u0v0 = __riscv_vreinterpret_v_u16m4_u8m4(v_u0v0_16);
+    v_u1v1 = __riscv_vreinterpret_v_u16m4_u8m4(v_u1v1_16);
+    // Use round-to-nearest-up mode for averaging add
+    v_avg = __riscv_vaaddu_vv_u8m4(v_u0v0, v_u1v1, vl * 2);
+    __riscv_vse8_v_u8m4(dst_uv, v_avg, vl * 2);
+    w -= vl;
+    src += vl * 2;
+    dst_uv += vl * 2;
+  } while (w > 0);
+}
+
+void ScaleUVRowDown2Box_RVV(const uint8_t* src_uv,
+                            ptrdiff_t src_stride,
+                            uint8_t* dst_uv,
+                            int dst_width) {
+  const uint8_t* src_uv_row1 = src_uv + src_stride;
+  size_t w = (size_t)dst_width;
+  // NOTE: To match behavior on other platforms, vxrm (fixed-point rounding mode
+  // register) is set to round-to-nearest-up mode(0).
+  asm volatile("csrwi vxrm, 0");
+  do {
+    vuint8m2_t v_u0_row0, v_v0_row0, v_u1_row0, v_v1_row0;
+    vuint8m2_t v_u0_row1, v_v0_row1, v_u1_row1, v_v1_row1;
+    vuint16m4_t v_u0u1_row0, v_u0u1_row1, v_v0v1_row0, v_v0v1_row1;
+    vuint16m4_t v_sum0, v_sum1;
+    vuint8m2_t v_dst_u, v_dst_v;
+    size_t vl = __riscv_vsetvl_e8m2(w);
+
+    __riscv_vlseg4e8_v_u8m2(&v_u0_row0, &v_v0_row0, &v_u1_row0, &v_v1_row0,
+                            src_uv, vl);
+    __riscv_vlseg4e8_v_u8m2(&v_u0_row1, &v_v0_row1, &v_u1_row1, &v_v1_row1,
+                            src_uv_row1, vl);
+
+    v_u0u1_row0 = __riscv_vwaddu_vv_u16m4(v_u0_row0, v_u1_row0, vl);
+    v_u0u1_row1 = __riscv_vwaddu_vv_u16m4(v_u0_row1, v_u1_row1, vl);
+    v_v0v1_row0 = __riscv_vwaddu_vv_u16m4(v_v0_row0, v_v1_row0, vl);
+    v_v0v1_row1 = __riscv_vwaddu_vv_u16m4(v_v0_row1, v_v1_row1, vl);
+
+    v_sum0 = __riscv_vadd_vv_u16m4(v_u0u1_row0, v_u0u1_row1, vl);
+    v_sum1 = __riscv_vadd_vv_u16m4(v_v0v1_row0, v_v0v1_row1, vl);
+    // Use round-to-nearest-up mode for vnclip
+    v_dst_u = __riscv_vnclipu_wx_u8m2(v_sum0, 2, vl);
+    v_dst_v = __riscv_vnclipu_wx_u8m2(v_sum1, 2, vl);
+
+    __riscv_vsseg2e8_v_u8m2(dst_uv, v_dst_u, v_dst_v, vl);
+
+    dst_uv += 2 * vl;
+    src_uv += 4 * vl;
+    w -= vl;
+    src_uv_row1 += 4 * vl;
+  } while (w > 0);
+}
+
+void ScaleUVRowDown4_RVV(const uint8_t* src_uv,
+                         ptrdiff_t src_stride,
+                         int src_stepx,
+                         uint8_t* dst_uv,
+                         int dst_width) {
+  // Overflow will never happen here, since sizeof(size_t)/sizeof(int)=2.
+  // dst_width = src_width / 4 and src_width is also int.
+  size_t w = (size_t)dst_width * 8;
+  (void)src_stride;
+  (void)src_stepx;
+  do {
+    size_t vl = __riscv_vsetvl_e8m8(w);
+    vuint8m8_t v_row = __riscv_vle8_v_u8m8(src_uv, vl);
+    vuint64m8_t v_row_64 = __riscv_vreinterpret_v_u8m8_u64m8(v_row);
+    // Narrowing without clipping
+    vuint32m4_t v_tmp = __riscv_vncvt_x_x_w_u32m4(v_row_64, vl / 8);
+    vuint16m2_t v_dst_16 = __riscv_vncvt_x_x_w_u16m2(v_tmp, vl / 8);
+    vuint8m2_t v_dst = __riscv_vreinterpret_v_u16m2_u8m2(v_dst_16);
+    __riscv_vse8_v_u8m2(dst_uv, v_dst, vl / 4);
+    w -= vl;
+    src_uv += vl;
+    dst_uv += vl / 4;
+  } while (w > 0);
+}
+
+void ScaleUVRowDownEven_RVV(const uint8_t* src_uv,
+                            ptrdiff_t src_stride,
+                            int src_stepx,
+                            uint8_t* dst_uv,
+                            int dst_width) {
+  size_t w = (size_t)dst_width;
+  const ptrdiff_t stride_byte = (ptrdiff_t)src_stepx * 2;
+  const uint16_t* src = (const uint16_t*)(src_uv);
+  uint16_t* dst = (uint16_t*)(dst_uv);
+  (void)src_stride;
+  do {
+    size_t vl = __riscv_vsetvl_e16m8(w);
+    vuint16m8_t v_row = __riscv_vlse16_v_u16m8(src, stride_byte, vl);
+    __riscv_vse16_v_u16m8(dst, v_row, vl);
+    w -= vl;
+    src += vl * src_stepx;
+    dst += vl;
+  } while (w > 0);
+}
+
+#ifdef __cplusplus
+}  // extern "C"
+}  // namespace libyuv
+#endif
+
+#endif  // !defined(LIBYUV_DISABLE_RVV) && defined(__riscv_vector)
diff --git a/libfenrir/src/main/jni/animation/libyuv/source/scale_uv.cc b/libfenrir/src/main/jni/animation/libyuv/source/scale_uv.cc
index 1556071d0..5246f8f6b 100644
--- a/libfenrir/src/main/jni/animation/libyuv/source/scale_uv.cc
+++ b/libfenrir/src/main/jni/animation/libyuv/source/scale_uv.cc
@@ -128,6 +128,15 @@ static void ScaleUVDown2(int src_width,
     }
   }
 #endif
+#if defined(HAS_SCALEUVROWDOWN2_RVV)
+  if (TestCpuFlag(kCpuHasRVV)) {
+    ScaleUVRowDown2 =
+        filtering == kFilterNone
+            ? ScaleUVRowDown2_RVV
+            : (filtering == kFilterLinear ? ScaleUVRowDown2Linear_RVV
+                                          : ScaleUVRowDown2Box_RVV);
+  }
+#endif
 
 // This code is not enabled.  Only box filter is available at this time.
 #if defined(HAS_SCALEUVROWDOWN2_SSSE3)
@@ -231,6 +240,11 @@ static void ScaleUVDown4Box(int src_width,
     }
   }
 #endif
+#if defined(HAS_SCALEUVROWDOWN2BOX_RVV)
+  if (TestCpuFlag(kCpuHasRVV)) {
+    ScaleUVRowDown2 = ScaleUVRowDown2Box_RVV;
+  }
+#endif
 
   for (j = 0; j < dst_height; ++j) {
     ScaleUVRowDown2(src_uv, src_stride, row, dst_width * 2);
@@ -310,6 +324,12 @@ static void ScaleUVDownEven(int src_width,
     }
   }
 #endif
+#if defined(HAS_SCALEUVROWDOWNEVEN_RVV)
+  if (TestCpuFlag(kCpuHasRVV) && !filtering) {
+    ScaleUVRowDownEven =
+        (col_step == 4) ? ScaleUVRowDown4_RVV : ScaleUVRowDownEven_RVV;
+  }
+#endif
 
   if (filtering == kFilterLinear) {
     src_stride = 0;
diff --git a/libfenrir/src/main/jni/thorvg/inc/thorvg.h b/libfenrir/src/main/jni/thorvg/inc/thorvg.h
index 0cfe7e243..6edd4ee1f 100644
--- a/libfenrir/src/main/jni/thorvg/inc/thorvg.h
+++ b/libfenrir/src/main/jni/thorvg/inc/thorvg.h
@@ -18,6 +18,7 @@
 #include <functional>
 #include <memory>
 #include <string>
+#include <list>
 
 #ifdef TVG_API
     #undef TVG_API
@@ -108,6 +109,7 @@ enum class Result
     Unknown                ///< The value returned in all other cases.
 };
 
+
 /**
  * @brief Enumeration specifying the values of the path commands accepted by TVG.
  *
@@ -122,6 +124,7 @@ enum class PathCommand
     CubicTo    ///< Draws a cubic Bezier curve from the current point to the given point using two given control points and sets a new value of the current point. This command expects 3 points: the 1st control-point, the 2nd control-point, the end-point of the curve.
 };
 
+
 /**
  * @brief Enumeration determining the ending type of a stroke in the open sub-paths.
  */
@@ -132,6 +135,7 @@ enum class StrokeCap
     Butt        ///< The stroke ends exactly at each of the two end-points of a sub-path. For zero length sub-paths no stroke is rendered.
 };
 
+
 /**
  * @brief Enumeration determining the style used at the corners of joined stroked path segments.
  */
@@ -142,6 +146,7 @@ enum class StrokeJoin
     Miter      ///< The outer corner of the joined path segments is spiked. The spike is created by extension beyond the join point of the outer edges of the stroke until they intersect. In case the extension goes beyond the limit, the join style is converted to the Bevel style.
 };
 
+
 /**
  * @brief Enumeration specifying how to fill the area outside the gradient bounds.
  */
@@ -152,6 +157,7 @@ enum class FillSpread
     Repeat   ///< The gradient pattern is repeated continuously beyond the gradient area until the expected region is filled.
 };
 
+
 /**
  * @brief Enumeration specifying the algorithm used to establish which parts of the shape are treated as the inside of the shape.
  */
@@ -165,27 +171,22 @@ enum class FillRule
 /**
  * @brief Enumeration indicating the method used in the composition of two objects - the target and the source.
  *
- * In the case of Mask composition, you need to perform bit operations on two options - Mask Alpha and Mask Operation.
- * Mask Alpha specifies the origin of the alpha channel, while Mask Operation specifies the masking operation.
- * @code paint->composite(tvg::CompositeMethod::AlphaMask + tvg::CompositeMethod::AddMaskOp); @endcode
+ * Notation: S(Source), T(Target), SA(Source Alpha), TA(Target Alpha)
  *
- * @note If you don't specify the mask alpha, @c AlphaMask will be used.
- * @note If you don't specify the mask method, @c AddMaskOp will be used.
- * @warning Composition does not support multiple choices for both Mask Alpha and Mask Operation.
  * @see Paint::composite()
  */
 enum class CompositeMethod
 {
     None = 0,           ///< No composition is applied.
     ClipPath,           ///< The intersection of the source and the target is determined and only the resulting pixels from the source are rendered.
-    AlphaMask,          ///< Mask Alpha: Use the compositing target's pixels as an alpha value.
-    InvAlphaMask,       ///< Mask Alpha: Use the complement to the compositing target's pixels as an alpha.
-    LumaMask,           ///< Mask Alpha: Use the grayscale (0.2125R + 0.7154G + 0.0721*B) of the compositing target's pixels. @since 0.9
-    InvLumaMask,        ///< Mask Alpha: Use the grayscale (0.2125R + 0.7154G + 0.0721*B) of the complement to the compositing target's pixels. @BETA_API
-    AddMask,            ///< Mask Operation: Combines the source and target pixels using Mask Alpha. @BETA_API
-    SubtractMask,       ///< Mask Operation: Subtracts the target color from the source color while considering their respective Mask Alpha. @BETA_API
-    IntersectMask,      ///< Mask Operation: Computes the result by taking the minimum value between the Mask Alpha and the target alpha and multiplies it with the source color. @BETA_API
-    DifferenceMask      ///< Mask Operation: Calculates the absolute difference between the source color and the target color multiplied by the complement of the Mask Alpha. @BETA_API
+    AlphaMask,          ///< Alpha Masking using the compositing target's pixels as an alpha value.
+    InvAlphaMask,       ///< Alpha Masking using the complement to the compositing target's pixels as an alpha value.
+    LumaMask,           ///< Alpha Masking using the grayscale (0.2125R + 0.7154G + 0.0721*B) of the compositing target's pixels. @since 0.9
+    InvLumaMask,        ///< Alpha Masking using the grayscale (0.2125R + 0.7154G + 0.0721*B) of the complement to the compositing target's pixels. @BETA_API
+    AddMask,            ///< Combines the target and source objects pixels using target alpha. (T * TA) + (S * (1 - TA)) @BETA_API
+    SubtractMask,       ///< Subtracts the source color from the target color while considering their respective target alpha. (T * TA) - (S * (1 - TA)) @BETA_API
+    IntersectMask,      ///< Computes the result by taking the minimum value between the target alpha and the source alpha and multiplies it with the target color. (T * min(TA, SA)) @BETA_API
+    DifferenceMask      ///< Calculates the absolute difference between the target color and the source color multiplied by the complement of the target alpha. abs(T - S * (1 - TA)) @BETA_API
 };
 
 
@@ -548,14 +549,25 @@ class TVG_API Canvas
      *
      * @return Result::Success when succeed.
      */
-    Result reserve(uint32_t n) noexcept;
+    TVG_DEPRECATED Result reserve(uint32_t n) noexcept;
+
+    /**
+     * @brief Returns the list of the paints that currently held by the Canvas.
+     *
+     * This function provides the list of paint nodes, allowing users a direct opportunity to modify the scene tree.
+     *
+     * @warning  Please avoid accessing the paints during Canvas update/draw. You can access them after calling sync().
+     * @see Canvas::sync()
+     *
+     * @BETA_API
+     */
+    std::list<Paint*>& paints() noexcept;
 
     /**
      * @brief Passes drawing elements to the Canvas using Paint objects.
      *
      * Only pushed paints in the canvas will be drawing targets.
      * They are retained by the canvas until you call Canvas::clear().
-     * If you know the number of the pushed objects in advance, please call Canvas::reserve().
      *
      * @param[in] paint A Paint object to be drawn.
      *
@@ -564,7 +576,7 @@ class TVG_API Canvas
      * @retval Result::InsufficientCondition An internal error.
      *
      * @note The rendering order of the paints is the same as the order as they were pushed into the canvas. Consider sorting the paints before pushing them if you intend to use layering.
-     * @see Canvas::reserve()
+     * @see Canvas::paints()
      * @see Canvas::clear()
      */
     virtual Result push(std::unique_ptr<Paint> paint) noexcept;
@@ -578,6 +590,8 @@ class TVG_API Canvas
      * @return Result::Success when succeed, Result::InsufficientCondition otherwise.
      *
      * @warning If you don't free the paints they become dangled. They are supposed to be reused, otherwise you are responsible for their lives. Thus please use the @p free argument only when you know how it works, otherwise it's not recommended.
+     * @see Canvas::push()
+     * @see Canvas::paints()
      */
     virtual Result clear(bool free = true) noexcept;
 
@@ -852,7 +866,7 @@ class TVG_API Shape final : public Paint
      *
      * @note For @p rx and @p ry greater than or equal to the half of @p w and the half of @p h, respectively, the shape become an ellipse.
      */
-    Result appendRect(float x, float y, float w, float h, float rx, float ry) noexcept;
+    Result appendRect(float x, float y, float w, float h, float rx = 0, float ry = 0) noexcept;
 
     /**
      * @brief Appends an ellipse to the path.
@@ -976,6 +990,18 @@ class TVG_API Shape final : public Paint
      */
     Result stroke(StrokeJoin join) noexcept;
 
+
+    /**
+     * @brief Sets the stroke miterlimit.
+     *
+     * @param[in] miterlimit The miterlimit imposes a limit on the extent of the stroke join, when the @c StrokeJoin::Miter join style is set. The default value is 4.
+     *
+     * @return Result::Success when succeed, Result::NonSupport unsupported value, Result::FailedAllocation otherwise.
+     * 
+     * @BETA_API
+     */
+    Result strokeMiterlimit(float miterlimit) noexcept;
+
     /**
      * @brief Sets the solid color for all of the figures from the path.
      *
@@ -1121,6 +1147,15 @@ class TVG_API Shape final : public Paint
      */
     StrokeJoin strokeJoin() const noexcept;
 
+    /**
+     * @brief Gets the stroke miterlimit.
+     *
+     * @return The stroke miterlimit value when succeed, 4 if no stroke was set.
+     *
+     * @BETA_API
+     */
+    float strokeMiterlimit() const noexcept;
+
     /**
      * @brief Creates a new Shape object.
      *
@@ -1329,14 +1364,14 @@ class TVG_API Scene final : public Paint
      *
      * Only the paints pushed into the scene will be the drawn targets.
      * The paints are retained by the scene until Scene::clear() is called.
-     * If you know the number of the pushed objects in advance, please call Scene::reserve().
      *
      * @param[in] paint A Paint object to be drawn.
      *
      * @return Result::Success when succeed, Result::MemoryCorruption otherwise.
      *
      * @note The rendering order of the paints is the same as the order as they were pushed. Consider sorting the paints before pushing them if you intend to use layering.
-     * @see Scene::reserve()
+     * @see Scene::paints()
+     * @see Scene::clear()
      */
     Result push(std::unique_ptr<Paint> paint) noexcept;
 
@@ -1350,7 +1385,21 @@ class TVG_API Scene final : public Paint
      *
      * @return Result::Success when succeed, Result::FailedAllocation otherwise.
      */
-    Result reserve(uint32_t size) noexcept;
+    TVG_DEPRECATED Result reserve(uint32_t size) noexcept;
+
+    /**
+     * @brief Returns the list of the paints that currently held by the Scene.
+     *
+     * This function provides the list of paint nodes, allowing users a direct opportunity to modify the scene tree.
+     *
+     * @warning  Please avoid accessing the paints during Scene update/draw. You can access them after calling Canvas::sync().
+     * @see Canvas::sync()
+     * @see Scene::push()
+     * @see Scene::clear()
+     *
+     * @BETA_API
+     */
+    std::list<Paint*>& paints() noexcept;
 
     /**
      * @brief Sets the total number of the paints pushed into the scene to be zero.
@@ -1698,17 +1747,6 @@ std::unique_ptr<T> cast(Fill* fill)
 }
 
 
-/**
- * @brief The operator() function is the OR function used to combine Mask Alpha & Mask Operation
- *
- * @BETA_API
- */
-constexpr CompositeMethod operator+(CompositeMethod a, CompositeMethod b)
-{
-    return CompositeMethod(int(a) | int(b));
-}
-
-
 /** @}*/
 
 } //namespace
diff --git a/libfenrir/src/main/jni/thorvg/src/lib/sw_engine/tvgSwCommon.h b/libfenrir/src/main/jni/thorvg/src/lib/sw_engine/tvgSwCommon.h
index 3cdaf965f..d0be44e24 100644
--- a/libfenrir/src/main/jni/thorvg/src/lib/sw_engine/tvgSwCommon.h
+++ b/libfenrir/src/main/jni/thorvg/src/lib/sw_engine/tvgSwCommon.h
@@ -180,6 +180,7 @@ struct SwStroke
     SwPoint ptStartSubPath;
     SwFixed subPathLineLength;
     SwFixed width;
+    float miterlimit;
 
     StrokeCap cap;
     StrokeJoin join;
diff --git a/libfenrir/src/main/jni/thorvg/src/lib/sw_engine/tvgSwRaster.cpp b/libfenrir/src/main/jni/thorvg/src/lib/sw_engine/tvgSwRaster.cpp
index e43bbf7d8..b8dc32466 100644
--- a/libfenrir/src/main/jni/thorvg/src/lib/sw_engine/tvgSwRaster.cpp
+++ b/libfenrir/src/main/jni/thorvg/src/lib/sw_engine/tvgSwRaster.cpp
@@ -259,7 +259,7 @@ static uint32_t _interpDownScaler(const uint32_t *img, uint32_t stride, uint32_t
 }
 
 
-void _rasterGrayscale8(uint8_t *dst, uint32_t val, uint32_t offset, int32_t len)
+void _rasterGrayscale8(uint8_t *dst, uint8_t val, uint32_t offset, int32_t len)
 {
     cRasterPixels(dst, val, offset, len);
 }
@@ -391,12 +391,11 @@ static bool _rasterSolidRect(SwSurface* surface, const SwBBox& region, uint8_t r
             rasterRGBA32(buffer + y * surface->stride, color, region.min.x, w);
         }
         return true;
-    //8bits grayscale
     }
+    //8bits grayscale
     if (surface->channelSize == sizeof(uint8_t)) {
-        auto buffer = surface->buf8 + (region.min.y * surface->stride);
         for (uint32_t y = 0; y < h; ++y) {
-            _rasterGrayscale8(buffer + y * surface->stride, 255, region.min.x, w);
+            _rasterGrayscale8(surface->buf8, 255, region.min.y * surface->stride + region.min.x, w);
         }
         return true;
     }
@@ -565,7 +564,7 @@ static bool _rasterSolidRle(SwSurface* surface, const SwRleData* rle, uint8_t r,
     //8bit grayscale
     } else if (surface->channelSize == sizeof(uint8_t)) {
         for (uint32_t i = 0; i < rle->size; ++i, ++span) {
-            _rasterGrayscale8(surface->buf8 + span->y * surface->stride, span->coverage, span->x, span->len);
+            _rasterGrayscale8(surface->buf8, span->coverage, span->y * surface->stride + span->x, span->len);
         }
     }
     return true;
@@ -1637,7 +1636,7 @@ void rasterRGBA32(uint32_t *dst, uint32_t val, uint32_t offset, int32_t len)
 #elif defined(THORVG_NEON_VECTOR_SUPPORT)
     neonRasterRGBA32(dst, val, offset, len);
 #else
-    cRasterPixels<uint32_t>(dst, val, offset, len);
+    cRasterPixels(dst, val, offset, len);
 #endif
 }
 
@@ -1672,24 +1671,22 @@ bool rasterClear(SwSurface* surface, uint32_t x, uint32_t y, uint32_t w, uint32_
     if (surface->channelSize == sizeof(uint32_t)) {
         //full clear
         if (w == surface->stride) {
-            rasterRGBA32(surface->buf32 + (surface->stride * y), 0x00000000, 0, w * h);
+            rasterRGBA32(surface->buf32, 0x00000000, surface->stride * y, w * h);
         //partial clear
         } else {
-            auto buffer = surface->buf32 + (surface->stride * y + x);
             for (uint32_t i = 0; i < h; i++) {
-                rasterRGBA32(buffer + (surface->stride * i), 0x00000000, 0, w);
+                rasterRGBA32(surface->buf32, 0x00000000, (surface->stride * y + x) + (surface->stride * i), w);
             }
         }
     //8 bits
     } else if (surface->channelSize == sizeof(uint8_t)) {
         //full clear
         if (w == surface->stride) {
-            _rasterGrayscale8(surface->buf8 + (surface->stride * y), 0x00, 0, w * h);
+            _rasterGrayscale8(surface->buf8, 0x00, surface->stride * y, w * h);
         //partial clear
         } else {
-            auto buffer = surface->buf8 + (surface->stride * y + x);
             for (uint32_t i = 0; i < h; i++) {
-                _rasterGrayscale8(buffer + (surface->stride * i), 0x00, 0, w);
+                _rasterGrayscale8(surface->buf8, 0x00, (surface->stride * y + x) + (surface->stride * i), w);
             }
         }
     }
diff --git a/libfenrir/src/main/jni/thorvg/src/lib/sw_engine/tvgSwRasterC.h b/libfenrir/src/main/jni/thorvg/src/lib/sw_engine/tvgSwRasterC.h
index a040269ff..a8c44d421 100644
--- a/libfenrir/src/main/jni/thorvg/src/lib/sw_engine/tvgSwRasterC.h
+++ b/libfenrir/src/main/jni/thorvg/src/lib/sw_engine/tvgSwRasterC.h
@@ -21,9 +21,43 @@
  */
 
 template<typename PIXEL_T>
-static void inline cRasterPixels(PIXEL_T* dst, uint32_t val, uint32_t offset, int32_t len)
+static void inline cRasterPixels(PIXEL_T* dst, PIXEL_T val, uint32_t offset, int32_t len)
 {
     dst += offset;
+
+    //fix the misaligned memory
+    auto alignOffset = 0;
+    if (sizeof(PIXEL_T) == 4) alignOffset = offset % 2;
+    else if (sizeof(PIXEL_T) == 1) {
+        alignOffset = offset % 8;
+        if (alignOffset > 0) alignOffset = 8 - alignOffset;
+    }
+
+    while (alignOffset > 0 && len > 0) {
+        *dst++ = val;
+        --len;
+        --alignOffset;
+    }
+
+    //64bits faster clear
+    if ((sizeof(PIXEL_T) == 4)) {
+        auto val64 = (uint64_t(val) << 32) | uint64_t(val);
+        while (len > 1) {
+            *reinterpret_cast<uint64_t*>(dst) = val64;
+            len -= 2;
+            dst += 2;
+        }
+    } else if (sizeof(PIXEL_T) == 1) {
+        auto val32 = (uint32_t(val) << 24) | (uint32_t(val) << 16) | (uint32_t(val) << 8) | uint32_t(val);
+        auto val64 = (uint64_t(val32) << 32) | val32;
+        while (len > 7) {
+            *reinterpret_cast<uint64_t*>(dst) = val64;
+            len -= 8;
+            dst += 8;
+        }
+    }
+
+    //leftovers
     while (len--) *dst++ = val;
 }
 
@@ -97,13 +131,27 @@ static bool inline cRasterABGRtoARGB(Surface* surface)
 {
     TVGLOG("SW_ENGINE", "Convert ColorSpace ABGR - ARGB [Size: %d x %d]", surface->w, surface->h);
 
-    auto buffer = surface->buf32;
-    for (uint32_t y = 0; y < surface->h; ++y, buffer += surface->stride) {
-        auto dst = buffer;
-        for (uint32_t x = 0; x < surface->w; ++x, ++dst) {
-            auto c = *dst;
-            //flip Blue, Red channels
-            *dst = (c & 0xff000000) + ((c & 0x00ff0000) >> 16) + (c & 0x0000ff00) + ((c & 0x000000ff) << 16);
+    //64bits faster converting
+    if (surface->w % 2 == 0) {
+        auto buffer = reinterpret_cast<uint64_t*>(surface->buf32);
+        for (uint32_t y = 0; y < surface->h; ++y, buffer += surface->stride / 2) {
+            auto dst = buffer;
+            for (uint32_t x = 0; x < surface->w / 2; ++x, ++dst) {
+                auto c = *dst;
+                //flip Blue, Red channels
+                *dst = (c & 0xff000000ff000000) + ((c & 0x00ff000000ff0000) >> 16) + (c & 0x0000ff000000ff00) + ((c & 0x000000ff000000ff) << 16);
+            }
+        }
+    //default converting
+    } else {
+        auto buffer = surface->buf32;
+        for (uint32_t y = 0; y < surface->h; ++y, buffer += surface->stride) {
+            auto dst = buffer;
+            for (uint32_t x = 0; x < surface->w; ++x, ++dst) {
+                auto c = *dst;
+                //flip Blue, Red channels
+                *dst = (c & 0xff000000) + ((c & 0x00ff0000) >> 16) + (c & 0x0000ff00) + ((c & 0x000000ff) << 16);
+            }
         }
     }
     return true;
diff --git a/libfenrir/src/main/jni/thorvg/src/lib/sw_engine/tvgSwStroke.cpp b/libfenrir/src/main/jni/thorvg/src/lib/sw_engine/tvgSwStroke.cpp
index 2f41d5f02..c1584b5e0 100644
--- a/libfenrir/src/main/jni/thorvg/src/lib/sw_engine/tvgSwStroke.cpp
+++ b/libfenrir/src/main/jni/thorvg/src/lib/sw_engine/tvgSwStroke.cpp
@@ -233,8 +233,6 @@ static void _arcTo(SwStroke& stroke, int32_t side)
 
 static void _outside(SwStroke& stroke, int32_t side, SwFixed lineLength)
 {
-    constexpr SwFixed MITER_LIMIT = 4 * (1 << 16);
-
     auto border = stroke.borders + side;
 
     if (stroke.join == StrokeJoin::Round) {
@@ -257,7 +255,7 @@ static void _outside(SwStroke& stroke, int32_t side, SwFixed lineLength)
             }
 
             thcos = mathCos(theta);
-            auto sigma = mathMultiply(MITER_LIMIT, thcos);
+            auto sigma = mathMultiply(stroke.miterlimit, thcos);
 
             //is miter limit exceeded?
             if (sigma < 0x10000L) bevel = true;
@@ -844,6 +842,7 @@ void strokeReset(SwStroke* stroke, const RenderShape* rshape, const Matrix* tran
 
     stroke->width = HALF_STROKE(rshape->strokeWidth());
     stroke->cap = rshape->strokeCap();
+    stroke->miterlimit = rshape->strokeMiterlimit() * (1 << 16);
 
     //Save line join: it can be temporarily changed when stroking curves...
     stroke->joinSaved = stroke->join = rshape->strokeJoin();
diff --git a/libfenrir/src/main/jni/thorvg/src/lib/tvgBinaryDesc.h b/libfenrir/src/main/jni/thorvg/src/lib/tvgBinaryDesc.h
index 3b44db282..eb677d4f1 100644
--- a/libfenrir/src/main/jni/thorvg/src/lib/tvgBinaryDesc.h
+++ b/libfenrir/src/main/jni/thorvg/src/lib/tvgBinaryDesc.h
@@ -26,9 +26,6 @@
 /* TODO: Need to consider whether uin8_t is enough size for extension...
    Rather than optimal data, we can use enough size and data compress? */
 
-/* Data types, do not change data types once Tvg Format is officially released,
-   That would occur the abi break. */
-
 using TvgBinByte = uint8_t;
 using TvgBinCounter = uint32_t;
 using TvgBinTag = TvgBinByte;
@@ -39,7 +36,7 @@ using TvgBinFlag = TvgBinByte;
 #define TVG_HEADER_SIZE 33                //TVG_HEADER_SIGNATURE_LENGTH + TVG_HEADER_VERSION_LENGTH + 2*SIZE(float) + TVG_HEADER_RESERVED_LENGTH + TVG_HEADER_COMPRESS_SIZE
 #define TVG_HEADER_SIGNATURE "ThorVG"
 #define TVG_HEADER_SIGNATURE_LENGTH 6
-#define TVG_HEADER_VERSION "000400"       //Major 00, Minor 04, Micro 00
+#define TVG_HEADER_VERSION "001000"       //Major 00, Minor 10, Micro 00
 #define TVG_HEADER_VERSION_LENGTH 6
 #define TVG_HEADER_RESERVED_LENGTH 1      //Storing flags for extensions
 #define TVG_HEADER_COMPRESS_SIZE 12       //TVG_HEADER_UNCOMPRESSED_SIZE + TVG_HEADER_COMPRESSED_SIZE + TVG_HEADER_COMPRESSED_SIZE_BITS
@@ -63,8 +60,9 @@ using TvgBinFlag = TvgBinByte;
 #define TVG_TAG_PAINT_CMP_METHOD                    (TvgBinTag)0x20
 
 
+//TODO: Keep this for the compatibility, Remove in TVG 1.0 release
 //Scene
-#define TVG_TAG_SCENE_RESERVEDCNT                   (TvgBinTag)0x30
+ #define TVG_TAG_SCENE_RESERVEDCNT                   (TvgBinTag)0x30
 
 
 //Shape
@@ -73,14 +71,16 @@ using TvgBinFlag = TvgBinByte;
 #define TVG_TAG_SHAPE_FILL                          (TvgBinTag)0x42
 #define TVG_TAG_SHAPE_COLOR                         (TvgBinTag)0x43
 #define TVG_TAG_SHAPE_FILLRULE                      (TvgBinTag)0x44
-#define TVG_TAG_SHAPE_STROKE_CAP                    (TvgBinTag)0x50
-#define TVG_TAG_SHAPE_STROKE_JOIN                   (TvgBinTag)0x51
+
 
 //Stroke
+#define TVG_TAG_SHAPE_STROKE_CAP                    (TvgBinTag)0x50
+#define TVG_TAG_SHAPE_STROKE_JOIN                   (TvgBinTag)0x51
 #define TVG_TAG_SHAPE_STROKE_WIDTH                  (TvgBinTag)0x52
 #define TVG_TAG_SHAPE_STROKE_COLOR                  (TvgBinTag)0x53
 #define TVG_TAG_SHAPE_STROKE_FILL                   (TvgBinTag)0x54
 #define TVG_TAG_SHAPE_STROKE_DASHPTRN               (TvgBinTag)0x55
+#define TVG_TAG_SHAPE_STROKE_MITERLIMIT             (TvgBinTag)0x56
 
 
 //Fill
diff --git a/libfenrir/src/main/jni/thorvg/src/lib/tvgCanvas.cpp b/libfenrir/src/main/jni/thorvg/src/lib/tvgCanvas.cpp
index 7e17802d2..1dee37032 100644
--- a/libfenrir/src/main/jni/thorvg/src/lib/tvgCanvas.cpp
+++ b/libfenrir/src/main/jni/thorvg/src/lib/tvgCanvas.cpp
@@ -37,10 +37,15 @@ Canvas::~Canvas()
 }
 
 
-Result Canvas::reserve(uint32_t n) noexcept
+Result Canvas::reserve(TVG_UNUSED uint32_t n) noexcept
 {
-    if (!pImpl->paints.reserve(n)) return Result::FailedAllocation;
-    return Result::Success;
+    return Result::NonSupport;
+}
+
+
+list<Paint*>& Canvas::paints() noexcept
+{
+    return pImpl->paints;
 }
 
 
diff --git a/libfenrir/src/main/jni/thorvg/src/lib/tvgCanvasImpl.h b/libfenrir/src/main/jni/thorvg/src/lib/tvgCanvasImpl.h
index 6f5760f53..0a38e05db 100644
--- a/libfenrir/src/main/jni/thorvg/src/lib/tvgCanvasImpl.h
+++ b/libfenrir/src/main/jni/thorvg/src/lib/tvgCanvasImpl.h
@@ -31,7 +31,7 @@
 
 struct Canvas::Impl
 {
-    Array<Paint*> paints;
+    list<Paint*> paints;
     RenderMethod* renderer;
     bool refresh = false;   //if all paints should be updated by force.
     bool drawing = false;   //on drawing condition?
@@ -53,7 +53,7 @@ struct Canvas::Impl
 
         auto p = paint.release();
         if (!p) return Result::MemoryCorruption;
-        paints.push(p);
+        paints.push_back(p);
 
         return update(p, true);
     }
@@ -64,9 +64,9 @@ struct Canvas::Impl
         if (!renderer || !renderer->clear()) return Result::InsufficientCondition;
 
         //Free paints
-        for (auto paint = paints.data; paint < (paints.data + paints.count); ++paint) {
-            (*paint)->pImpl->dispose(*renderer);
-            if (free) delete(*paint);
+        for (auto paint : paints) {
+            paint->pImpl->dispose(*renderer);
+            if (free) delete(paint);
         }
 
         paints.clear();
@@ -83,7 +83,7 @@ struct Canvas::Impl
 
     Result update(Paint* paint, bool force)
     {
-        if (paints.count == 0 || drawing || !renderer) return Result::InsufficientCondition;
+        if (paints.empty() || drawing || !renderer) return Result::InsufficientCondition;
 
         Array<RenderData> clips;
         auto flag = RenderUpdateFlag::None;
@@ -92,8 +92,8 @@ struct Canvas::Impl
         //Update single paint node
         if (paint) {
             //Optimize Me: Can we skip the searching?
-            for (auto paint2 = paints.data; paint2 < (paints.data + paints.count); ++paint2) {
-                if ((*paint2) == paint) {
+            for (auto paint2 : paints) {
+                if (paint2 == paint) {
                     paint->pImpl->update(*renderer, nullptr, 255, clips, flag);
                     return Result::Success;
                 }
@@ -101,8 +101,8 @@ struct Canvas::Impl
             return Result::InvalidArguments;
         //Update all retained paint nodes
         } else {
-            for (auto paint = paints.data; paint < (paints.data + paints.count); ++paint) {
-                (*paint)->pImpl->update(*renderer, nullptr, 255, clips, flag);
+            for (auto paint : paints) {
+                paint->pImpl->update(*renderer, nullptr, 255, clips, flag);
             }
         }
 
@@ -113,11 +113,11 @@ struct Canvas::Impl
 
     Result draw()
     {
-        if (drawing || paints.count == 0 || !renderer || !renderer->preRender()) return Result::InsufficientCondition;
+        if (drawing || paints.empty() || !renderer || !renderer->preRender()) return Result::InsufficientCondition;
 
         bool rendered = false;
-        for (auto paint = paints.data; paint < (paints.data + paints.count); ++paint) {
-            if ((*paint)->pImpl->render(*renderer)) rendered = true;
+        for (auto paint : paints) {
+            if (paint->pImpl->render(*renderer)) rendered = true;
         }
 
         if (!rendered || !renderer->postRender()) return Result::InsufficientCondition;
diff --git a/libfenrir/src/main/jni/thorvg/src/lib/tvgCommon.h b/libfenrir/src/main/jni/thorvg/src/lib/tvgCommon.h
index 1731647c0..3800c0552 100644
--- a/libfenrir/src/main/jni/thorvg/src/lib/tvgCommon.h
+++ b/libfenrir/src/main/jni/thorvg/src/lib/tvgCommon.h
@@ -62,7 +62,7 @@ using namespace tvg;
 #define TVG_CLASS_ID_LINEAR    4
 #define TVG_CLASS_ID_RADIAL    5
 
-enum class FileType { Tvg = 0, Svg, Raw, Png, Jpg, Unknown };
+enum class FileType { Tvg = 0, Svg, Raw, Png, Jpg, Webp, Unknown };
 
 #ifdef THORVG_LOG_ENABLED
     constexpr auto ErrorColor = "\033[31m";  //red
diff --git a/libfenrir/src/main/jni/thorvg/src/lib/tvgFill.h b/libfenrir/src/main/jni/thorvg/src/lib/tvgFill.h
index e90991c9d..c8fdadce8 100644
--- a/libfenrir/src/main/jni/thorvg/src/lib/tvgFill.h
+++ b/libfenrir/src/main/jni/thorvg/src/lib/tvgFill.h
@@ -55,7 +55,7 @@ struct Fill::Impl
     uint32_t cnt = 0;
     FillSpread spread;
     DuplicateMethod<Fill>* dup = nullptr;
-    uint32_t id;
+    uint8_t id;
 
     ~Impl()
     {
diff --git a/libfenrir/src/main/jni/thorvg/src/lib/tvgLoader.cpp b/libfenrir/src/main/jni/thorvg/src/lib/tvgLoader.cpp
index 2bbe17784..4e6f7c3e8 100644
--- a/libfenrir/src/main/jni/thorvg/src/lib/tvgLoader.cpp
+++ b/libfenrir/src/main/jni/thorvg/src/lib/tvgLoader.cpp
@@ -38,6 +38,10 @@
     #include "tvgJpgLoader.h"
 #endif
 
+#ifdef THORVG_WEBP_LOADER_SUPPORT
+    #include "tvgWebpLoader.h"
+#endif
+
 #include "tvgRawLoader.h"
 
 /************************************************************************/
@@ -72,6 +76,12 @@ static LoadModule* _find(FileType type)
         case FileType::Jpg: {
 #ifdef THORVG_JPG_LOADER_SUPPORT
             return new JpgLoader;
+#endif
+            break;
+        }
+        case FileType::Webp: {
+#ifdef THORVG_WEBP_LOADER_SUPPORT
+            return new WebpLoader;
 #endif
             break;
         }
@@ -103,6 +113,10 @@ static LoadModule* _find(FileType type)
             format = "JPG";
             break;
         }
+        case FileType::Webp: {
+            format = "WEBP";
+            break;
+        }
         default: {
             format = "???";
             break;
@@ -121,6 +135,7 @@ static LoadModule* _findByPath(const string& path)
     if (!ext.compare("svg")) return _find(FileType::Svg);
     if (!ext.compare("png")) return _find(FileType::Png);
     if (!ext.compare("jpg")) return _find(FileType::Jpg);
+    if (!ext.compare("webp")) return _find(FileType::Webp);
     return nullptr;
 }
 
@@ -136,6 +151,7 @@ static LoadModule* _findByType(const string& mimeType)
     else if (mimeType == "raw") type = FileType::Raw;
     else if (mimeType == "png") type = FileType::Png;
     else if (mimeType == "jpg" || mimeType == "jpeg") type = FileType::Jpg;
+    else if (mimeType == "webp") type = FileType::Webp;
     else {
         TVGLOG("LOADER", "Given mimetype is unknown = \"%s\".", mimeType.c_str());
         return nullptr;
diff --git a/libfenrir/src/main/jni/thorvg/src/lib/tvgPaint.cpp b/libfenrir/src/main/jni/thorvg/src/lib/tvgPaint.cpp
index a2685b338..3abc68d9a 100644
--- a/libfenrir/src/main/jni/thorvg/src/lib/tvgPaint.cpp
+++ b/libfenrir/src/main/jni/thorvg/src/lib/tvgPaint.cpp
@@ -184,7 +184,7 @@ bool Paint::Impl::render(RenderMethod& renderer)
 }
 
 
-RenderData Paint::Impl::update(RenderMethod& renderer, const RenderTransform* pTransform, uint32_t opacity, Array<RenderData>& clips, uint32_t pFlag, bool clipper)
+RenderData Paint::Impl::update(RenderMethod& renderer, const RenderTransform* pTransform, uint32_t opacity, Array<RenderData>& clips, RenderUpdateFlag pFlag, bool clipper)
 {
     if (renderFlag & RenderUpdateFlag::Transform) {
         if (!rTransform) return nullptr;
diff --git a/libfenrir/src/main/jni/thorvg/src/lib/tvgPaint.h b/libfenrir/src/main/jni/thorvg/src/lib/tvgPaint.h
index d70490c64..c26d261b7 100644
--- a/libfenrir/src/main/jni/thorvg/src/lib/tvgPaint.h
+++ b/libfenrir/src/main/jni/thorvg/src/lib/tvgPaint.h
@@ -28,7 +28,7 @@
 
 namespace tvg
 {
-    enum ContextFlag {Invalid = 0, FastTrack = 1};
+    enum ContextFlag : uint8_t {Invalid = 0, FastTrack = 1};
 
     struct Iterator
     {
@@ -63,9 +63,9 @@ namespace tvg
         StrategyMethod* smethod = nullptr;
         RenderTransform* rTransform = nullptr;
         Composite* compData = nullptr;
-        uint32_t renderFlag = RenderUpdateFlag::None;
-        uint32_t ctxFlag = ContextFlag::Invalid;
-        uint32_t id;
+        uint8_t renderFlag = RenderUpdateFlag::None;
+        uint8_t ctxFlag = ContextFlag::Invalid;
+        uint8_t id;
         uint8_t opacity = 255;
 
         ~Impl()
@@ -147,7 +147,7 @@ namespace tvg
         bool scale(float factor);
         bool translate(float x, float y);
         bool bounds(float* x, float* y, float* w, float* h, bool transformed);
-        RenderData update(RenderMethod& renderer, const RenderTransform* pTransform, uint32_t opacity, Array<RenderData>& clips, uint32_t pFlag, bool clipper = false);
+        RenderData update(RenderMethod& renderer, const RenderTransform* pTransform, uint32_t opacity, Array<RenderData>& clips, RenderUpdateFlag pFlag, bool clipper = false);
         bool render(RenderMethod& renderer);
         Paint* duplicate();
     };
diff --git a/libfenrir/src/main/jni/thorvg/src/lib/tvgPictureImpl.h b/libfenrir/src/main/jni/thorvg/src/lib/tvgPictureImpl.h
index f724f3d5c..b5e212413 100644
--- a/libfenrir/src/main/jni/thorvg/src/lib/tvgPictureImpl.h
+++ b/libfenrir/src/main/jni/thorvg/src/lib/tvgPictureImpl.h
@@ -91,7 +91,7 @@ struct Picture::Impl
         return ret;
     }
 
-    uint32_t load()
+    RenderUpdateFlag load()
     {
         if (loader) {
             if (!paint) {
diff --git a/libfenrir/src/main/jni/thorvg/src/lib/tvgRender.h b/libfenrir/src/main/jni/thorvg/src/lib/tvgRender.h
index 62be27df9..10d1ce08d 100644
--- a/libfenrir/src/main/jni/thorvg/src/lib/tvgRender.h
+++ b/libfenrir/src/main/jni/thorvg/src/lib/tvgRender.h
@@ -32,7 +32,7 @@ namespace tvg
 using RenderData = void*;
 using pixel_t = uint32_t;
 
-enum RenderUpdateFlag {None = 0, Path = 1, Color = 2, Gradient = 4, Stroke = 8, Transform = 16, Image = 32, GradientStroke = 64, All = 255};
+enum RenderUpdateFlag : uint8_t {None = 0, Path = 1, Color = 2, Gradient = 4, Stroke = 8, Transform = 16, Image = 32, GradientStroke = 64, All = 255};
 
 struct Surface;
 
@@ -139,6 +139,7 @@ struct RenderStroke
     uint32_t dashCnt = 0;
     StrokeCap cap = StrokeCap::Square;
     StrokeJoin join = StrokeJoin::Bevel;
+    float miterlimit = 4.0f;
     bool strokeFirst = false;
 
     ~RenderStroke()
@@ -225,6 +226,13 @@ struct RenderShape
         if (!stroke) return StrokeJoin::Bevel;
         return stroke->join;
     }
+
+    float strokeMiterlimit() const
+    {
+        if (!stroke) return 4.0f;
+
+        return stroke->miterlimit;;
+    }
 };
 
 class RenderMethod
diff --git a/libfenrir/src/main/jni/thorvg/src/lib/tvgScene.cpp b/libfenrir/src/main/jni/thorvg/src/lib/tvgScene.cpp
index feb45a9d2..9fd2ad706 100644
--- a/libfenrir/src/main/jni/thorvg/src/lib/tvgScene.cpp
+++ b/libfenrir/src/main/jni/thorvg/src/lib/tvgScene.cpp
@@ -55,17 +55,15 @@ Result Scene::push(unique_ptr<Paint> paint) noexcept
 {
     auto p = paint.release();
     if (!p) return Result::MemoryCorruption;
-    pImpl->paints.push(p);
+    pImpl->paints.push_back(p);
 
     return Result::Success;
 }
 
 
-Result Scene::reserve(uint32_t size) noexcept
+Result Scene::reserve(TVG_UNUSED uint32_t size) noexcept
 {
-    if (!pImpl->paints.reserve(size)) return Result::FailedAllocation;
-
-    return Result::Success;
+    return Result::NonSupport;
 }
 
 
@@ -75,3 +73,9 @@ Result Scene::clear(bool free) noexcept
 
     return Result::Success;
 }
+
+
+list<Paint*>& Scene::paints() noexcept
+{
+    return pImpl->paints;
+}
\ No newline at end of file
diff --git a/libfenrir/src/main/jni/thorvg/src/lib/tvgSceneImpl.h b/libfenrir/src/main/jni/thorvg/src/lib/tvgSceneImpl.h
index 504cee4df..ecff5161c 100644
--- a/libfenrir/src/main/jni/thorvg/src/lib/tvgSceneImpl.h
+++ b/libfenrir/src/main/jni/thorvg/src/lib/tvgSceneImpl.h
@@ -32,33 +32,36 @@
 
 struct SceneIterator : Iterator
 {
-    Array<Paint*>* paints;
-    uint32_t idx = 0;
+    list<Paint*>* paints;
+    list<Paint*>::iterator itr;
 
-    SceneIterator(Array<Paint*>* p) : paints(p)
+    SceneIterator(list<Paint*>* p) : paints(p)
     {
+        begin();
     }
 
     const Paint* next() override
     {
-        if (idx >= paints->count) return nullptr;
-        return paints->data[idx++];
+        if (itr == paints->end()) return nullptr;
+        auto paint = *itr;
+        ++itr;
+        return paint;
     }
 
     uint32_t count() override
     {
-        return paints->count;
+       return paints->size();
     }
 
     void begin() override
     {
-        idx = 0;
+        itr = paints->begin();
     }
 };
 
 struct Scene::Impl
 {
-    Array<Paint*> paints;
+    list<Paint*> paints;
     RenderMethod* renderer = nullptr;    //keep it for explicit clear
     RenderData rd = nullptr;
     Scene* scene = nullptr;
@@ -71,15 +74,15 @@ struct Scene::Impl
 
     ~Impl()
     {
-        for (auto paint = paints.data; paint < (paints.data + paints.count); ++paint) {
-            delete(*paint);
+        for (auto paint : paints) {
+            delete(paint);
         }
     }
 
     bool dispose(RenderMethod& renderer)
     {
-        for (auto paint = paints.data; paint < (paints.data + paints.count); ++paint) {
-            (*paint)->pImpl->dispose(renderer);
+        for (auto paint : paints) {
+            paint->pImpl->dispose(renderer);
         }
 
         auto ret = renderer.dispose(rd);
@@ -91,7 +94,7 @@ struct Scene::Impl
 
     bool needComposition(uint32_t opacity)
     {
-        if (opacity == 0 || paints.count == 0) return false;
+        if (opacity == 0 || paints.empty()) return false;
 
         //Masking may require composition (even if opacity == 255)
         auto compMethod = scene->composite(nullptr);
@@ -103,7 +106,7 @@ struct Scene::Impl
         //If scene has several children or only scene, it may require composition.
         //OPTIMIZE: the bitmap type of the picture would not need the composition.
         //OPTIMIZE: a single paint of a scene would not need the composition.
-        if (paints.count == 1 && (*paints.data)->identifier() == TVG_CLASS_ID_SHAPE) return false;
+        if (paints.size() == 1 && paints.front()->identifier() == TVG_CLASS_ID_SHAPE) return false;
 
         return true;
     }
@@ -121,15 +124,15 @@ struct Scene::Impl
 
         if (clipper) {
             Array<RenderData> rds;
-            rds.reserve(paints.count);
-            for (auto paint = paints.data; paint < (paints.data + paints.count); ++paint) {
-                rds.push((*paint)->pImpl->update(renderer, transform, opacity, clips, flag, true));
+            rds.reserve(paints.size());
+            for (auto paint : paints) {
+                rds.push(paint->pImpl->update(renderer, transform, opacity, clips, flag, true));
             }
             rd = renderer.prepare(rds, rd, transform, opacity, clips, flag);
             return rd;
         } else {
-            for (auto paint = paints.data; paint < (paints.data + paints.count); ++paint) {
-                (*paint)->pImpl->update(renderer, transform, opacity, clips, flag, false);
+            for (auto paint : paints) {
+                paint->pImpl->update(renderer, transform, opacity, clips, flag, false);
             }
             return nullptr;
         }
@@ -144,8 +147,8 @@ struct Scene::Impl
             renderer.beginComposite(cmp, CompositeMethod::None, opacity);
         }
 
-        for (auto paint = paints.data; paint < (paints.data + paints.count); ++paint) {
-            if (!(*paint)->pImpl->render(renderer)) return false;
+        for (auto paint : paints) {
+            if (!paint->pImpl->render(renderer)) return false;
         }
 
         if (cmp) renderer.endComposite(cmp);
@@ -155,15 +158,15 @@ struct Scene::Impl
 
     RenderRegion bounds(RenderMethod& renderer) const
     {
-        if (paints.count == 0) return {0, 0, 0, 0};
+        if (paints.empty()) return {0, 0, 0, 0};
 
         int32_t x1 = INT32_MAX;
         int32_t y1 = INT32_MAX;
         int32_t x2 = 0;
         int32_t y2 = 0;
 
-        for (auto paint = paints.data; paint < (paints.data + paints.count); ++paint) {
-            auto region = (*paint)->pImpl->bounds(renderer);
+        for (auto paint : paints) {
+            auto region = paint->pImpl->bounds(renderer);
 
             //Merge regions
             if (region.x < x1) x1 = region.x;
@@ -177,20 +180,20 @@ struct Scene::Impl
 
     bool bounds(float* px, float* py, float* pw, float* ph)
     {
-        if (paints.count == 0) return false;
+        if (paints.empty()) return false;
 
         auto x1 = FLT_MAX;
         auto y1 = FLT_MAX;
         auto x2 = -FLT_MAX;
         auto y2 = -FLT_MAX;
 
-        for (auto paint = paints.data; paint < (paints.data + paints.count); ++paint) {
+        for (auto paint : paints) {
             auto x = FLT_MAX;
             auto y = FLT_MAX;
             auto w = 0.0f;
             auto h = 0.0f;
 
-            if ((*paint)->bounds(&x, &y, &w, &h, true) != tvg::Result::Success) continue;
+            if (paint->bounds(&x, &y, &w, &h, true) != tvg::Result::Success) continue;
 
             //Merge regions
             if (x < x1) x1 = x;
@@ -213,10 +216,8 @@ struct Scene::Impl
 
         auto dup = ret.get()->pImpl;
 
-        dup->paints.reserve(paints.count);
-
-        for (auto paint = paints.data; paint < (paints.data + paints.count); ++paint) {
-            dup->paints.push((*paint)->duplicate());
+        for (auto paint : paints) {
+            dup->paints.push_back(paint->duplicate());
         }
 
         return ret.release();
@@ -226,9 +227,9 @@ struct Scene::Impl
     {
         auto dispose = renderer ? true : false;
 
-        for (auto paint = paints.data; paint < (paints.data + paints.count); ++paint) {
-            if (dispose) (*paint)->pImpl->dispose(*renderer);
-            if (free) delete(*paint);
+        for (auto paint : paints) {
+            if (dispose) paint->pImpl->dispose(*renderer);
+            if (free) delete(paint);
         }
         paints.clear();
         renderer = nullptr;
diff --git a/libfenrir/src/main/jni/thorvg/src/lib/tvgShape.cpp b/libfenrir/src/main/jni/thorvg/src/lib/tvgShape.cpp
index 76a945258..251a9d26a 100644
--- a/libfenrir/src/main/jni/thorvg/src/lib/tvgShape.cpp
+++ b/libfenrir/src/main/jni/thorvg/src/lib/tvgShape.cpp
@@ -373,6 +373,17 @@ Result Shape::stroke(StrokeJoin join) noexcept
     return Result::Success;
 }
 
+Result Shape::strokeMiterlimit(float miterlimit) noexcept
+{
+    // https://www.w3.org/TR/SVG2/painting.html#LineJoin
+    // - A negative value for stroke-miterlimit must be treated as an illegal value.
+    if (miterlimit < 0.0f) return Result::NonSupport;
+    // TODO Find out a reasonable max value.
+    if (!pImpl->strokeMiterlimit(miterlimit)) return Result::FailedAllocation;
+
+    return Result::Success;
+}
+
 
 StrokeCap Shape::strokeCap() const noexcept
 {
@@ -385,6 +396,11 @@ StrokeJoin Shape::strokeJoin() const noexcept
     return pImpl->rs.strokeJoin();
 }
 
+float Shape::strokeMiterlimit() const noexcept
+{
+    return pImpl->rs.strokeMiterlimit();
+}
+
 
 Result Shape::fill(FillRule r) noexcept
 {
diff --git a/libfenrir/src/main/jni/thorvg/src/lib/tvgShapeImpl.h b/libfenrir/src/main/jni/thorvg/src/lib/tvgShapeImpl.h
index d2ec201e8..86ec73cf1 100644
--- a/libfenrir/src/main/jni/thorvg/src/lib/tvgShapeImpl.h
+++ b/libfenrir/src/main/jni/thorvg/src/lib/tvgShapeImpl.h
@@ -34,8 +34,8 @@ struct Shape::Impl
 {
     RenderShape rs;                     //shape data
     RenderData rd = nullptr;            //engine data
-    uint32_t flag = RenderUpdateFlag::None;
     Shape* shape;
+    uint8_t flag = RenderUpdateFlag::None;
     uint8_t opacity;                    //for composition
     bool needComp;                      //composite or not
 
@@ -245,6 +245,15 @@ struct Shape::Impl
         return true;
     }
 
+    bool strokeMiterlimit(float miterlimit)
+    {
+        if (!rs.stroke) rs.stroke = new RenderStroke();
+        rs.stroke->miterlimit = miterlimit;
+        flag |= RenderUpdateFlag::Stroke;
+
+        return true;
+    }
+
     bool strokeColor(uint8_t r, uint8_t g, uint8_t b, uint8_t a)
     {
         if (!rs.stroke) rs.stroke = new RenderStroke();
diff --git a/libfenrir/src/main/jni/thorvg/src/lib/tvgSwCanvas.cpp b/libfenrir/src/main/jni/thorvg/src/lib/tvgSwCanvas.cpp
index 626bd51a2..7e6bc40c5 100644
--- a/libfenrir/src/main/jni/thorvg/src/lib/tvgSwCanvas.cpp
+++ b/libfenrir/src/main/jni/thorvg/src/lib/tvgSwCanvas.cpp
@@ -67,7 +67,7 @@ Result SwCanvas::mempool(MempoolPolicy policy) noexcept
     if (!renderer) return Result::MemoryCorruption;
 
     //It can't change the policy during the running.
-    if (Canvas::pImpl->paints.count > 0) return Result::InsufficientCondition;
+    if (!Canvas::pImpl->paints.empty()) return Result::InsufficientCondition;
 
     if (policy == MempoolPolicy::Individual) renderer->mempool(false);
     else renderer->mempool(true);
diff --git a/libfenrir/src/main/jni/thorvg/src/loaders/svg/tvgSvgLoader.cpp b/libfenrir/src/main/jni/thorvg/src/loaders/svg/tvgSvgLoader.cpp
index b77b47f44..4c76c4eb5 100644
--- a/libfenrir/src/main/jni/thorvg/src/loaders/svg/tvgSvgLoader.cpp
+++ b/libfenrir/src/main/jni/thorvg/src/loaders/svg/tvgSvgLoader.cpp
@@ -986,6 +986,22 @@ static void _handleStrokeLineJoinAttr(TVG_UNUSED SvgLoaderData* loader, SvgNode*
     node->style->stroke.join = _toLineJoin(value);
 }
 
+static void _handleStrokeMiterlimitAttr(SvgLoaderData* loader, SvgNode* node, const char* value)
+{
+    char* end = nullptr;
+    const float miterlimit = svgUtilStrtof(value, &end);
+
+    // https://www.w3.org/TR/SVG2/painting.html#LineJoin
+    // - A negative value for stroke-miterlimit must be treated as an illegal value.
+    if (miterlimit < 0.0f) {
+        TVGERR("SVG", "A stroke-miterlimit change (%f <- %f) with a negative value is omitted.",
+            node->style->stroke.miterlimit, miterlimit);
+        return;
+    }
+
+    node->style->stroke.flags = (node->style->stroke.flags | SvgStrokeFlags::Miterlimit);
+    node->style->stroke.miterlimit = miterlimit;
+}
 
 static void _handleFillRuleAttr(TVG_UNUSED SvgLoaderData* loader, SvgNode* node, const char* value)
 {
@@ -1102,6 +1118,7 @@ static constexpr struct
     STYLE_DEF(stroke, Stroke, SvgStyleFlags::Stroke),
     STYLE_DEF(stroke-width, StrokeWidth, SvgStyleFlags::StrokeWidth),
     STYLE_DEF(stroke-linejoin, StrokeLineJoin, SvgStyleFlags::StrokeLineJoin),
+    STYLE_DEF(stroke-miterlimit, StrokeMiterlimit, SvgStyleFlags::StrokeMiterlimit),
     STYLE_DEF(stroke-linecap, StrokeLineCap, SvgStyleFlags::StrokeLineCap),
     STYLE_DEF(stroke-opacity, StrokeOpacity, SvgStyleFlags::StrokeOpacity),
     STYLE_DEF(stroke-dasharray, StrokeDashArray, SvgStyleFlags::StrokeDashArray),
@@ -1310,6 +1327,7 @@ static SvgNode* _createNode(SvgNode* parent, SvgNodeType type)
     node->style->stroke.cap = StrokeCap::Butt;
     //Default line join is miter
     node->style->stroke.join = StrokeJoin::Miter;
+    node->style->stroke.miterlimit = 4.0f;
     node->style->stroke.scale = 1.0;
 
     node->style->paintOrder = _toPaintOrder("fill stroke");
@@ -2788,6 +2806,9 @@ static void _styleInherit(SvgStyleProperty* child, const SvgStyleProperty* paren
     if (!(child->stroke.flags & SvgStrokeFlags::Join)) {
         child->stroke.join = parent->stroke.join;
     }
+    if (!(child->stroke.flags & SvgStrokeFlags::Miterlimit)) {
+        child->stroke.miterlimit = parent->stroke.miterlimit;
+    }
 }
 
 
@@ -2851,6 +2872,10 @@ static void _styleCopy(SvgStyleProperty* to, const SvgStyleProperty* from)
     if (from->stroke.flags & SvgStrokeFlags::Join) {
         to->stroke.join = from->stroke.join;
     }
+
+    if (from->stroke.flags & SvgStrokeFlags::Miterlimit) {
+        to->stroke.miterlimit = from->stroke.miterlimit;
+    }
 }
 
 
diff --git a/libfenrir/src/main/jni/thorvg/src/loaders/svg/tvgSvgLoaderCommon.h b/libfenrir/src/main/jni/thorvg/src/loaders/svg/tvgSvgLoaderCommon.h
index dec9fadeb..b9abe6a5d 100644
--- a/libfenrir/src/main/jni/thorvg/src/loaders/svg/tvgSvgLoaderCommon.h
+++ b/libfenrir/src/main/jni/thorvg/src/loaders/svg/tvgSvgLoaderCommon.h
@@ -100,6 +100,7 @@ enum class SvgStrokeFlags
     Cap = 0x20,
     Join = 0x40,
     Dash = 0x80,
+    Miterlimit = 0x100
 };
 
 constexpr bool operator &(SvgStrokeFlags a, SvgStrokeFlags b)
@@ -137,7 +138,8 @@ enum class SvgStyleFlags
     Mask = 0x2000,
     MaskType = 0x4000,
     Display = 0x8000,
-    PaintOrder = 0x10000
+    PaintOrder = 0x10000,
+    StrokeMiterlimit = 0x20000
 };
 
 constexpr bool operator &(SvgStyleFlags a, SvgStyleFlags b)
@@ -466,6 +468,7 @@ struct SvgStyleStroke
     float centered;
     StrokeCap cap;
     StrokeJoin join;
+    float miterlimit;
     SvgDash dash;
     int dashCount;
 };
diff --git a/libfenrir/src/main/jni/thorvg/src/loaders/svg/tvgSvgSceneBuilder.cpp b/libfenrir/src/main/jni/thorvg/src/loaders/svg/tvgSvgSceneBuilder.cpp
index 05ed41a92..eeb420f25 100644
--- a/libfenrir/src/main/jni/thorvg/src/loaders/svg/tvgSvgSceneBuilder.cpp
+++ b/libfenrir/src/main/jni/thorvg/src/loaders/svg/tvgSvgSceneBuilder.cpp
@@ -342,6 +342,7 @@ static void _applyProperty(SvgNode* node, Shape* vg, const Box& vBox, const stri
     vg->stroke(style->stroke.width);
     vg->stroke(style->stroke.cap);
     vg->stroke(style->stroke.join);
+    vg->strokeMiterlimit(style->stroke.miterlimit);
     if (style->stroke.dash.array.count > 0) {
         vg->stroke(style->stroke.dash.array.data, style->stroke.dash.array.count);
     }
diff --git a/picasso3/src/main/kotlin/com/squareup/picasso3/BitmapHunter.kt b/picasso3/src/main/kotlin/com/squareup/picasso3/BitmapHunter.kt
index 06a90191f..6e051db97 100644
--- a/picasso3/src/main/kotlin/com/squareup/picasso3/BitmapHunter.kt
+++ b/picasso3/src/main/kotlin/com/squareup/picasso3/BitmapHunter.kt
@@ -113,6 +113,9 @@ internal open class BitmapHunter(
                 request = data,
                 callback = object : RequestHandler.Callback {
                     override fun onSuccess(result: RequestHandler.Result?) {
+                        if (result is Bitmap) {
+                            result.bitmap = BitmapSafeResize.checkBitmap(result.bitmap)
+                        }
                         resultReference.set(result)
                         latch.countDown()
                     }
@@ -139,7 +142,6 @@ internal open class BitmapHunter(
         }
 
         val result = resultReference.get() as? Bitmap ?: return null
-        result.bitmap = BitmapSafeResize.checkBitmap(result.bitmap)
         val bitmap = result.bitmap
         if (picasso.isLoggingEnabled) {
             log(OWNER_HUNTER, VERB_DECODED, data.logId())
diff --git a/picasso3/src/main/kotlin/com/squareup/picasso3/BitmapSafeResize.kt b/picasso3/src/main/kotlin/com/squareup/picasso3/BitmapSafeResize.kt
index 4b8d67f40..f4934020b 100644
--- a/picasso3/src/main/kotlin/com/squareup/picasso3/BitmapSafeResize.kt
+++ b/picasso3/src/main/kotlin/com/squareup/picasso3/BitmapSafeResize.kt
@@ -23,11 +23,11 @@ object BitmapSafeResize {
         }
     }
 
-    fun isOverflowCanvas(Resolution: Int): Boolean {
+    fun isOverflowCanvas(resolution: Int): Boolean {
         val canvas = Canvas()
         val maxCanvasSize = canvas.maximumBitmapWidth.coerceAtMost(canvas.maximumBitmapHeight)
         return if (maxCanvasSize > 0) {
-            maxCanvasSize < Resolution
+            maxCanvasSize < resolution
         } else false
     }
 
diff --git a/picasso3/src/main/kotlin/com/squareup/picasso3/BitmapUtils.kt b/picasso3/src/main/kotlin/com/squareup/picasso3/BitmapUtils.kt
index b6c80e2bd..946b07c75 100644
--- a/picasso3/src/main/kotlin/com/squareup/picasso3/BitmapUtils.kt
+++ b/picasso3/src/main/kotlin/com/squareup/picasso3/BitmapUtils.kt
@@ -21,6 +21,7 @@ import android.content.res.Resources
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.graphics.ImageDecoder
+import android.os.Build
 import android.os.Build.VERSION
 import android.util.TypedValue
 import androidx.annotation.DrawableRes
@@ -97,7 +98,7 @@ object BitmapUtils {
         val exceptionCatchingSource = ExceptionCatchingSource(source)
         val bufferedSource = exceptionCatchingSource.buffer()
         val bitmap =
-            if (VERSION.SDK_INT >= 28)
+            if (VERSION.SDK_INT >= Build.VERSION_CODES.P)
                 decodeStreamP(request, bufferedSource)
             else
                 decodeStreamPreP(request, bufferedSource)
@@ -105,7 +106,7 @@ object BitmapUtils {
         return bitmap
     }
 
-    @RequiresApi(28)
+    @RequiresApi(Build.VERSION_CODES.P)
     @SuppressLint("Override")
     private fun decodeStreamP(request: Request, bufferedSource: BufferedSource): Bitmap {
         val imageSource = ImageDecoder.createSource(ByteBuffer.wrap(bufferedSource.readByteArray()))
@@ -142,14 +143,14 @@ object BitmapUtils {
     fun decodeResource(context: Context, request: Request): Bitmap {
         val resources = Utils.getResources(context, request)
         val id = Utils.getResourceId(resources, request)
-        return if (VERSION.SDK_INT >= 28) {
+        return if (VERSION.SDK_INT >= Build.VERSION_CODES.P) {
             decodeResourceP(resources, id, request)
         } else {
             decodeResourcePreP(resources, id, request)
         }
     }
 
-    @RequiresApi(28)
+    @RequiresApi(Build.VERSION_CODES.P)
     private fun decodeResourceP(
         resources: Resources,
         @DrawableRes id: Int,
@@ -172,7 +173,7 @@ object BitmapUtils {
         return BitmapFactory.decodeResource(resources, id, options)
     }
 
-    @RequiresApi(28)
+    @RequiresApi(Build.VERSION_CODES.P)
     private fun decodeImageSource(imageSource: ImageDecoder.Source, request: Request): Bitmap {
         return ImageDecoder.decodeBitmap(imageSource) { imageDecoder, imageInfo, _ ->
             imageDecoder.allocator = when {
@@ -247,7 +248,7 @@ object BitmapUtils {
         return file != null && file.toString().endsWith(".xml")
     }
 
-    internal class ExceptionCatchingSource(delegate: Source) : ForwardingSource(delegate) {
+    class ExceptionCatchingSource(delegate: Source) : ForwardingSource(delegate) {
         var thrownException: IOException? = null
 
         override fun read(sink: Buffer, byteCount: Long): Long {
diff --git a/picasso3/src/main/kotlin/com/squareup/picasso3/ContentStreamRequestHandler.kt b/picasso3/src/main/kotlin/com/squareup/picasso3/ContentStreamRequestHandler.kt
index a5688bf91..d890cd751 100644
--- a/picasso3/src/main/kotlin/com/squareup/picasso3/ContentStreamRequestHandler.kt
+++ b/picasso3/src/main/kotlin/com/squareup/picasso3/ContentStreamRequestHandler.kt
@@ -18,6 +18,7 @@ package com.squareup.picasso3
 import android.content.ContentResolver
 import android.content.Context
 import android.net.Uri
+import android.os.Build
 import androidx.exifinterface.media.ExifInterface
 import androidx.exifinterface.media.ExifInterface.ORIENTATION_NORMAL
 import androidx.exifinterface.media.ExifInterface.TAG_ORIENTATION
@@ -59,6 +60,9 @@ internal open class ContentStreamRequestHandler(val context: Context) : RequestH
     }
 
     protected open fun getExifOrientation(uri: Uri): Int {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            return 0
+        }
         val contentResolver = context.contentResolver
         contentResolver.openInputStream(uri)?.use { input ->
             return ExifInterface(input).getAttributeInt(TAG_ORIENTATION, ORIENTATION_NORMAL)
diff --git a/picasso3/src/main/kotlin/com/squareup/picasso3/FileRequestHandler.kt b/picasso3/src/main/kotlin/com/squareup/picasso3/FileRequestHandler.kt
index 76a40f3e3..27aaad07d 100644
--- a/picasso3/src/main/kotlin/com/squareup/picasso3/FileRequestHandler.kt
+++ b/picasso3/src/main/kotlin/com/squareup/picasso3/FileRequestHandler.kt
@@ -18,6 +18,7 @@ package com.squareup.picasso3
 import android.content.ContentResolver
 import android.content.Context
 import android.net.Uri
+import android.os.Build
 import androidx.exifinterface.media.ExifInterface
 import com.squareup.picasso3.BitmapUtils.decodeStream
 import com.squareup.picasso3.Picasso.LoadedFrom.DISK
@@ -52,6 +53,9 @@ internal class FileRequestHandler(context: Context) : ContentStreamRequestHandle
     }
 
     override fun getExifOrientation(uri: Uri): Int {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            return 0
+        }
         val path = uri.path ?: throw FileNotFoundException("path == null, uri: $uri")
         return ExifInterface(path).getAttributeInt(
             ExifInterface.TAG_ORIENTATION,
diff --git a/picasso3/src/main/kotlin/com/squareup/picasso3/MatrixTransformation.kt b/picasso3/src/main/kotlin/com/squareup/picasso3/MatrixTransformation.kt
index a49dff184..aa70eddf2 100644
--- a/picasso3/src/main/kotlin/com/squareup/picasso3/MatrixTransformation.kt
+++ b/picasso3/src/main/kotlin/com/squareup/picasso3/MatrixTransformation.kt
@@ -17,7 +17,7 @@ package com.squareup.picasso3
 
 import android.graphics.Bitmap.createBitmap
 import android.graphics.Matrix
-import android.os.Build.VERSION
+import android.os.Build
 import android.view.Gravity
 import androidx.annotation.VisibleForTesting
 import androidx.exifinterface.media.ExifInterface.*
@@ -102,7 +102,7 @@ internal class MatrixTransformation(private val data: Request) : Transformation
 
                 // EXIf interpretation should be done before cropping in case the dimensions need to
                 // be recalculated; SDK 28+ uses ImageDecoder which handles EXIF orientation
-                if (exifOrientation != 0 && VERSION.SDK_INT < 28) {
+                if (exifOrientation != 0 && Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
                     val exifRotation = getExifRotation(exifOrientation)
                     val exifTranslation = getExifTranslation(exifOrientation)
                     if (exifRotation != 0) {
diff --git a/preference/src/main/kotlin/de/maxr1998/modernpreferences/Preferences.kt b/preference/src/main/kotlin/de/maxr1998/modernpreferences/Preferences.kt
index d001926b1..11faaf740 100644
--- a/preference/src/main/kotlin/de/maxr1998/modernpreferences/Preferences.kt
+++ b/preference/src/main/kotlin/de/maxr1998/modernpreferences/Preferences.kt
@@ -28,6 +28,8 @@ import androidx.annotation.LayoutRes
 import androidx.annotation.StringRes
 import androidx.core.content.edit
 import androidx.core.view.isVisible
+import com.google.android.material.snackbar.BaseTransientBottomBar.LENGTH_LONG
+import com.google.android.material.snackbar.Snackbar
 import de.maxr1998.modernpreferences.helpers.DEFAULT_RES_ID
 import de.maxr1998.modernpreferences.helpers.DependencyManager
 import de.maxr1998.modernpreferences.helpers.KEY_ROOT_SCREEN
@@ -56,6 +58,15 @@ abstract class AbstractPreference internal constructor(val key: String) {
     var iconRes: Int = DEFAULT_RES_ID
     var icon: Drawable? = null
 
+    fun getTittle(context: Context): String {
+        if (title.isNotEmpty()) {
+            return title.toString()
+        } else if (titleRes != DEFAULT_RES_ID) {
+            return context.getString(titleRes)
+        }
+        return key
+    }
+
     fun icon(@DrawableRes res: Int) {
         iconRes = res
         icon = null
@@ -216,6 +227,9 @@ open class Preference(key: String) : AbstractPreference(key) {
     var parent: PreferenceScreen? = null
         private set
 
+    var inSearchParentStory: String? = null
+        private set
+
     var screenPosition: Int = 0
         private set
 
@@ -370,9 +384,29 @@ open class Preference(key: String) : AbstractPreference(key) {
         return ret
     }
 
+    fun makeInSearchParentStoryFrom(context: Context, pref: Preference) {
+        val list = ArrayList<String>()
+        var prScreen = pref.parent
+        while (prScreen != null && prScreen.key != "root" && prScreen.key != "found_result") {
+            list.add(prScreen.getTittle(context))
+            prScreen = prScreen.parent
+        }
+        list.reverse()
+        val res = StringBuilder()
+        for (i in list) {
+            res.append(i).append(" -> ")
+        }
+        res.append(pref.getTittle(context))
+        inSearchParentStory = res.toString()
+    }
+
     open fun onClick(holder: PreferencesAdapter.ViewHolder) {}
 
     open fun onLongClick(holder: PreferencesAdapter.ViewHolder): Boolean {
+        if (inSearchParentStory != null) {
+            Snackbar.make(holder.itemView, inSearchParentStory.orEmpty(), LENGTH_LONG).show()
+            return true
+        }
         return false
     }
 
diff --git a/preference/src/main/kotlin/de/maxr1998/modernpreferences/PreferencesAdapter.kt b/preference/src/main/kotlin/de/maxr1998/modernpreferences/PreferencesAdapter.kt
index a7a7748b5..ee92ae3ae 100644
--- a/preference/src/main/kotlin/de/maxr1998/modernpreferences/PreferencesAdapter.kt
+++ b/preference/src/main/kotlin/de/maxr1998/modernpreferences/PreferencesAdapter.kt
@@ -37,10 +37,8 @@ import androidx.core.content.res.use
 import androidx.core.view.get
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.snackbar.Snackbar
 import de.maxr1998.modernpreferences.helpers.DEFAULT_RES_ID
 import de.maxr1998.modernpreferences.helpers.categoryHeader
-import de.maxr1998.modernpreferences.helpers.onLongClick
 import de.maxr1998.modernpreferences.preferences.AccentButtonPreference
 import de.maxr1998.modernpreferences.preferences.CategoryHeader
 import de.maxr1998.modernpreferences.preferences.CollapsePreference
@@ -144,27 +142,9 @@ class PreferencesAdapter @VisibleForTesting constructor(
             }
         } else {
             if (prefNameHas(context, query, preference)) {
-                if (view == null || preference.longClickListener != null) {
-                    found.addPreferenceItem(preference.makeCopyForFind())
-                } else {
-                    val ref = preference.makeCopyForFind()
-                    val title = preference.parent?.title
-                    val titleRes = preference.parent?.titleRes ?: DEFAULT_RES_ID
-                    if (!title.isNullOrEmpty()) {
-                        ref.onLongClick {
-                            Snackbar.make(view, title, Snackbar.LENGTH_LONG)
-                                .show()
-                            true
-                        }
-                    } else if (titleRes != DEFAULT_RES_ID) {
-                        ref.onLongClick {
-                            Snackbar.make(view, titleRes, Snackbar.LENGTH_LONG)
-                                .show()
-                            true
-                        }
-                    }
-                    found.addPreferenceItem(ref)
-                }
+                val tmp = preference.makeCopyForFind()
+                tmp.makeInSearchParentStoryFrom(context, preference)
+                found.addPreferenceItem(tmp)
             }
         }
     }
@@ -328,7 +308,10 @@ class PreferencesAdapter @VisibleForTesting constructor(
         pref.bindViews(holder)
 
         // Category header and seek bar shouldn't be clickable
-        if (pref is CategoryHeader || pref is SeekBarPreference) return
+        if (pref is CategoryHeader || pref is SeekBarPreference) {
+            holder.itemView.setOnClickListener(null)
+            holder.itemView.setOnLongClickListener(null)
+        }
 
         holder.itemView.setOnClickListener {
             if (pref is PreferenceScreen) {