diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.kt
index e45ae2fe0..52e936006 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.kt
@@ -2,7 +2,6 @@ package com.habitrpg.android.habitica.ui.adapter.social
 
 import android.view.View
 import android.view.ViewGroup
-import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.SystemChatMessageBinding
@@ -129,22 +128,20 @@ class ChatRecyclerViewAdapter(user: User?, private val isTavern: Boolean) : Base
 }
 
 class SystemChatMessageViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-    private val textView: TextView = itemView.findViewById(R.id.text_view)
-    private val timestamp: TextView = itemView.findViewById(R.id.system_message_timestamp)
     private val dateTime = java.text.SimpleDateFormat.getDateTimeInstance()
     val binding = SystemChatMessageBinding.bind(itemView)
 
     var onShouldExpand: (() -> Unit)? = null
 
     init {
-        textView.setOnClickListener {
+        binding.textView.setOnClickListener {
             onShouldExpand?.invoke()
         }
     }
 
     fun bind(chatMessage: ChatMessage?, isExpanded: Boolean) {
-        textView.text = chatMessage?.text?.removePrefix("`")?.removeSuffix("`")
-        timestamp.text = chatMessage?.timestamp?.let { java.util.Date(it) }
+        binding.textView.text = chatMessage?.text?.removePrefix("`")?.removeSuffix("`")
+        binding.systemMessageTimestamp.text = chatMessage?.timestamp?.let { java.util.Date(it) }
             ?.let { dateTime.format(it) }
         if (isExpanded) {
             binding.systemMessageTimestamp.visibility = View.VISIBLE
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt
index e6c2e795f..e81079034 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt
@@ -121,7 +121,7 @@ class AvatarCustomizationFragment :
         this.loadCustomizations()
 
         userViewModel.user.observe(viewLifecycleOwner) { updateUser(it) }
-        currentFilter.onNext(CustomizationFilter())
+        currentFilter.onNext(CustomizationFilter(false, type != "background"))
 
         binding?.recyclerView?.doOnLayout {
             adapter.columnCount = it.width / (80.dpToPx(context))
@@ -287,7 +287,7 @@ class AvatarCustomizationFragment :
             currentFilter.onNext(filter)
         }
         binding.clearButton.setOnClickListener {
-            currentFilter.onNext(CustomizationFilter())
+            currentFilter.onNext(CustomizationFilter(false, type != "background"))
             dialog.dismiss()
         }
         if (type == "background") {