From ee9bbf731e77a204d8d86bb7b51d8834fdebb0fa Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Tue, 11 Feb 2025 17:26:12 +0100
Subject: [PATCH] remove viewpagerindicator library

---
 Habitica/build.gradle.kts                     |    1 -
 Habitica/res/drawable/indicator_diamond.xml   |   14 +-
 Habitica/res/layout/activity_intro.xml        |   90 +-
 Habitica/res/layout/activity_setup.xml        |   78 +-
 Habitica/res/values/styles.xml                |    2 +-
 .../habitica/ui/activities/BaseActivity.kt    |    4 +-
 .../habitica/ui/activities/IntroActivity.kt   |   90 +-
 .../habitica/ui/activities/SetupActivity.kt   |  158 +-
 .../habitica/ui/fragments/BaseMainFragment.kt |    2 +-
 .../ui/fragments/setup/WelcomeFragment.kt     |   14 +-
 .../habitica/ui/views/HabiticaIcons.java      | 1748 +----------------
 .../ui/views/HabiticaIconsHelper.java         |   56 -
 gradle.properties                             |    3 +-
 gradle/libs.versions.toml                     |    4 +-
 14 files changed, 203 insertions(+), 2061 deletions(-)

diff --git a/Habitica/build.gradle.kts b/Habitica/build.gradle.kts
index 9e9ec042b..b26935299 100644
--- a/Habitica/build.gradle.kts
+++ b/Habitica/build.gradle.kts
@@ -157,7 +157,6 @@ dependencies {
 
     // IAP Handling / Verification
     implementation(libs.billing)
-    implementation(libs.viewPagerIndicator) { exclude(group = "com.google.android") }
 
     implementation(libs.coil.compose)
 
diff --git a/Habitica/res/drawable/indicator_diamond.xml b/Habitica/res/drawable/indicator_diamond.xml
index 249abe868..1d24e209c 100644
--- a/Habitica/res/drawable/indicator_diamond.xml
+++ b/Habitica/res/drawable/indicator_diamond.xml
@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true" android:drawable="@drawable/indicator_diamond_selected" />
-    <item android:drawable="@drawable/indicator_diamond_unselected" />
-</selector>
\ No newline at end of file
+    <item android:state_selected="true">
+        <layer-list>
+            <item android:drawable="@drawable/indicator_diamond_selected" android:height="24dp" />
+        </layer-list>
+    </item>
+    <item>
+        <layer-list>
+            <item android:drawable="@drawable/indicator_diamond_unselected" android:height="24dp" />
+        </layer-list>
+    </item>
+</selector>
diff --git a/Habitica/res/layout/activity_intro.xml b/Habitica/res/layout/activity_intro.xml
index 150073bce..62ec597c4 100644
--- a/Habitica/res/layout/activity_intro.xml
+++ b/Habitica/res/layout/activity_intro.xml
@@ -1,50 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_height="match_parent"
-    android:layout_width="match_parent"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:background="@color/brand">
-    <androidx.viewpager.widget.ViewPager
-        android:id="@+id/viewPager"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-    <RelativeLayout
-        android:orientation="vertical" android:layout_width="match_parent"
+        xmlns:tools="http://schemas.android.com/tools"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_height="match_parent"
-        android:fitsSystemWindows="true">
-        <com.viewpagerindicator.IconPageIndicator
-            android:id="@+id/view_pager_indicator"
-            android:layout_height="wrap_content"
-            android:layout_width="fill_parent"
-            android:layout_alignParentBottom="true"
-            android:layout_marginBottom="16dp" />
+        android:layout_width="match_parent"
+        tools:background="@color/brand">
+
+    <androidx.viewpager2.widget.ViewPager2
+            android:id="@+id/viewPager"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    <RelativeLayout
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:fitsSystemWindows="true">
+
+        <com.google.android.material.tabs.TabLayout
+                android:id="@+id/view_pager_indicator"
+                android:layout_height="wrap_content"
+                android:layout_width="fill_parent"
+                android:layout_alignParentBottom="true"
+                app:tabGravity="center"
+                app:tabBackground="@drawable/indicator_diamond"
+                android:background="@color/transparent"
+                app:tabIndicator="@null" />
 
         <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/skip_button"
-            android:id="@+id/skipButton"
-            android:layout_alignParentBottom="false"
-            android:layout_alignParentEnd="true"
-            android:layout_marginEnd="6dp"
-            android:layout_alignParentTop="true"
-            android:layout_marginTop="@dimen/spacing_small"
-            android:textColor="@android:color/white"
-            android:background="@color/transparent" />
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/skip_button"
+                android:id="@+id/skipButton"
+                android:layout_alignParentBottom="false"
+                android:layout_alignParentEnd="true"
+                android:layout_marginEnd="6dp"
+                android:layout_alignParentTop="true"
+                android:layout_marginTop="@dimen/spacing_small"
+                android:textColor="@android:color/white"
+                android:background="@color/transparent" />
 
         <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/intro_finish_button"
-            android:id="@+id/finishButton"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentEnd="true"
-            android:layout_marginEnd="12dp"
-            android:layout_marginBottom="6dp"
-            android:background="@color/transparent"
-            android:textColor="@android:color/white"
-            android:textSize="16sp"
-            android:visibility="gone"
-            tools:visibility="visible"/>
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/intro_finish_button"
+                android:id="@+id/finishButton"
+                android:layout_alignParentBottom="true"
+                android:layout_alignParentEnd="true"
+                android:layout_marginEnd="12dp"
+                android:layout_marginBottom="6dp"
+                android:background="@color/transparent"
+                android:textColor="@android:color/white"
+                android:textSize="16sp"
+                android:visibility="gone"
+                tools:visibility="visible" />
     </RelativeLayout>
 </FrameLayout>
diff --git a/Habitica/res/layout/activity_setup.xml b/Habitica/res/layout/activity_setup.xml
index 6bfe64afc..cf7ca194c 100644
--- a/Habitica/res/layout/activity_setup.xml
+++ b/Habitica/res/layout/activity_setup.xml
@@ -1,44 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent" android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <com.habitrpg.android.habitica.ui.views.FadingViewPager
-        android:id="@+id/viewPager"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"/>
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+    <androidx.viewpager2.widget.ViewPager2
+            android:id="@+id/viewPager"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1" />
 
     <RelativeLayout
-        android:id="@+id/bottomBar"
-        android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="56dp"
-        android:background="@color/background_brand"
-        android:gravity="center_vertical"
-        android:elevation="8dp">
-        <com.viewpagerindicator.IconPageIndicator
-            android:id="@+id/view_pager_indicator"
+            android:id="@+id/bottomBar"
+            android:orientation="horizontal"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true" />
+            android:layout_height="56dp"
+            android:background="@color/background_brand"
+            android:gravity="center_vertical"
+            android:elevation="8dp">
+
+        <com.google.android.material.tabs.TabLayout
+                android:id="@+id/view_pager_indicator"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                app:tabBackground="@drawable/indicator_diamond"
+                android:background="@color/transparent"
+                app:tabIndicator="@null" />
+
         <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/previousButton"
-            android:drawableStart="@drawable/back_arrow_disabled"
-            android:background="@color/transparent"
-            android:drawablePadding="12dp"
-            android:textColor="@color/white"/>
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/previousButton"
+                android:drawableStart="@drawable/back_arrow_disabled"
+                android:background="@color/transparent"
+                android:drawablePadding="12dp"
+                android:textColor="@color/white" />
+
         <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/next_button"
-            android:id="@+id/nextButton"
-            android:drawablePadding="12dp"
-            android:textColor="@color/white"
-            android:drawableEnd="@drawable/forward_arrow_enabled"
-            android:background="@color/transparent"
-            android:layout_alignParentEnd="true"/>
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/next_button"
+                android:id="@+id/nextButton"
+                android:drawablePadding="12dp"
+                android:textColor="@color/white"
+                android:drawableEnd="@drawable/forward_arrow_enabled"
+                android:background="@color/transparent"
+                android:layout_alignParentEnd="true" />
     </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index e254ddd3b..f99b525c2 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Application theme. -->
-    <style name="AppTheme" parent="Theme.Material3.DayNight">
+    <style name="AppTheme" parent="Theme.Material3.DynamicColors.DayNight">
         <item name="android:listSeparatorTextViewStyle">@style/MyOwnListSeperatorTextViewStyle
         </item>
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt
index 6dc4c2cf7..c2d69a1e7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt
@@ -94,9 +94,7 @@ abstract class BaseActivity : AppCompatActivity() {
 
     private val defaultNavigationBarStyle by lazy {
         SystemBarStyle.auto(ContextCompat.getColor(this, R.color.white_50_alpha),
-            ContextCompat.getColor(this, R.color.black_50_alpha),
-            { _ -> true}
-        )
+            ContextCompat.getColor(this, R.color.black_50_alpha))
     }
     internal var navigationBarStyle: SystemBarStyle? = null
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/IntroActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/IntroActivity.kt
index 63aa23261..5a017009f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/IntroActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/IntroActivity.kt
@@ -4,30 +4,26 @@ import android.content.Intent
 import android.os.Build
 import android.os.Bundle
 import android.view.View
-import android.view.ViewGroup
-import androidx.activity.SystemBarStyle
 import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat
 import androidx.core.view.WindowCompat
-import androidx.core.view.WindowInsetsCompat
 import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentManager
-import androidx.fragment.app.FragmentStatePagerAdapter
 import androidx.lifecycle.lifecycleScope
-import androidx.viewpager.widget.ViewPager
+import androidx.viewpager2.adapter.FragmentStateAdapter
+import androidx.viewpager2.widget.ViewPager2
+import com.google.android.material.tabs.TabLayoutMediator
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.ContentRepository
 import com.habitrpg.android.habitica.databinding.ActivityIntroBinding
 import com.habitrpg.android.habitica.extensions.setNavigationBarDarkIcons
 import com.habitrpg.android.habitica.ui.fragments.setup.IntroFragment
 import com.habitrpg.common.habitica.helpers.ExceptionHandler
-import com.viewpagerindicator.IconPagerAdapter
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class IntroActivity : BaseActivity(), View.OnClickListener, ViewPager.OnPageChangeListener {
+class IntroActivity : BaseActivity() {
     private lateinit var binding: ActivityIntroBinding
 
     @Inject
@@ -46,10 +42,9 @@ class IntroActivity : BaseActivity(), View.OnClickListener, ViewPager.OnPageChan
         super.onCreate(savedInstanceState)
 
         setupIntro()
-        binding.viewPagerIndicator.setViewPager(binding.viewPager)
 
-        binding.skipButton.setOnClickListener(this)
-        binding.finishButton.setOnClickListener(this)
+        binding.skipButton.setOnClickListener { finishIntro() }
+        binding.finishButton.setOnClickListener { finishIntro() }
 
         lifecycleScope.launch(ExceptionHandler.coroutine()) {
             contentRepository.retrieveContent()
@@ -69,13 +64,17 @@ class IntroActivity : BaseActivity(), View.OnClickListener, ViewPager.OnPageChan
     }
 
     private fun setupIntro() {
-        binding.viewPager.adapter = PagerAdapter(supportFragmentManager)
-
-        binding.viewPager.addOnPageChangeListener(this)
-    }
-
-    override fun onClick(v: View) {
-        finishIntro()
+        setViewPagerAdapter()
+        binding.viewPager.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
+            override fun onPageSelected(position: Int) {
+                super.onPageSelected(position)
+                if (position == 2) {
+                    binding.finishButton.visibility = View.VISIBLE
+                } else {
+                    binding.finishButton.visibility = View.GONE
+                }
+            }
+        })
     }
 
     private fun finishIntro() {
@@ -87,50 +86,21 @@ class IntroActivity : BaseActivity(), View.OnClickListener, ViewPager.OnPageChan
         finish()
     }
 
-    override fun onPageScrolled(
-        position: Int,
-        positionOffset: Float,
-        positionOffsetPixels: Int
-    ) { // no-on
-    }
-
-    override fun onPageSelected(position: Int) {
-        if (position == 2) {
-            binding.finishButton.visibility = View.VISIBLE
-        } else {
-            binding.finishButton.visibility = View.GONE
-        }
-    }
-
-    override fun onPageScrollStateChanged(state: Int) { // no-on
-    }
-
-    private inner class PagerAdapter(fm: FragmentManager) :
-        FragmentStatePagerAdapter(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT), IconPagerAdapter {
-        override fun getItem(position: Int): Fragment {
-            val fragment = IntroFragment()
-            configureFragment(fragment, position)
-            return fragment
-        }
-
-        override fun getIconResId(index: Int): Int {
-            return R.drawable.indicator_diamond
-        }
-
-        override fun getCount(): Int {
-            return 3
-        }
-
-        override fun instantiateItem(
-            container: ViewGroup,
-            position: Int
-        ): Any {
-            val item = super.instantiateItem(container, position)
-            if (item is IntroFragment) {
-                configureFragment(item, position)
+    private fun setViewPagerAdapter() {
+        val fragmentManager = supportFragmentManager
+        val viewPagerAdapter = object : FragmentStateAdapter(fragmentManager, lifecycle) {
+            override fun createFragment(position: Int): Fragment {
+                val fragment = IntroFragment()
+                configureFragment(fragment, position)
+                return fragment
+            }
+
+            override fun getItemCount(): Int {
+                return 3
             }
-            return item
         }
+        binding.viewPager.adapter = viewPagerAdapter
+        TabLayoutMediator(binding.viewPagerIndicator, binding.viewPager) { tab, position -> }.attach()
     }
 
     private fun configureFragment(
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt
index 788f28d86..a49b4b35f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt
@@ -1,23 +1,19 @@
 package com.habitrpg.android.habitica.ui.activities
 
-import android.content.Context
 import android.content.Intent
 import android.graphics.drawable.Drawable
-import android.os.Build
 import android.os.Bundle
 import android.view.View
-import android.view.ViewGroup
-import android.view.WindowInsetsController
 import android.view.inputmethod.InputMethodManager
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.content.ContextCompat
 import androidx.core.content.edit
 import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentManager
-import androidx.fragment.app.FragmentPagerAdapter
 import androidx.lifecycle.lifecycleScope
 import androidx.preference.PreferenceManager
-import androidx.viewpager.widget.ViewPager
+import androidx.viewpager2.adapter.FragmentStateAdapter
+import androidx.viewpager2.widget.ViewPager2
+import com.google.android.material.tabs.TabLayoutMediator
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.data.InventoryRepository
@@ -30,10 +26,8 @@ import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.fragments.setup.AvatarSetupFragment
 import com.habitrpg.android.habitica.ui.fragments.setup.TaskSetupFragment
 import com.habitrpg.android.habitica.ui.fragments.setup.WelcomeFragment
-import com.habitrpg.common.habitica.extensions.isUsingNightModeResources
 import com.habitrpg.common.habitica.helpers.ExceptionHandler
 import com.habitrpg.common.habitica.helpers.launchCatching
-import com.viewpagerindicator.IconPagerAdapter
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.flow.debounce
@@ -44,7 +38,7 @@ import javax.inject.Inject
 import kotlin.time.Duration.Companion.milliseconds
 
 @AndroidEntryPoint
-class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
+class SetupActivity : BaseActivity() {
     private lateinit var binding: ActivitySetupBinding
 
     @Inject
@@ -66,7 +60,7 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
     private val isLastPage: Boolean
         get() =
             binding.viewPager.adapter == null || binding.viewPager.currentItem == (
-                binding.viewPager.adapter?.count
+                binding.viewPager.adapter?.itemCount
                     ?: 0
                 ) - 1
 
@@ -103,7 +97,7 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
             }
         }
 
-        binding.viewPager.disableFading = true
+        binding.viewPager.isUserInputEnabled = false
 
         binding.previousButton.setOnClickListener { previousClicked() }
         binding.nextButton.setOnClickListener { nextClicked() }
@@ -115,12 +109,26 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
     }
 
     private fun setupViewpager() {
-        val fragmentManager = supportFragmentManager
-
-        binding.viewPager.adapter = ViewPageAdapter(fragmentManager)
-
-        binding.viewPager.addOnPageChangeListener(this)
-        binding.viewPagerIndicator.setViewPager(binding.viewPager)
+        setViewPagerAdapter()
+        binding.viewPager.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
+            override fun onPageSelected(position: Int) {
+                super.onPageSelected(position)
+                when {
+                    position == 0 -> {
+                        setPreviousButtonEnabled(false)
+                        binding.nextButton.text = getString(R.string.next_button)
+                    }
+                    isLastPage -> {
+                        setPreviousButtonEnabled(true)
+                        binding.nextButton.text = getString(R.string.finish)
+                    }
+                    else -> {
+                        setPreviousButtonEnabled(true)
+                        binding.nextButton.text = getString(R.string.next_button)
+                    }
+                }
+            }
+        })
     }
 
     private fun nextClicked() {
@@ -147,7 +155,7 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
         } else if (binding.viewPager.currentItem == 0) {
             confirmNames(welcomeFragment?.displayName ?: "", welcomeFragment?.username ?: "")
 
-            val imm = getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager
+            val imm = getSystemService(INPUT_METHOD_SERVICE) as? InputMethodManager
             imm?.hideSoftInputFromWindow(currentFocus?.windowToken, 0)
         }
         binding.viewPager.currentItem = binding.viewPager.currentItem + 1
@@ -187,34 +195,6 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
         binding.nextButton.setCompoundDrawablesWithIntrinsicBounds(null, null, rightDrawable, null)
     }
 
-    override fun onPageScrolled(
-        position: Int,
-        positionOffset: Float,
-        positionOffsetPixels: Int
-    ) =
-        Unit
-
-    override fun onPageSelected(position: Int) {
-        when {
-            position == 0 -> {
-                this.setPreviousButtonEnabled(false)
-                binding.nextButton.text = this.getString(R.string.next_button)
-            }
-
-            isLastPage -> {
-                this.setPreviousButtonEnabled(true)
-                binding.nextButton.text = this.getString(R.string.finish)
-            }
-
-            else -> {
-                this.setPreviousButtonEnabled(true)
-                binding.nextButton.text = this.getString(R.string.next_button)
-            }
-        }
-    }
-
-    override fun onPageScrollStateChanged(state: Int) = Unit
-
     private var hasCompleted = false
 
     private fun onUserReceived(user: User?) {
@@ -255,67 +235,41 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
         }
     }
 
-    private inner class ViewPageAdapter(fm: FragmentManager) :
-        FragmentPagerAdapter(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT), IconPagerAdapter {
-        override fun getItem(position: Int): Fragment {
-            return when (position) {
-                1 -> {
-                    val fragment = AvatarSetupFragment()
-                    fragment.activity = this@SetupActivity
-                    fragment.setUser(user)
-                    fragment.width = binding.viewPager.width
-                    avatarSetupFragment = fragment
-                    fragment
-                }
+    private fun setViewPagerAdapter() {
+        val fragmentManager = supportFragmentManager
+        val viewPagerAdapter = object : FragmentStateAdapter(fragmentManager, lifecycle) {
+            override fun createFragment(position: Int): Fragment {
+                return when (position) {
+                    1 -> {
+                        val fragment = AvatarSetupFragment()
+                        fragment.activity = this@SetupActivity
+                        fragment.setUser(user)
+                        fragment.width = binding.viewPager.width
+                        avatarSetupFragment = fragment
+                        fragment
+                    }
 
-                2 -> {
-                    val fragment = TaskSetupFragment()
-                    fragment.setUser(user)
-                    taskSetupFragment = fragment
-                    fragment
-                }
+                    2 -> {
+                        val fragment = TaskSetupFragment()
+                        fragment.setUser(user)
+                        taskSetupFragment = fragment
+                        fragment
+                    }
 
-                else -> {
-                    val fragment = WelcomeFragment()
-                    welcomeFragment = fragment
-                    welcomeFragment?.onNameValid = { setNextButtonEnabled(it == true) }
-                    fragment
+                    else -> {
+                        val fragment = WelcomeFragment()
+                        welcomeFragment = fragment
+                        welcomeFragment?.onNameValid = { setNextButtonEnabled(it == true) }
+                        fragment
+                    }
                 }
             }
-        }
 
-        override fun instantiateItem(
-            container: ViewGroup,
-            position: Int
-        ): Any {
-            val item = super.instantiateItem(container, position)
-            when (item) {
-                is AvatarSetupFragment -> {
-                    avatarSetupFragment = item
-                    item.activity = this@SetupActivity
-                    item.setUser(user)
-                    item.width = binding.viewPager.width
-                }
-
-                is TaskSetupFragment -> {
-                    taskSetupFragment = item
-                    item.setUser(user)
-                }
-
-                is WelcomeFragment -> {
-                    welcomeFragment = item
-                    item.onNameValid = { setNextButtonEnabled(it == true) }
-                }
+            override fun getItemCount(): Int {
+                return 3
             }
-            return item
-        }
-
-        override fun getCount(): Int {
-            return 3
-        }
-
-        override fun getIconResId(index: Int): Int {
-            return R.drawable.indicator_diamond
         }
+        binding.viewPager.adapter = viewPagerAdapter
+        TabLayoutMediator(binding.viewPagerIndicator, binding.viewPager) { tab, position -> }.attach()
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.kt
index 5e91aa989..a170a67da 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.kt
@@ -100,7 +100,7 @@ abstract class BaseMainFragment<VB : ViewBinding> : BaseFragment<VB>() {
                 view?.systemUiVisibility
                 window.setNavigationBarDarkIcons(false)
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                    window.isNavigationBarContrastEnforced = false
+                    window.isNavigationBarContrastEnforced = true
                 }
             } else {
                 windowInsetsController.isAppearanceLightNavigationBars = requireActivity().isUsingNightModeResources()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.kt
index 7976f31d8..b232668d2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.kt
@@ -25,6 +25,7 @@ import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import javax.inject.Inject
+import androidx.core.graphics.drawable.toDrawable
 
 @AndroidEntryPoint
 class WelcomeFragment : BaseFragment<FragmentWelcomeBinding>() {
@@ -47,17 +48,14 @@ class WelcomeFragment : BaseFragment<FragmentWelcomeBinding>() {
 
     private val checkmarkIcon: Drawable by lazy {
         context?.let {
-            BitmapDrawable(
-                resources,
-                HabiticaIconsHelper.imageOfCheckmark(
-                    ContextCompat.getColor(it, R.color.green_50),
-                    1f
-                )
-            )
+            HabiticaIconsHelper.imageOfCheckmark(
+                ContextCompat.getColor(it, R.color.green_50),
+                1f
+            ).toDrawable(resources)
         } ?: VectorDrawable()
     }
     private val alertIcon: Drawable by lazy {
-        BitmapDrawable(resources, HabiticaIconsHelper.imageOfAlertIcon())
+        HabiticaIconsHelper.imageOfAlertIcon().toDrawable(resources)
     }
     val username: String
         get() = binding?.usernameEditText?.text?.toString() ?: ""
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIcons.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIcons.java
index 0384edf2f..c3a7bf8b0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIcons.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIcons.java
@@ -1,22 +1,12 @@
 package com.habitrpg.android.habitica.ui.views;
 
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.BitmapShader;
-import android.graphics.BlurMaskFilter;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.DashPathEffect;
 import android.graphics.Matrix;
 import android.graphics.Paint;
 import android.graphics.Path;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffXfermode;
 import android.graphics.RectF;
-import android.graphics.Shader;
-import android.text.Layout;
-import android.text.StaticLayout;
-import android.text.TextPaint;
 
 import java.util.Stack;
 
@@ -30,10 +20,6 @@ import java.util.Stack;
  * @author Phillip Thelen
  */
 public class HabiticaIcons {
-    private static class GlobalCache {
-        static PaintCodeBitmap rageStrikeNPC = new PaintCodeBitmap();
-        static PorterDuffXfermode blendModeSourceIn = new PorterDuffXfermode(PorterDuff.Mode.SRC_IN);
-    }
 
     // Resizing Behavior
     public enum ResizingBehavior {
@@ -6711,386 +6697,6 @@ public class HabiticaIcons {
         canvas.restore();
     }
 
-    private static class CacheForQuestBackground {
-        private static final Paint paint = new Paint();
-        private static final RectF rectangleRect = new RectF();
-        private static final Path rectanglePath = new Path();
-        private static final RectF group = new RectF();
-        private static final RectF rectangle2Rect = new RectF();
-        private static final Path rectangle2Path = new Path();
-        private static final RectF rectangle3Rect = new RectF();
-        private static final Path rectangle3Path = new Path();
-        private static final RectF group2 = new RectF();
-        private static final RectF rectangle4Rect = new RectF();
-        private static final Path rectangle4Path = new Path();
-        private static final RectF rectangle5Rect = new RectF();
-        private static final Path rectangle5Path = new Path();
-        private static final RectF group3 = new RectF();
-        private static final RectF rectangle6Rect = new RectF();
-        private static final Path rectangle6Path = new Path();
-        private static final RectF rectangle7Rect = new RectF();
-        private static final Path rectangle7Path = new Path();
-        private static final RectF group4 = new RectF();
-        private static final RectF rectangle8Rect = new RectF();
-        private static final Path rectangle8Path = new Path();
-        private static final RectF rectangle9Rect = new RectF();
-        private static final Path rectangle9Path = new Path();
-        private static final RectF rectangle10Rect = new RectF();
-        private static final Path rectangle10Path = new Path();
-        private static final RectF rectangle11Rect = new RectF();
-        private static final Path rectangle11Path = new Path();
-        private static final RectF rectangle12Rect = new RectF();
-        private static final Path rectangle12Path = new Path();
-        private static final RectF rectangle13Rect = new RectF();
-        private static final Path rectangle13Path = new Path();
-        private static final RectF rectangle14Rect = new RectF();
-        private static final Path rectangle14Path = new Path();
-        private static final RectF rectangle15Rect = new RectF();
-        private static final Path rectangle15Path = new Path();
-    }
-
-
-    public static void drawQuestBackground(Canvas canvas, RectF frame, int bossColorDark, int bossColorMedium, int bossColorLight) {
-        // General Declarations
-        Paint paint = CacheForQuestBackground.paint;
-
-        // Rectangle
-        RectF rectangleRect = CacheForQuestBackground.rectangleRect;
-        rectangleRect.set(frame.left,
-                frame.top,
-                frame.left + (float) Math.floor(frame.width() + 0.5f),
-                frame.top + (float) Math.floor(frame.height() + 0.5f));
-        Path rectanglePath = CacheForQuestBackground.rectanglePath;
-        rectanglePath.reset();
-        rectanglePath.moveTo(rectangleRect.left, rectangleRect.top);
-        rectanglePath.lineTo(rectangleRect.right, rectangleRect.top);
-        rectanglePath.lineTo(rectangleRect.right, rectangleRect.bottom);
-        rectanglePath.lineTo(rectangleRect.left, rectangleRect.bottom);
-        rectanglePath.close();
-
-        paint.reset();
-        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-        paint.setStyle(Paint.Style.FILL);
-        paint.setColor(bossColorMedium);
-        canvas.drawPath(rectanglePath, paint);
-
-        // Group
-        {
-            RectF group = CacheForQuestBackground.group;
-            group.set(frame.left + 2f,
-                    frame.bottom - 8f,
-                    frame.left + 8f,
-                    frame.bottom - 2f);
-
-            // Rectangle 2
-            RectF rectangle2Rect = CacheForQuestBackground.rectangle2Rect;
-            rectangle2Rect.set(group.left,
-                    group.top,
-                    group.left + (float) Math.floor(group.width() + 0.5f),
-                    group.top + (float) Math.floor(group.height() + 0.5f));
-            Path rectangle2Path = CacheForQuestBackground.rectangle2Path;
-            rectangle2Path.reset();
-            rectangle2Path.moveTo(rectangle2Rect.left, rectangle2Rect.top);
-            rectangle2Path.lineTo(rectangle2Rect.right, rectangle2Rect.top);
-            rectangle2Path.lineTo(rectangle2Rect.right, rectangle2Rect.bottom);
-            rectangle2Path.lineTo(rectangle2Rect.left, rectangle2Rect.bottom);
-            rectangle2Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(bossColorLight);
-            canvas.drawPath(rectangle2Path, paint);
-
-            // Rectangle 3
-            RectF rectangle3Rect = CacheForQuestBackground.rectangle3Rect;
-            rectangle3Rect.set(group.left + (float) Math.floor(group.width() * 0.33333f + 0.5f),
-                    group.top + (float) Math.floor(group.height() * 0.33333f + 0.5f),
-                    group.left + (float) Math.floor(group.width() * 0.66667f + 0.5f),
-                    group.top + (float) Math.floor(group.height() * 0.66667f + 0.5f));
-            Path rectangle3Path = CacheForQuestBackground.rectangle3Path;
-            rectangle3Path.reset();
-            rectangle3Path.moveTo(rectangle3Rect.left, rectangle3Rect.top);
-            rectangle3Path.lineTo(rectangle3Rect.right, rectangle3Rect.top);
-            rectangle3Path.lineTo(rectangle3Rect.right, rectangle3Rect.bottom);
-            rectangle3Path.lineTo(rectangle3Rect.left, rectangle3Rect.bottom);
-            rectangle3Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(bossColorDark);
-            canvas.drawPath(rectangle3Path, paint);
-        }
-
-        // Group 2
-        {
-            RectF group2 = CacheForQuestBackground.group2;
-            group2.set(frame.left + 2f,
-                    frame.top + 2f,
-                    frame.left + 8f,
-                    frame.top + 8f);
-
-            // Rectangle 4
-            RectF rectangle4Rect = CacheForQuestBackground.rectangle4Rect;
-            rectangle4Rect.set(group2.left,
-                    group2.top,
-                    group2.left + (float) Math.floor(group2.width() + 0.5f),
-                    group2.top + (float) Math.floor(group2.height() + 0.5f));
-            Path rectangle4Path = CacheForQuestBackground.rectangle4Path;
-            rectangle4Path.reset();
-            rectangle4Path.moveTo(rectangle4Rect.left, rectangle4Rect.top);
-            rectangle4Path.lineTo(rectangle4Rect.right, rectangle4Rect.top);
-            rectangle4Path.lineTo(rectangle4Rect.right, rectangle4Rect.bottom);
-            rectangle4Path.lineTo(rectangle4Rect.left, rectangle4Rect.bottom);
-            rectangle4Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(bossColorLight);
-            canvas.drawPath(rectangle4Path, paint);
-
-            // Rectangle 5
-            RectF rectangle5Rect = CacheForQuestBackground.rectangle5Rect;
-            rectangle5Rect.set(group2.left + (float) Math.floor(group2.width() * 0.33333f + 0.5f),
-                    group2.top + (float) Math.floor(group2.height() * 0.33333f + 0.5f),
-                    group2.left + (float) Math.floor(group2.width() * 0.66667f + 0.5f),
-                    group2.top + (float) Math.floor(group2.height() * 0.66667f + 0.5f));
-            Path rectangle5Path = CacheForQuestBackground.rectangle5Path;
-            rectangle5Path.reset();
-            rectangle5Path.moveTo(rectangle5Rect.left, rectangle5Rect.top);
-            rectangle5Path.lineTo(rectangle5Rect.right, rectangle5Rect.top);
-            rectangle5Path.lineTo(rectangle5Rect.right, rectangle5Rect.bottom);
-            rectangle5Path.lineTo(rectangle5Rect.left, rectangle5Rect.bottom);
-            rectangle5Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(bossColorDark);
-            canvas.drawPath(rectangle5Path, paint);
-        }
-
-        // Group 3
-        {
-            RectF group3 = CacheForQuestBackground.group3;
-            group3.set(frame.right - 8f,
-                    frame.top + 2f,
-                    frame.right - 2f,
-                    frame.top + 8f);
-
-            // Rectangle 6
-            RectF rectangle6Rect = CacheForQuestBackground.rectangle6Rect;
-            rectangle6Rect.set(group3.left,
-                    group3.top,
-                    group3.left + (float) Math.floor(group3.width() + 0.5f),
-                    group3.top + (float) Math.floor(group3.height() + 0.5f));
-            Path rectangle6Path = CacheForQuestBackground.rectangle6Path;
-            rectangle6Path.reset();
-            rectangle6Path.moveTo(rectangle6Rect.left, rectangle6Rect.top);
-            rectangle6Path.lineTo(rectangle6Rect.right, rectangle6Rect.top);
-            rectangle6Path.lineTo(rectangle6Rect.right, rectangle6Rect.bottom);
-            rectangle6Path.lineTo(rectangle6Rect.left, rectangle6Rect.bottom);
-            rectangle6Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(bossColorLight);
-            canvas.drawPath(rectangle6Path, paint);
-
-            // Rectangle 7
-            RectF rectangle7Rect = CacheForQuestBackground.rectangle7Rect;
-            rectangle7Rect.set(group3.left + (float) Math.floor(group3.width() * 0.33333f + 0.5f),
-                    group3.top + (float) Math.floor(group3.height() * 0.33333f + 0.5f),
-                    group3.left + (float) Math.floor(group3.width() * 0.66667f + 0.5f),
-                    group3.top + (float) Math.floor(group3.height() * 0.66667f + 0.5f));
-            Path rectangle7Path = CacheForQuestBackground.rectangle7Path;
-            rectangle7Path.reset();
-            rectangle7Path.moveTo(rectangle7Rect.left, rectangle7Rect.top);
-            rectangle7Path.lineTo(rectangle7Rect.right, rectangle7Rect.top);
-            rectangle7Path.lineTo(rectangle7Rect.right, rectangle7Rect.bottom);
-            rectangle7Path.lineTo(rectangle7Rect.left, rectangle7Rect.bottom);
-            rectangle7Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(bossColorDark);
-            canvas.drawPath(rectangle7Path, paint);
-        }
-
-        // Group 4
-        {
-            RectF group4 = CacheForQuestBackground.group4;
-            group4.set(frame.right - 8f,
-                    frame.bottom - 8f,
-                    frame.right - 2f,
-                    frame.bottom - 2f);
-
-            // Rectangle 8
-            RectF rectangle8Rect = CacheForQuestBackground.rectangle8Rect;
-            rectangle8Rect.set(group4.left,
-                    group4.top,
-                    group4.left + (float) Math.floor(group4.width() + 0.5f),
-                    group4.top + (float) Math.floor(group4.height() + 0.5f));
-            Path rectangle8Path = CacheForQuestBackground.rectangle8Path;
-            rectangle8Path.reset();
-            rectangle8Path.moveTo(rectangle8Rect.left, rectangle8Rect.top);
-            rectangle8Path.lineTo(rectangle8Rect.right, rectangle8Rect.top);
-            rectangle8Path.lineTo(rectangle8Rect.right, rectangle8Rect.bottom);
-            rectangle8Path.lineTo(rectangle8Rect.left, rectangle8Rect.bottom);
-            rectangle8Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(bossColorLight);
-            canvas.drawPath(rectangle8Path, paint);
-
-            // Rectangle 9
-            RectF rectangle9Rect = CacheForQuestBackground.rectangle9Rect;
-            rectangle9Rect.set(group4.left + (float) Math.floor(group4.width() * 0.33333f + 0.5f),
-                    group4.top + (float) Math.floor(group4.height() * 0.33333f + 0.5f),
-                    group4.left + (float) Math.floor(group4.width() * 0.66667f + 0.5f),
-                    group4.top + (float) Math.floor(group4.height() * 0.66667f + 0.5f));
-            Path rectangle9Path = CacheForQuestBackground.rectangle9Path;
-            rectangle9Path.reset();
-            rectangle9Path.moveTo(rectangle9Rect.left, rectangle9Rect.top);
-            rectangle9Path.lineTo(rectangle9Rect.right, rectangle9Rect.top);
-            rectangle9Path.lineTo(rectangle9Rect.right, rectangle9Rect.bottom);
-            rectangle9Path.lineTo(rectangle9Rect.left, rectangle9Rect.bottom);
-            rectangle9Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(bossColorDark);
-            canvas.drawPath(rectangle9Path, paint);
-        }
-
-        // Rectangle 10
-        RectF rectangle10Rect = CacheForQuestBackground.rectangle10Rect;
-        rectangle10Rect.set(frame.right - 4f,
-                frame.top + 10f,
-                frame.right - 2f,
-                frame.bottom - 10f);
-        Path rectangle10Path = CacheForQuestBackground.rectangle10Path;
-        rectangle10Path.reset();
-        rectangle10Path.moveTo(rectangle10Rect.left, rectangle10Rect.top);
-        rectangle10Path.lineTo(rectangle10Rect.right, rectangle10Rect.top);
-        rectangle10Path.lineTo(rectangle10Rect.right, rectangle10Rect.bottom);
-        rectangle10Path.lineTo(rectangle10Rect.left, rectangle10Rect.bottom);
-        rectangle10Path.close();
-
-        paint.reset();
-        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-        paint.setStyle(Paint.Style.FILL);
-        paint.setColor(bossColorLight);
-        canvas.drawPath(rectangle10Path, paint);
-
-        // Rectangle 11
-        RectF rectangle11Rect = CacheForQuestBackground.rectangle11Rect;
-        rectangle11Rect.set(frame.left + 10f,
-                frame.bottom - 4f,
-                frame.right - 10f,
-                frame.bottom - 2f);
-        Path rectangle11Path = CacheForQuestBackground.rectangle11Path;
-        rectangle11Path.reset();
-        rectangle11Path.moveTo(rectangle11Rect.left, rectangle11Rect.top);
-        rectangle11Path.lineTo(rectangle11Rect.right, rectangle11Rect.top);
-        rectangle11Path.lineTo(rectangle11Rect.right, rectangle11Rect.bottom);
-        rectangle11Path.lineTo(rectangle11Rect.left, rectangle11Rect.bottom);
-        rectangle11Path.close();
-
-        paint.reset();
-        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-        paint.setStyle(Paint.Style.FILL);
-        paint.setColor(bossColorLight);
-        canvas.drawPath(rectangle11Path, paint);
-
-        // Rectangle 12
-        RectF rectangle12Rect = CacheForQuestBackground.rectangle12Rect;
-        rectangle12Rect.set(frame.left + 10f,
-                frame.top + 2f,
-                frame.right - 10f,
-                frame.top + 4f);
-        Path rectangle12Path = CacheForQuestBackground.rectangle12Path;
-        rectangle12Path.reset();
-        rectangle12Path.moveTo(rectangle12Rect.left, rectangle12Rect.top);
-        rectangle12Path.lineTo(rectangle12Rect.right, rectangle12Rect.top);
-        rectangle12Path.lineTo(rectangle12Rect.right, rectangle12Rect.bottom);
-        rectangle12Path.lineTo(rectangle12Rect.left, rectangle12Rect.bottom);
-        rectangle12Path.close();
-
-        paint.reset();
-        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-        paint.setStyle(Paint.Style.FILL);
-        paint.setColor(bossColorLight);
-        canvas.drawPath(rectangle12Path, paint);
-
-        // Rectangle 13
-        RectF rectangle13Rect = CacheForQuestBackground.rectangle13Rect;
-        rectangle13Rect.set(frame.left + 10f,
-                frame.top + 4f,
-                frame.right - 10f,
-                frame.bottom - 4f);
-        Path rectangle13Path = CacheForQuestBackground.rectangle13Path;
-        rectangle13Path.reset();
-        rectangle13Path.moveTo(rectangle13Rect.left, rectangle13Rect.top);
-        rectangle13Path.lineTo(rectangle13Rect.right, rectangle13Rect.top);
-        rectangle13Path.lineTo(rectangle13Rect.right, rectangle13Rect.bottom);
-        rectangle13Path.lineTo(rectangle13Rect.left, rectangle13Rect.bottom);
-        rectangle13Path.close();
-
-        paint.reset();
-        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-        paint.setStyle(Paint.Style.FILL);
-        paint.setColor(bossColorDark);
-        canvas.drawPath(rectangle13Path, paint);
-
-        // Rectangle 14
-        RectF rectangle14Rect = CacheForQuestBackground.rectangle14Rect;
-        rectangle14Rect.set(frame.left + 4f,
-                frame.top + 10f,
-                frame.right - 4f,
-                frame.bottom - 10f);
-        Path rectangle14Path = CacheForQuestBackground.rectangle14Path;
-        rectangle14Path.reset();
-        rectangle14Path.moveTo(rectangle14Rect.left, rectangle14Rect.top);
-        rectangle14Path.lineTo(rectangle14Rect.right, rectangle14Rect.top);
-        rectangle14Path.lineTo(rectangle14Rect.right, rectangle14Rect.bottom);
-        rectangle14Path.lineTo(rectangle14Rect.left, rectangle14Rect.bottom);
-        rectangle14Path.close();
-
-        paint.reset();
-        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-        paint.setStyle(Paint.Style.FILL);
-        paint.setColor(bossColorDark);
-        canvas.drawPath(rectangle14Path, paint);
-
-        // Rectangle 15
-        RectF rectangle15Rect = CacheForQuestBackground.rectangle15Rect;
-        rectangle15Rect.set(frame.left + 2f,
-                frame.top + 10f,
-                frame.left + 4f,
-                frame.bottom - 10f);
-        Path rectangle15Path = CacheForQuestBackground.rectangle15Path;
-        rectangle15Path.reset();
-        rectangle15Path.moveTo(rectangle15Rect.left, rectangle15Rect.top);
-        rectangle15Path.lineTo(rectangle15Rect.right, rectangle15Rect.top);
-        rectangle15Path.lineTo(rectangle15Rect.right, rectangle15Rect.bottom);
-        rectangle15Path.lineTo(rectangle15Rect.left, rectangle15Rect.bottom);
-        rectangle15Path.close();
-
-        paint.reset();
-        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-        paint.setStyle(Paint.Style.FILL);
-        paint.setColor(bossColorLight);
-        canvas.drawPath(rectangle15Path, paint);
-    }
-
     private static class CacheForDamage {
         private static final Paint paint = new Paint();
         private static final RectF originalFrame = new RectF(0f, 0f, 18f, 18f);
@@ -7680,7 +7286,7 @@ public class HabiticaIcons {
         canvas.scale(resizedFrame.width() / 16f, resizedFrame.height() / 16f);
 
         // Bezier
-        canvas.saveLayerAlpha(null, 138, Canvas.ALL_SAVE_FLAG);
+        canvas.saveLayerAlpha(null, 138);
         {
             canvas.translate(8f, 8f);
             currentTransformation.peek().postTranslate(8f, 8f);
@@ -7711,617 +7317,6 @@ public class HabiticaIcons {
         canvas.restore();
     }
 
-    private static class CacheForRageStrikeInactive {
-        private static final Paint paint = new Paint();
-        private static final RectF originalFrame = new RectF(0f, 0f, 63f, 82f);
-        private static final RectF resizedFrame = new RectF();
-        private static final RectF bezier2Rect = new RectF();
-        private static final Path bezier2Path = new Path();
-        private static final RectF bezier4Rect = new RectF();
-        private static final Path bezier4Path = new Path();
-        private static final RectF bezierRect = new RectF();
-        private static final Path bezierPath = new Path();
-        private static final RectF labelRect = new RectF();
-        private static final Path labelPath = new Path();
-    }
-
-    public static void drawRageStrikeInactive(Canvas canvas) {
-        HabiticaIcons.drawRageStrikeInactive(canvas, new RectF(0f, 0f, 63f, 82f), ResizingBehavior.AspectFit);
-    }
-
-    public static void drawRageStrikeInactive(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
-        // General Declarations
-        Paint paint = CacheForRageStrikeInactive.paint;
-
-        // Local Colors
-        int strokeColor14 = Color.argb(255, 255, 148, 76);
-        int strokeColor13 = Color.argb(255, 244, 120, 37);
-        int fillColor91 = Color.argb(255, 255, 200, 167);
-        int textForeground = Color.argb(255, 183, 90, 28);
-
-        // Resize to Target Frame
-        canvas.save();
-        RectF resizedFrame = CacheForRageStrikeInactive.resizedFrame;
-        HabiticaIcons.resizingBehaviorApply(resizing, CacheForRageStrikeInactive.originalFrame, targetFrame, resizedFrame);
-        canvas.translate(resizedFrame.left, resizedFrame.top);
-        canvas.scale(resizedFrame.width() / 63f, resizedFrame.height() / 82f);
-
-        // Group 3
-        {
-            // Bezier 2
-            RectF bezier2Rect = CacheForRageStrikeInactive.bezier2Rect;
-            bezier2Rect.set(17f, 21f, 45f, 61f);
-            Path bezier2Path = CacheForRageStrikeInactive.bezier2Path;
-            bezier2Path.reset();
-            bezier2Path.moveTo(17f, 48.08f);
-            bezier2Path.lineTo(21.6f, 41f);
-            bezier2Path.lineTo(17f, 33.92f);
-            bezier2Path.lineTo(31f, 21f);
-            bezier2Path.lineTo(45f, 33.92f);
-            bezier2Path.lineTo(40.4f, 41f);
-            bezier2Path.lineTo(45f, 48.08f);
-            bezier2Path.lineTo(31f, 61f);
-            bezier2Path.lineTo(17f, 48.08f);
-            bezier2Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStrokeWidth(16f);
-            paint.setStrokeMiter(10f);
-            canvas.save();
-            paint.setStyle(Paint.Style.STROKE);
-            paint.setColor(strokeColor13);
-            canvas.drawPath(bezier2Path, paint);
-            canvas.restore();
-
-            // Bezier 4
-            RectF bezier4Rect = CacheForRageStrikeInactive.bezier4Rect;
-            bezier4Rect.set(17f, 21f, 45f, 61f);
-            Path bezier4Path = CacheForRageStrikeInactive.bezier4Path;
-            bezier4Path.reset();
-            bezier4Path.moveTo(17f, 48.08f);
-            bezier4Path.lineTo(21.6f, 41f);
-            bezier4Path.lineTo(17f, 33.92f);
-            bezier4Path.lineTo(31f, 21f);
-            bezier4Path.lineTo(45f, 33.92f);
-            bezier4Path.lineTo(40.4f, 41f);
-            bezier4Path.lineTo(45f, 48.08f);
-            bezier4Path.lineTo(31f, 61f);
-            bezier4Path.lineTo(17f, 48.08f);
-            bezier4Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStrokeWidth(8f);
-            paint.setStrokeMiter(10f);
-            canvas.save();
-            paint.setStyle(Paint.Style.STROKE);
-            paint.setColor(strokeColor14);
-            canvas.drawPath(bezier4Path, paint);
-            canvas.restore();
-
-            // Bezier
-            RectF bezierRect = CacheForRageStrikeInactive.bezierRect;
-            bezierRect.set(17f, 21f, 45f, 61f);
-            Path bezierPath = CacheForRageStrikeInactive.bezierPath;
-            bezierPath.reset();
-            bezierPath.moveTo(17f, 48.08f);
-            bezierPath.lineTo(21.6f, 41f);
-            bezierPath.lineTo(17f, 33.92f);
-            bezierPath.lineTo(31f, 21f);
-            bezierPath.lineTo(45f, 33.92f);
-            bezierPath.lineTo(40.4f, 41f);
-            bezierPath.lineTo(45f, 48.08f);
-            bezierPath.lineTo(31f, 61f);
-            bezierPath.lineTo(17f, 48.08f);
-            bezierPath.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(fillColor91);
-            canvas.drawPath(bezierPath, paint);
-
-            // Label
-            RectF labelRect = CacheForRageStrikeInactive.labelRect;
-            labelRect.set(27.1f, 34.38f, 35.8f, 49f);
-            Path labelPath = CacheForRageStrikeInactive.labelPath;
-            labelPath.reset();
-            labelPath.moveTo(30.36f, 46.78f);
-            labelPath.lineTo(30.36f, 49f);
-            labelPath.lineTo(32.58f, 49f);
-            labelPath.lineTo(32.58f, 46.78f);
-            labelPath.lineTo(30.36f, 46.78f);
-            labelPath.close();
-            labelPath.moveTo(27.1f, 39.18f);
-            labelPath.lineTo(28.8f, 39.18f);
-            labelPath.cubicTo(28.8f, 38.71f, 28.85f, 38.28f, 28.96f, 37.88f);
-            labelPath.cubicTo(29.07f, 37.48f, 29.24f, 37.13f, 29.47f, 36.84f);
-            labelPath.cubicTo(29.7f, 36.55f, 29.99f, 36.31f, 30.34f, 36.14f);
-            labelPath.cubicTo(30.69f, 35.97f, 31.1f, 35.88f, 31.58f, 35.88f);
-            labelPath.cubicTo(32.3f, 35.88f, 32.87f, 36.09f, 33.29f, 36.5f);
-            labelPath.cubicTo(33.71f, 36.91f, 33.95f, 37.49f, 34f, 38.22f);
-            labelPath.cubicTo(34.03f, 38.71f, 33.97f, 39.13f, 33.82f, 39.48f);
-            labelPath.cubicTo(33.67f, 39.83f, 33.48f, 40.14f, 33.23f, 40.43f);
-            labelPath.cubicTo(32.98f, 40.72f, 32.72f, 40.99f, 32.43f, 41.25f);
-            labelPath.cubicTo(32.14f, 41.51f, 31.87f, 41.79f, 31.61f, 42.1f);
-            labelPath.cubicTo(31.35f, 42.41f, 31.13f, 42.76f, 30.95f, 43.15f);
-            labelPath.cubicTo(30.77f, 43.54f, 30.67f, 44.02f, 30.64f, 44.58f);
-            labelPath.lineTo(30.64f, 45.52f);
-            labelPath.lineTo(32.34f, 45.52f);
-            labelPath.lineTo(32.34f, 44.74f);
-            labelPath.cubicTo(32.34f, 44.39f, 32.39f, 44.08f, 32.49f, 43.81f);
-            labelPath.cubicTo(32.59f, 43.54f, 32.72f, 43.28f, 32.89f, 43.05f);
-            labelPath.cubicTo(33.06f, 42.82f, 33.24f, 42.6f, 33.45f, 42.39f);
-            labelPath.cubicTo(33.66f, 42.18f, 33.87f, 41.98f, 34.08f, 41.78f);
-            labelPath.cubicTo(34.29f, 41.57f, 34.5f, 41.35f, 34.71f, 41.12f);
-            labelPath.cubicTo(34.92f, 40.89f, 35.1f, 40.65f, 35.26f, 40.38f);
-            labelPath.cubicTo(35.42f, 40.11f, 35.55f, 39.82f, 35.65f, 39.49f);
-            labelPath.cubicTo(35.75f, 39.16f, 35.8f, 38.79f, 35.8f, 38.38f);
-            labelPath.cubicTo(35.8f, 37.74f, 35.7f, 37.17f, 35.49f, 36.68f);
-            labelPath.cubicTo(35.28f, 36.19f, 34.99f, 35.77f, 34.62f, 35.43f);
-            labelPath.cubicTo(34.25f, 35.09f, 33.8f, 34.83f, 33.29f, 34.65f);
-            labelPath.cubicTo(32.78f, 34.47f, 32.21f, 34.38f, 31.58f, 34.38f);
-            labelPath.cubicTo(30.89f, 34.38f, 30.26f, 34.5f, 29.7f, 34.74f);
-            labelPath.cubicTo(29.14f, 34.98f, 28.67f, 35.32f, 28.28f, 35.75f);
-            labelPath.cubicTo(27.89f, 36.18f, 27.6f, 36.69f, 27.39f, 37.28f);
-            labelPath.cubicTo(27.18f, 37.87f, 27.09f, 38.5f, 27.1f, 39.18f);
-            labelPath.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(textForeground);
-            canvas.drawPath(labelPath, paint);
-        }
-
-        canvas.restore();
-    }
-
-    private static class CacheForRageStrikeActive {
-        private static final Paint paint = new Paint();
-        private static final RectF originalFrame = new RectF(0f, 0f, 63f, 82f);
-        private static final RectF resizedFrame = new RectF();
-        private static final RectF bezierRect = new RectF();
-        private static final Path bezierPath = new Path();
-        private static final RectF bezier3Rect = new RectF();
-        private static final Path bezier3Path = new Path();
-        private static final RectF bezier2Rect = new RectF();
-        private static final Path bezier2Path = new Path();
-    }
-
-    public static void drawRageStrikeActive(Canvas canvas, Context context, Bitmap rageStrikeNPC) {
-        HabiticaIcons.drawRageStrikeActive(canvas, context, new RectF(0f, 0f, 63f, 82f), ResizingBehavior.AspectFit, rageStrikeNPC);
-    }
-
-    public static void drawRageStrikeActive(Canvas canvas, Context context, RectF targetFrame, ResizingBehavior resizing, Bitmap rageStrikeNPC) {
-        // General Declarations
-        float displayDensity = context.getResources().getDisplayMetrics().density;
-        Paint paint = CacheForRageStrikeActive.paint;
-
-        // Local Colors
-        int strokeColor14 = Color.argb(255, 255, 148, 76);
-        int strokeColor13 = Color.argb(255, 244, 120, 37);
-
-        // Local Images
-        PaintCodeBitmap pc_rageStrikeNPC = GlobalCache.rageStrikeNPC.get(rageStrikeNPC);
-
-        // Resize to Target Frame
-        canvas.save();
-        RectF resizedFrame = CacheForRageStrikeActive.resizedFrame;
-        HabiticaIcons.resizingBehaviorApply(resizing, CacheForRageStrikeActive.originalFrame, targetFrame, resizedFrame);
-        canvas.translate(resizedFrame.left, resizedFrame.top);
-        canvas.scale(resizedFrame.width() / 63f, resizedFrame.height() / 82f);
-
-        // Bezier
-        RectF bezierRect = CacheForRageStrikeActive.bezierRect;
-        bezierRect.set(10.39f, 10.89f, 52.39f, 70.89f);
-        Path bezierPath = CacheForRageStrikeActive.bezierPath;
-        bezierPath.reset();
-        bezierPath.moveTo(10.39f, 51.5f);
-        bezierPath.lineTo(17.28f, 40.89f);
-        bezierPath.lineTo(10.39f, 30.27f);
-        bezierPath.lineTo(31.39f, 10.89f);
-        bezierPath.lineTo(52.39f, 30.27f);
-        bezierPath.lineTo(45.49f, 40.89f);
-        bezierPath.lineTo(52.39f, 51.5f);
-        bezierPath.lineTo(31.39f, 70.89f);
-        bezierPath.lineTo(10.39f, 51.5f);
-        bezierPath.close();
-
-        paint.reset();
-        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-        paint.setStrokeWidth(16f);
-        paint.setStrokeMiter(10f);
-        canvas.save();
-        paint.setStyle(Paint.Style.STROKE);
-        paint.setColor(strokeColor13);
-        canvas.drawPath(bezierPath, paint);
-        canvas.restore();
-
-        // Bezier 3
-        RectF bezier3Rect = CacheForRageStrikeActive.bezier3Rect;
-        bezier3Rect.set(10.39f, 10.89f, 52.39f, 70.89f);
-        Path bezier3Path = CacheForRageStrikeActive.bezier3Path;
-        bezier3Path.reset();
-        bezier3Path.moveTo(10.39f, 51.5f);
-        bezier3Path.lineTo(17.28f, 40.89f);
-        bezier3Path.lineTo(10.39f, 30.27f);
-        bezier3Path.lineTo(31.39f, 10.89f);
-        bezier3Path.lineTo(52.39f, 30.27f);
-        bezier3Path.lineTo(45.49f, 40.89f);
-        bezier3Path.lineTo(52.39f, 51.5f);
-        bezier3Path.lineTo(31.39f, 70.89f);
-        bezier3Path.lineTo(10.39f, 51.5f);
-        bezier3Path.close();
-
-        paint.reset();
-        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-        paint.setStrokeWidth(8f);
-        paint.setStrokeMiter(10f);
-        canvas.save();
-        paint.setStyle(Paint.Style.STROKE);
-        paint.setColor(strokeColor14);
-        canvas.drawPath(bezier3Path, paint);
-        canvas.restore();
-
-        // Bezier 2
-        RectF bezier2Rect = CacheForRageStrikeActive.bezier2Rect;
-        bezier2Rect.set(10f, 11f, 52f, 71f);
-        Path bezier2Path = CacheForRageStrikeActive.bezier2Path;
-        bezier2Path.reset();
-        bezier2Path.moveTo(10f, 51.61f);
-        bezier2Path.lineTo(16.9f, 41f);
-        bezier2Path.lineTo(10f, 30.39f);
-        bezier2Path.lineTo(31f, 11f);
-        bezier2Path.lineTo(52f, 30.39f);
-        bezier2Path.lineTo(45.1f, 41f);
-        bezier2Path.lineTo(52f, 51.61f);
-        bezier2Path.lineTo(31f, 71f);
-        bezier2Path.lineTo(10f, 51.61f);
-        bezier2Path.close();
-
-        paint.reset();
-        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-        paint.setShader(pc_rageStrikeNPC.getShader());
-
-        canvas.save();
-        canvas.clipPath(bezier2Path);
-        canvas.translate(bezier2Rect.left - 27f, bezier2Rect.top - 18f);
-        canvas.scale(1 / displayDensity, 1 / displayDensity);
-        canvas.clipRect(pc_rageStrikeNPC.getBounds());
-        canvas.drawPaint(paint);
-        canvas.restore();
-
-        canvas.restore();
-    }
-
-    private static class CacheForRage {
-        private static final Paint paint = new Paint();
-        private static final RectF originalFrame = new RectF(0f, 0f, 18f, 18f);
-        private static final RectF resizedFrame = new RectF();
-        private static final RectF bezierRect = new RectF();
-        private static final Path bezierPath = new Path();
-        private static final RectF bezier2Rect = new RectF();
-        private static final Path bezier2Path = new Path();
-        private static final RectF bezier3Rect = new RectF();
-        private static final Path bezier3Path = new Path();
-        private static final RectF bezier4Rect = new RectF();
-        private static final Path bezier4Path = new Path();
-        private static final RectF bezier5Rect = new RectF();
-        private static final Path bezier5Path = new Path();
-        private static final RectF bezier6Rect = new RectF();
-        private static final Path bezier6Path = new Path();
-        private static final RectF bezier7Rect = new RectF();
-        private static final Path bezier7Path = new Path();
-        private static final RectF bezier8Rect = new RectF();
-        private static final Path bezier8Path = new Path();
-        private static final RectF bezier9Rect = new RectF();
-        private static final Path bezier9Path = new Path();
-        private static final RectF bezier10Rect = new RectF();
-        private static final Path bezier10Path = new Path();
-        private static final RectF bezier11Rect = new RectF();
-        private static final Path bezier11Path = new Path();
-        private static final RectF bezier12Rect = new RectF();
-        private static final Path bezier12Path = new Path();
-        private static final RectF bezier13Rect = new RectF();
-        private static final Path bezier13Path = new Path();
-        private static final RectF bezier14Rect = new RectF();
-        private static final Path bezier14Path = new Path();
-    }
-
-    public static void drawRage(Canvas canvas) {
-        HabiticaIcons.drawRage(canvas, new RectF(0f, 0f, 18f, 18f), ResizingBehavior.AspectFit);
-    }
-
-    public static void drawRage(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
-        // General Declarations
-        Paint paint = CacheForRage.paint;
-
-        // Local Colors
-        int fillColor14 = Color.argb(255, 36, 204, 143);
-        int fillColor93 = Color.argb(255, 244, 120, 37);
-        int fillColor94 = Color.argb(89, 180, 89, 27);
-        int fillColor3 = Color.argb(128, 255, 255, 255);
-        int fillColor92 = Color.argb(255, 90, 228, 178);
-        int fillColor5 = Color.argb(64, 255, 255, 255);
-        int fillColor15 = Color.argb(89, 27, 153, 107);
-
-        // Resize to Target Frame
-        canvas.save();
-        RectF resizedFrame = CacheForRage.resizedFrame;
-        HabiticaIcons.resizingBehaviorApply(resizing, CacheForRage.originalFrame, targetFrame, resizedFrame);
-        canvas.translate(resizedFrame.left, resizedFrame.top);
-        canvas.scale(resizedFrame.width() / 18f, resizedFrame.height() / 18f);
-
-        // Group
-        {
-            // Bezier
-            RectF bezierRect = CacheForRage.bezierRect;
-            bezierRect.set(2f, 1f, 15.33f, 17f);
-            Path bezierPath = CacheForRage.bezierPath;
-            bezierPath.reset();
-            bezierPath.moveTo(2f, 7f);
-            bezierPath.lineTo(8.67f, 1f);
-            bezierPath.lineTo(15.33f, 7f);
-            bezierPath.lineTo(8.67f, 17f);
-            bezierPath.lineTo(2f, 7f);
-            bezierPath.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(fillColor14);
-            canvas.drawPath(bezierPath, paint);
-
-            // Bezier 2
-            RectF bezier2Rect = CacheForRage.bezier2Rect;
-            bezier2Rect.set(2f, 1f, 15.33f, 17f);
-            Path bezier2Path = CacheForRage.bezier2Path;
-            bezier2Path.reset();
-            bezier2Path.moveTo(2f, 7f);
-            bezier2Path.lineTo(8.67f, 1f);
-            bezier2Path.lineTo(15.33f, 7f);
-            bezier2Path.lineTo(8.67f, 17f);
-            bezier2Path.lineTo(2f, 7f);
-            bezier2Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(fillColor14);
-            canvas.drawPath(bezier2Path, paint);
-
-            // Bezier 3
-            RectF bezier3Rect = CacheForRage.bezier3Rect;
-            bezier3Rect.set(8.67f, 2.8f, 13.6f, 7.2f);
-            Path bezier3Path = CacheForRage.bezier3Path;
-            bezier3Path.reset();
-            bezier3Path.moveTo(13.6f, 7.2f);
-            bezier3Path.lineTo(8.67f, 6.2f);
-            bezier3Path.lineTo(8.67f, 2.8f);
-            bezier3Path.lineTo(13.6f, 7.2f);
-            bezier3Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(fillColor5);
-            canvas.drawPath(bezier3Path, paint);
-
-            // Bezier 4
-            RectF bezier4Rect = CacheForRage.bezier4Rect;
-            bezier4Rect.set(3.73f, 2.8f, 8.67f, 7.2f);
-            Path bezier4Path = CacheForRage.bezier4Path;
-            bezier4Path.reset();
-            bezier4Path.moveTo(8.67f, 6.2f);
-            bezier4Path.lineTo(3.73f, 7.2f);
-            bezier4Path.lineTo(8.67f, 2.8f);
-            bezier4Path.lineTo(8.67f, 6.2f);
-            bezier4Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(fillColor3);
-            canvas.drawPath(bezier4Path, paint);
-
-            // Bezier 5
-            RectF bezier5Rect = CacheForRage.bezier5Rect;
-            bezier5Rect.set(3.73f, 6.2f, 8.67f, 14.6f);
-            Path bezier5Path = CacheForRage.bezier5Path;
-            bezier5Path.reset();
-            bezier5Path.moveTo(8.67f, 6.2f);
-            bezier5Path.lineTo(8.67f, 14.6f);
-            bezier5Path.lineTo(3.73f, 7.2f);
-            bezier5Path.lineTo(8.67f, 6.2f);
-            bezier5Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(fillColor92);
-            canvas.drawPath(bezier5Path, paint);
-
-            // Bezier 6
-            RectF bezier6Rect = CacheForRage.bezier6Rect;
-            bezier6Rect.set(8.67f, 6.2f, 13.6f, 14.6f);
-            Path bezier6Path = CacheForRage.bezier6Path;
-            bezier6Path.reset();
-            bezier6Path.moveTo(13.6f, 7.2f);
-            bezier6Path.lineTo(8.67f, 14.6f);
-            bezier6Path.lineTo(8.67f, 6.2f);
-            bezier6Path.lineTo(13.6f, 7.2f);
-            bezier6Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(fillColor15);
-            canvas.drawPath(bezier6Path, paint);
-
-            // Bezier 7
-            RectF bezier7Rect = CacheForRage.bezier7Rect;
-            bezier7Rect.set(2f, 1f, 15.33f, 17f);
-            Path bezier7Path = CacheForRage.bezier7Path;
-            bezier7Path.reset();
-            bezier7Path.moveTo(15.33f, 7f);
-            bezier7Path.lineTo(8.67f, 1f);
-            bezier7Path.lineTo(2f, 7f);
-            bezier7Path.lineTo(3.33f, 9f);
-            bezier7Path.lineTo(2f, 11f);
-            bezier7Path.lineTo(8.67f, 17f);
-            bezier7Path.lineTo(15.33f, 11f);
-            bezier7Path.lineTo(14f, 9f);
-            bezier7Path.lineTo(15.33f, 7f);
-            bezier7Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(fillColor93);
-            canvas.drawPath(bezier7Path, paint);
-
-            // Bezier 8
-            RectF bezier8Rect = CacheForRage.bezier8Rect;
-            bezier8Rect.set(8.67f, 2.8f, 13.6f, 7.2f);
-            Path bezier8Path = CacheForRage.bezier8Path;
-            bezier8Path.reset();
-            bezier8Path.moveTo(13.6f, 7.2f);
-            bezier8Path.lineTo(8.67f, 6.2f);
-            bezier8Path.lineTo(8.67f, 2.8f);
-            bezier8Path.lineTo(13.6f, 7.2f);
-            bezier8Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(fillColor5);
-            canvas.drawPath(bezier8Path, paint);
-
-            // Bezier 9
-            RectF bezier9Rect = CacheForRage.bezier9Rect;
-            bezier9Rect.set(3.73f, 2.8f, 8.67f, 7.2f);
-            Path bezier9Path = CacheForRage.bezier9Path;
-            bezier9Path.reset();
-            bezier9Path.moveTo(8.67f, 6.2f);
-            bezier9Path.lineTo(3.73f, 7.2f);
-            bezier9Path.lineTo(8.67f, 2.8f);
-            bezier9Path.lineTo(8.67f, 6.2f);
-            bezier9Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(fillColor3);
-            canvas.drawPath(bezier9Path, paint);
-
-            // Bezier 10
-            RectF bezier10Rect = CacheForRage.bezier10Rect;
-            bezier10Rect.set(3.73f, 3.4f, 13.6f, 14.6f);
-            Path bezier10Path = CacheForRage.bezier10Path;
-            bezier10Path.reset();
-            bezier10Path.moveTo(8.67f, 6.2f);
-            bezier10Path.lineTo(8.67f, 14.6f);
-            bezier10Path.lineTo(7.37f, 12.65f);
-            bezier10Path.lineTo(3.73f, 7.2f);
-            bezier10Path.lineTo(8.67f, 6.2f);
-            bezier10Path.close();
-            bezier10Path.moveTo(8.67f, 11.8f);
-            bezier10Path.lineTo(8.67f, 3.4f);
-            bezier10Path.lineTo(9.96f, 5.35f);
-            bezier10Path.lineTo(13.6f, 10.8f);
-            bezier10Path.lineTo(8.67f, 11.8f);
-            bezier10Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(fillColor5);
-            canvas.drawPath(bezier10Path, paint);
-
-            // Bezier 11
-            RectF bezier11Rect = CacheForRage.bezier11Rect;
-            bezier11Rect.set(3.73f, 6.2f, 13.6f, 15.2f);
-            Path bezier11Path = CacheForRage.bezier11Path;
-            bezier11Path.reset();
-            bezier11Path.moveTo(13.6f, 7.2f);
-            bezier11Path.lineTo(8.67f, 14.6f);
-            bezier11Path.lineTo(8.67f, 6.2f);
-            bezier11Path.lineTo(13.6f, 7.2f);
-            bezier11Path.close();
-            bezier11Path.moveTo(3.73f, 10.8f);
-            bezier11Path.lineTo(8.67f, 11.8f);
-            bezier11Path.lineTo(8.67f, 15.2f);
-            bezier11Path.lineTo(3.73f, 10.8f);
-            bezier11Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(fillColor94);
-            canvas.drawPath(bezier11Path, paint);
-
-            // Bezier 12
-            RectF bezier12Rect = CacheForRage.bezier12Rect;
-            bezier12Rect.set(8.67f, 10.8f, 13.6f, 15.2f);
-            Path bezier12Path = CacheForRage.bezier12Path;
-            bezier12Path.reset();
-            bezier12Path.moveTo(8.67f, 11.8f);
-            bezier12Path.lineTo(13.6f, 10.8f);
-            bezier12Path.lineTo(8.67f, 15.2f);
-            bezier12Path.lineTo(8.67f, 11.8f);
-            bezier12Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(fillColor3);
-            canvas.drawPath(bezier12Path, paint);
-
-            // Bezier 13
-            RectF bezier13Rect = CacheForRage.bezier13Rect;
-            bezier13Rect.set(3.73f, 3.4f, 8.67f, 11.8f);
-            Path bezier13Path = CacheForRage.bezier13Path;
-            bezier13Path.reset();
-            bezier13Path.moveTo(3.73f, 10.8f);
-            bezier13Path.lineTo(8.67f, 3.4f);
-            bezier13Path.lineTo(8.67f, 11.8f);
-            bezier13Path.lineTo(3.73f, 10.8f);
-            bezier13Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(fillColor5);
-            canvas.drawPath(bezier13Path, paint);
-
-            // Bezier 14
-            RectF bezier14Rect = CacheForRage.bezier14Rect;
-            bezier14Rect.set(5.5f, 4.67f, 11.83f, 13.33f);
-            Path bezier14Path = CacheForRage.bezier14Path;
-            bezier14Path.reset();
-            bezier14Path.moveTo(5.5f, 10.53f);
-            bezier14Path.lineTo(6.54f, 9f);
-            bezier14Path.lineTo(5.5f, 7.47f);
-            bezier14Path.lineTo(8.67f, 4.67f);
-            bezier14Path.lineTo(11.83f, 7.47f);
-            bezier14Path.lineTo(10.79f, 9f);
-            bezier14Path.lineTo(11.83f, 10.53f);
-            bezier14Path.lineTo(8.67f, 13.33f);
-            bezier14Path.lineTo(5.5f, 10.53f);
-            bezier14Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(fillColor3);
-            canvas.drawPath(bezier14Path, paint);
-        }
-
-        canvas.restore();
-    }
-
     private static class CacheForTaskDifficultyStars {
         private static final RectF originalFrame = new RectF(0f, 0f, 36f, 36f);
         private static final RectF resizedFrame = new RectF();
@@ -8693,560 +7688,6 @@ public class HabiticaIcons {
         canvas.restore();
     }
 
-    private static class CacheForGuildCrest {
-        private static final Paint paint = new Paint();
-        private static final RectF originalFrame = new RectF(0f, 0f, 40f, 38f);
-        private static final RectF resizedFrame = new RectF();
-        private static final RectF group = new RectF();
-        private static final Path clip5Path = new Path();
-        private static final RectF rectangleRect = new RectF();
-        private static final Path rectanglePath = new Path();
-        private static final RectF rectangle2Rect = new RectF();
-        private static final Path rectangle2Path = new Path();
-        private static final RectF rectangle4Rect = new RectF();
-        private static final Path rectangle4Path = new Path();
-        private static final RectF bezier2Rect = new RectF();
-        private static final Path bezier2Path = new Path();
-        private static final RectF bezier4Rect = new RectF();
-        private static final Path bezier4Path = new Path();
-        private static final RectF bezier7Rect = new RectF();
-        private static final Path bezier7Path = new Path();
-        private static final RectF bezier8Rect = new RectF();
-        private static final Path bezier8Path = new Path();
-        private static final RectF group8 = new RectF();
-        private static final Path clip14Path = new Path();
-        private static final RectF rectangle3Rect = new RectF();
-        private static final Path rectangle3Path = new Path();
-        private static final RectF rectangle8Rect = new RectF();
-        private static final Path rectangle8Path = new Path();
-        private static final RectF rectangle5Rect = new RectF();
-        private static final Path rectangle5Path = new Path();
-        private static final RectF bezier3Rect = new RectF();
-        private static final Path bezier3Path = new Path();
-        private static final RectF bezier6Rect = new RectF();
-        private static final Path bezier6Path = new Path();
-        private static final RectF bezier14Rect = new RectF();
-        private static final Path bezier14Path = new Path();
-        private static final RectF bezier15Rect = new RectF();
-        private static final Path bezier15Path = new Path();
-        private static final RectF bezier13Rect = new RectF();
-        private static final Path bezier13Path = new Path();
-        private static final RectF bezier10Rect = new RectF();
-        private static final Path bezier10Path = new Path();
-        private static final RectF bezier11Rect = new RectF();
-        private static final Path bezier11Path = new Path();
-        private static final RectF labelRect = new RectF();
-        private static final TextPaint labelTextPaint = new TextPaint();
-        private static final PaintCodeStaticLayout labelStaticLayout = new PaintCodeStaticLayout();
-    }
-
-    public static void drawGuildCrest(Canvas canvas, boolean isOwner, boolean isPublic, float memberCount, String memberCountLabel) {
-        HabiticaIcons.drawGuildCrest(canvas, new RectF(0f, 0f, 40f, 38f), ResizingBehavior.AspectFit, isOwner, isPublic, memberCount, memberCountLabel);
-    }
-
-    public static void drawGuildCrest(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, boolean isOwner, boolean isPublic, float memberCount, String memberCountLabel) {
-        // General Declarations
-        Stack<Matrix> currentTransformation = new Stack<>();
-        currentTransformation.push(new Matrix());
-        Paint paint = CacheForGuildCrest.paint;
-
-        // Local Colors
-        int crestBronze2 = Color.argb(255, 244, 165, 89);
-        int crestGold4 = Color.argb(255, 255, 166, 35);
-        int crestBronze5 = Color.argb(255, 179, 98, 19);
-        int crestSilver5 = Color.argb(255, 141, 141, 141);
-        int crestSilver2 = Color.argb(255, 217, 217, 217);
-        int crestGold6 = Color.argb(255, 223, 145, 30);
-        int crestBronze6 = Color.argb(255, 179, 98, 19);
-        int crestGold1 = Color.argb(255, 255, 188, 90);
-        int crestBronze1 = Color.argb(255, 234, 140, 49);
-        int crestGold3 = Color.argb(255, 223, 145, 30);
-        int crestSilver1 = Color.argb(255, 194, 194, 194);
-        int crestGold5 = Color.argb(255, 223, 145, 30);
-        int crestBronze4 = Color.argb(255, 215, 122, 32);
-        int crestBronze3 = Color.argb(255, 179, 98, 19);
-        int crestSilver3 = Color.argb(255, 141, 141, 141);
-        int crestSilver4 = Color.argb(255, 175, 175, 175);
-        int crestSilver6 = Color.argb(255, 141, 141, 141);
-        int crestGold2 = Color.argb(255, 255, 210, 145);
-
-        // Local Variables
-        int crestColor4 = memberCount < 100f ? crestBronze4 : (memberCount < 1000f ? crestSilver4 : crestGold4);
-        int crestColor3 = memberCount < 100f ? crestBronze3 : (memberCount < 1000f ? crestSilver3 : crestGold3);
-        int crestColor2 = memberCount < 100f ? crestBronze2 : (memberCount < 1000f ? crestSilver2 : crestGold2);
-        int crestColor1 = memberCount < 100f ? crestBronze1 : (memberCount < 1000f ? crestSilver1 : crestGold1);
-        int crestColor6 = memberCount < 100f ? crestBronze6 : (memberCount < 1000f ? crestSilver6 : crestGold6);
-        int crestColor5 = memberCount < 100f ? crestBronze5 : (memberCount < 1000f ? crestSilver5 : crestGold5);
-        boolean isPrivate = !isPublic;
-
-        // Resize to Target Frame
-        canvas.save();
-        RectF resizedFrame = CacheForGuildCrest.resizedFrame;
-        HabiticaIcons.resizingBehaviorApply(resizing, CacheForGuildCrest.originalFrame, targetFrame, resizedFrame);
-        canvas.translate(resizedFrame.left, resizedFrame.top);
-        canvas.scale(resizedFrame.width() / 40f, resizedFrame.height() / 38f);
-
-        // Group
-        if (isPublic) {
-            RectF group = CacheForGuildCrest.group;
-            group.set(0f, 0f, 40f, 38f);
-            canvas.save();
-
-            // Clip 5
-            Path clip5Path = CacheForGuildCrest.clip5Path;
-            clip5Path.reset();
-            clip5Path.moveTo(20.5f, 38f);
-            clip5Path.lineTo(33.14f, 30.6f);
-            clip5Path.cubicTo(33.01f, 22.28f, 33.81f, 13.48f, 40f, 4.93f);
-            clip5Path.cubicTo(29.47f, 3.77f, 26.58f, 0f, 20.5f, 0f);
-            clip5Path.cubicTo(14.6f, 0f, 10.53f, 3.77f, 0f, 4.93f);
-            clip5Path.cubicTo(6.19f, 13.48f, 6.99f, 22.28f, 6.86f, 30.6f);
-            clip5Path.lineTo(20.5f, 38f);
-            clip5Path.close();
-            canvas.clipPath(clip5Path);
-
-            // Rectangle
-            RectF rectangleRect = CacheForGuildCrest.rectangleRect;
-            rectangleRect.set(-5f, -5f, 45f, 43f);
-            Path rectanglePath = CacheForGuildCrest.rectanglePath;
-            rectanglePath.reset();
-            rectanglePath.addRect(rectangleRect, Path.Direction.CW);
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(crestColor1);
-            canvas.drawPath(rectanglePath, paint);
-
-            // Rectangle 2
-            canvas.save();
-            canvas.translate(23.03f, 23.53f);
-            currentTransformation.peek().postTranslate(23.03f, 23.53f);
-            canvas.rotate(-45f);
-            currentTransformation.peek().postRotate(-45f);
-            RectF rectangle2Rect = CacheForGuildCrest.rectangle2Rect;
-            rectangle2Rect.set(-6.01f, -38f, 6.01f, 38f);
-            Path rectangle2Path = CacheForGuildCrest.rectangle2Path;
-            rectangle2Path.reset();
-            rectangle2Path.moveTo(rectangle2Rect.left, rectangle2Rect.top);
-            rectangle2Path.lineTo(rectangle2Rect.right, rectangle2Rect.top);
-            rectangle2Path.lineTo(rectangle2Rect.right, rectangle2Rect.bottom);
-            rectangle2Path.lineTo(rectangle2Rect.left, rectangle2Rect.bottom);
-            rectangle2Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(crestColor2);
-            canvas.drawPath(rectangle2Path, paint);
-            canvas.restore();
-
-            // Rectangle 4
-            canvas.save();
-            canvas.translate(35f, 22f);
-            currentTransformation.peek().postTranslate(35f, 22f);
-            canvas.rotate(-45f);
-            currentTransformation.peek().postRotate(-45f);
-            RectF rectangle4Rect = CacheForGuildCrest.rectangle4Rect;
-            rectangle4Rect.set(-1f, -38f, 1f, 38f);
-            Path rectangle4Path = CacheForGuildCrest.rectangle4Path;
-            rectangle4Path.reset();
-            rectangle4Path.addRect(rectangle4Rect, Path.Direction.CW);
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(crestColor2);
-            canvas.drawPath(rectangle4Path, paint);
-            canvas.restore();
-
-            // Bezier 2
-            RectF bezier2Rect = CacheForGuildCrest.bezier2Rect;
-            bezier2Rect.set(0f, 0f, 40f, 38f);
-            Path bezier2Path = CacheForGuildCrest.bezier2Path;
-            bezier2Path.reset();
-            bezier2Path.moveTo(20.5f, 38f);
-            bezier2Path.lineTo(33.14f, 30.6f);
-            bezier2Path.cubicTo(33.01f, 22.28f, 33.81f, 13.48f, 40f, 4.93f);
-            bezier2Path.cubicTo(29.47f, 3.77f, 26.58f, 0f, 20.5f, 0f);
-            bezier2Path.cubicTo(14.6f, 0f, 10.53f, 3.77f, 0f, 4.93f);
-            bezier2Path.cubicTo(6.19f, 13.48f, 6.99f, 22.28f, 6.86f, 30.6f);
-            bezier2Path.lineTo(20.5f, 38f);
-            bezier2Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStrokeWidth(10f);
-            paint.setStrokeMiter(10f);
-            canvas.save();
-            paint.setStyle(Paint.Style.STROKE);
-            paint.setColor(crestColor3);
-            canvas.drawPath(bezier2Path, paint);
-            canvas.restore();
-
-            // Bezier 4
-            RectF bezier4Rect = CacheForGuildCrest.bezier4Rect;
-            bezier4Rect.set(0f, -0f, 40f, 38f);
-            Path bezier4Path = CacheForGuildCrest.bezier4Path;
-            bezier4Path.reset();
-            bezier4Path.moveTo(20.5f, 38f);
-            bezier4Path.lineTo(33.14f, 30.6f);
-            bezier4Path.cubicTo(33.01f, 22.28f, 33.81f, 13.48f, 40f, 4.93f);
-            bezier4Path.cubicTo(29.47f, 3.77f, 26.58f, -0f, 20.5f, -0f);
-            bezier4Path.cubicTo(14.6f, -0f, 10.53f, 3.77f, 0f, 4.93f);
-            bezier4Path.cubicTo(6.19f, 13.48f, 6.99f, 22.28f, 6.86f, 30.6f);
-            bezier4Path.lineTo(20.5f, 38f);
-            bezier4Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStrokeWidth(6f);
-            paint.setStrokeMiter(10f);
-            canvas.save();
-            paint.setStyle(Paint.Style.STROKE);
-            paint.setColor(crestColor4);
-            canvas.drawPath(bezier4Path, paint);
-            canvas.restore();
-
-            // Bezier 7
-            if (isOwner) {
-                RectF bezier7Rect = CacheForGuildCrest.bezier7Rect;
-                bezier7Rect.set(10.85f, 8.25f, 15.75f, 13.16f);
-                Path bezier7Path = CacheForGuildCrest.bezier7Path;
-                bezier7Path.reset();
-                bezier7Path.moveTo(13.3f, 12.54f);
-                bezier7Path.lineTo(12.37f, 13.05f);
-                bezier7Path.cubicTo(11.89f, 13.31f, 11.57f, 13.08f, 11.65f, 12.55f);
-                bezier7Path.lineTo(11.84f, 11.43f);
-                bezier7Path.lineTo(11.07f, 10.65f);
-                bezier7Path.cubicTo(10.69f, 10.26f, 10.82f, 9.87f, 11.36f, 9.79f);
-                bezier7Path.lineTo(12.4f, 9.63f);
-                bezier7Path.lineTo(12.87f, 8.63f);
-                bezier7Path.cubicTo(13.11f, 8.13f, 13.49f, 8.12f, 13.73f, 8.63f);
-                bezier7Path.lineTo(14.2f, 9.63f);
-                bezier7Path.lineTo(15.24f, 9.79f);
-                bezier7Path.cubicTo(15.78f, 9.87f, 15.92f, 10.25f, 15.53f, 10.65f);
-                bezier7Path.lineTo(14.76f, 11.43f);
-                bezier7Path.lineTo(14.95f, 12.55f);
-                bezier7Path.cubicTo(15.04f, 13.09f, 14.72f, 13.32f, 14.23f, 13.05f);
-                bezier7Path.lineTo(13.3f, 12.54f);
-                bezier7Path.close();
-
-                paint.reset();
-                paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-                bezier7Path.setFillType(Path.FillType.EVEN_ODD);
-                paint.setStyle(Paint.Style.FILL);
-                paint.setColor(crestColor6);
-                canvas.drawPath(bezier7Path, paint);
-            }
-
-            // Bezier 8
-            if (isOwner) {
-                RectF bezier8Rect = CacheForGuildCrest.bezier8Rect;
-                bezier8Rect.set(24.25f, 8.25f, 29.15f, 13.16f);
-                Path bezier8Path = CacheForGuildCrest.bezier8Path;
-                bezier8Path.reset();
-                bezier8Path.moveTo(26.7f, 12.54f);
-                bezier8Path.lineTo(25.77f, 13.05f);
-                bezier8Path.cubicTo(25.29f, 13.31f, 24.97f, 13.08f, 25.05f, 12.55f);
-                bezier8Path.lineTo(25.24f, 11.43f);
-                bezier8Path.lineTo(24.47f, 10.65f);
-                bezier8Path.cubicTo(24.09f, 10.26f, 24.22f, 9.87f, 24.76f, 9.79f);
-                bezier8Path.lineTo(25.8f, 9.63f);
-                bezier8Path.lineTo(26.27f, 8.63f);
-                bezier8Path.cubicTo(26.51f, 8.13f, 26.89f, 8.12f, 27.13f, 8.63f);
-                bezier8Path.lineTo(27.6f, 9.63f);
-                bezier8Path.lineTo(28.64f, 9.79f);
-                bezier8Path.cubicTo(29.18f, 9.87f, 29.32f, 10.25f, 28.93f, 10.65f);
-                bezier8Path.lineTo(28.16f, 11.43f);
-                bezier8Path.lineTo(28.35f, 12.55f);
-                bezier8Path.cubicTo(28.44f, 13.09f, 28.12f, 13.32f, 27.63f, 13.05f);
-                bezier8Path.lineTo(26.7f, 12.54f);
-                bezier8Path.close();
-
-                paint.reset();
-                paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-                bezier8Path.setFillType(Path.FillType.EVEN_ODD);
-                paint.setStyle(Paint.Style.FILL);
-                paint.setColor(crestColor6);
-                canvas.drawPath(bezier8Path, paint);
-            }
-
-            canvas.restore();
-        }
-
-        // Group 8
-        if (isPrivate) {
-            RectF group8 = CacheForGuildCrest.group8;
-            group8.set(3f, 0f, 37f, 38f);
-            canvas.save();
-
-            // Clip 14
-            Path clip14Path = CacheForGuildCrest.clip14Path;
-            clip14Path.reset();
-            clip14Path.moveTo(20f, 0f);
-            clip14Path.lineTo(3f, 7.62f);
-            clip14Path.cubicTo(3f, 22.85f, 5.07f, 31.47f, 20f, 38f);
-            clip14Path.cubicTo(34.93f, 31.47f, 37f, 22.85f, 37f, 7.62f);
-            clip14Path.lineTo(20f, 0f);
-            clip14Path.close();
-            canvas.clipPath(clip14Path);
-
-            // Rectangle 3
-            RectF rectangle3Rect = CacheForGuildCrest.rectangle3Rect;
-            rectangle3Rect.set(2f, 0f, 37f, 38f);
-            Path rectangle3Path = CacheForGuildCrest.rectangle3Path;
-            rectangle3Path.reset();
-            rectangle3Path.addRect(rectangle3Rect, Path.Direction.CW);
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(crestColor1);
-            canvas.drawPath(rectangle3Path, paint);
-
-            // Rectangle 8
-            canvas.save();
-            canvas.translate(23.7f, 10.7f);
-            currentTransformation.peek().postTranslate(23.7f, 10.7f);
-            canvas.rotate(-45f);
-            currentTransformation.peek().postRotate(-45f);
-            RectF rectangle8Rect = CacheForGuildCrest.rectangle8Rect;
-            rectangle8Rect.set(-1f, -11f, 1f, 11f);
-            Path rectangle8Path = CacheForGuildCrest.rectangle8Path;
-            rectangle8Path.reset();
-            rectangle8Path.addRect(rectangle8Rect, Path.Direction.CW);
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(crestColor2);
-            canvas.drawPath(rectangle8Path, paint);
-            canvas.restore();
-
-            // Rectangle 5
-            canvas.save();
-            canvas.translate(17.73f, 24f);
-            currentTransformation.peek().postTranslate(17.73f, 24f);
-            canvas.rotate(45f);
-            currentTransformation.peek().postRotate(45f);
-            RectF rectangle5Rect = CacheForGuildCrest.rectangle5Rect;
-            rectangle5Rect.set(-19f, -10f, 19f, 10f);
-            Path rectangle5Path = CacheForGuildCrest.rectangle5Path;
-            rectangle5Path.reset();
-            rectangle5Path.addRect(rectangle5Rect, Path.Direction.CW);
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(crestColor2);
-            canvas.drawPath(rectangle5Path, paint);
-            canvas.restore();
-
-            // Bezier 3
-            RectF bezier3Rect = CacheForGuildCrest.bezier3Rect;
-            bezier3Rect.set(3f, 0f, 37f, 38f);
-            Path bezier3Path = CacheForGuildCrest.bezier3Path;
-            bezier3Path.reset();
-            bezier3Path.moveTo(20f, 0f);
-            bezier3Path.lineTo(3f, 7.62f);
-            bezier3Path.cubicTo(3f, 22.85f, 5.07f, 31.47f, 20f, 38f);
-            bezier3Path.cubicTo(34.93f, 31.47f, 37f, 22.85f, 37f, 7.62f);
-            bezier3Path.lineTo(20f, 0f);
-            bezier3Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStrokeWidth(10f);
-            paint.setStrokeMiter(10f);
-            canvas.save();
-            paint.setStyle(Paint.Style.STROKE);
-            paint.setColor(crestColor3);
-            canvas.drawPath(bezier3Path, paint);
-            canvas.restore();
-
-            // Bezier 6
-            RectF bezier6Rect = CacheForGuildCrest.bezier6Rect;
-            bezier6Rect.set(3f, 0f, 37f, 38f);
-            Path bezier6Path = CacheForGuildCrest.bezier6Path;
-            bezier6Path.reset();
-            bezier6Path.moveTo(20f, 0f);
-            bezier6Path.lineTo(3f, 7.62f);
-            bezier6Path.cubicTo(3f, 22.85f, 5.07f, 31.47f, 20f, 38f);
-            bezier6Path.cubicTo(34.93f, 31.47f, 37f, 22.85f, 37f, 7.62f);
-            bezier6Path.lineTo(20f, 0f);
-            bezier6Path.close();
-
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            paint.setStrokeWidth(6f);
-            paint.setStrokeMiter(10f);
-            canvas.save();
-            paint.setStyle(Paint.Style.STROKE);
-            paint.setColor(crestColor4);
-            canvas.drawPath(bezier6Path, paint);
-            canvas.restore();
-
-            // Bezier 14
-            if (isOwner) {
-                RectF bezier14Rect = CacheForGuildCrest.bezier14Rect;
-                bezier14Rect.set(25.85f, 10.85f, 30.75f, 15.76f);
-                Path bezier14Path = CacheForGuildCrest.bezier14Path;
-                bezier14Path.reset();
-                bezier14Path.moveTo(28.3f, 15.14f);
-                bezier14Path.lineTo(27.37f, 15.65f);
-                bezier14Path.cubicTo(26.89f, 15.91f, 26.57f, 15.69f, 26.65f, 15.15f);
-                bezier14Path.lineTo(26.84f, 14.03f);
-                bezier14Path.lineTo(26.07f, 13.25f);
-                bezier14Path.cubicTo(25.69f, 12.86f, 25.82f, 12.47f, 26.36f, 12.39f);
-                bezier14Path.lineTo(27.4f, 12.23f);
-                bezier14Path.lineTo(27.87f, 11.23f);
-                bezier14Path.cubicTo(28.11f, 10.73f, 28.49f, 10.72f, 28.73f, 11.23f);
-                bezier14Path.lineTo(29.2f, 12.23f);
-                bezier14Path.lineTo(30.24f, 12.39f);
-                bezier14Path.cubicTo(30.78f, 12.47f, 30.92f, 12.85f, 30.53f, 13.25f);
-                bezier14Path.lineTo(29.76f, 14.03f);
-                bezier14Path.lineTo(29.95f, 15.15f);
-                bezier14Path.cubicTo(30.04f, 15.69f, 29.72f, 15.92f, 29.23f, 15.65f);
-                bezier14Path.lineTo(28.3f, 15.14f);
-                bezier14Path.close();
-
-                paint.reset();
-                paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-                bezier14Path.setFillType(Path.FillType.EVEN_ODD);
-                paint.setStyle(Paint.Style.FILL);
-                paint.setColor(crestColor6);
-                canvas.drawPath(bezier14Path, paint);
-            }
-
-            // Bezier 15
-            if (isOwner) {
-                RectF bezier15Rect = CacheForGuildCrest.bezier15Rect;
-                bezier15Rect.set(9.25f, 10.85f, 14.15f, 15.76f);
-                Path bezier15Path = CacheForGuildCrest.bezier15Path;
-                bezier15Path.reset();
-                bezier15Path.moveTo(11.7f, 15.14f);
-                bezier15Path.lineTo(10.77f, 15.65f);
-                bezier15Path.cubicTo(10.29f, 15.91f, 9.97f, 15.69f, 10.05f, 15.15f);
-                bezier15Path.lineTo(10.24f, 14.03f);
-                bezier15Path.lineTo(9.47f, 13.25f);
-                bezier15Path.cubicTo(9.09f, 12.86f, 9.22f, 12.47f, 9.76f, 12.39f);
-                bezier15Path.lineTo(10.8f, 12.23f);
-                bezier15Path.lineTo(11.27f, 11.23f);
-                bezier15Path.cubicTo(11.51f, 10.73f, 11.89f, 10.72f, 12.13f, 11.23f);
-                bezier15Path.lineTo(12.6f, 12.23f);
-                bezier15Path.lineTo(13.64f, 12.39f);
-                bezier15Path.cubicTo(14.18f, 12.47f, 14.32f, 12.85f, 13.93f, 13.25f);
-                bezier15Path.lineTo(13.16f, 14.03f);
-                bezier15Path.lineTo(13.35f, 15.15f);
-                bezier15Path.cubicTo(13.44f, 15.69f, 13.12f, 15.92f, 12.63f, 15.65f);
-                bezier15Path.lineTo(11.7f, 15.14f);
-                bezier15Path.close();
-
-                paint.reset();
-                paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-                bezier15Path.setFillType(Path.FillType.EVEN_ODD);
-                paint.setStyle(Paint.Style.FILL);
-                paint.setColor(crestColor6);
-                canvas.drawPath(bezier15Path, paint);
-            }
-
-            canvas.restore();
-        }
-
-        // Bezier 13
-        RectF bezier13Rect = CacheForGuildCrest.bezier13Rect;
-        bezier13Rect.set(15f, 7f, 25f, 17f);
-        Path bezier13Path = CacheForGuildCrest.bezier13Path;
-        bezier13Path.reset();
-        bezier13Path.moveTo(20f, 12.72f);
-        bezier13Path.cubicTo(18.33f, 12.72f, 15f, 13.55f, 15f, 15.22f);
-        bezier13Path.lineTo(15f, 17f);
-        bezier13Path.lineTo(25f, 17f);
-        bezier13Path.lineTo(25f, 15.22f);
-        bezier13Path.cubicTo(25f, 13.55f, 21.67f, 12.72f, 20f, 12.72f);
-        bezier13Path.close();
-        bezier13Path.moveTo(20f, 7f);
-        bezier13Path.cubicTo(18.82f, 7f, 17.86f, 7.96f, 17.86f, 9.14f);
-        bezier13Path.cubicTo(17.86f, 10.33f, 18.82f, 11.29f, 20f, 11.29f);
-        bezier13Path.cubicTo(21.18f, 11.29f, 22.14f, 10.33f, 22.14f, 9.14f);
-        bezier13Path.cubicTo(22.14f, 7.96f, 21.18f, 7f, 20f, 7f);
-        bezier13Path.close();
-
-        paint.reset();
-        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-        bezier13Path.setFillType(Path.FillType.EVEN_ODD);
-        paint.setStyle(Paint.Style.FILL);
-        paint.setColor(crestColor6);
-        canvas.drawPath(bezier13Path, paint);
-
-        // Bezier 10
-        RectF bezier10Rect = CacheForGuildCrest.bezier10Rect;
-        bezier10Rect.set(2f, 19f, 38f, 34f);
-        Path bezier10Path = CacheForGuildCrest.bezier10Path;
-        bezier10Path.reset();
-        bezier10Path.moveTo(2f, 26.5f);
-        bezier10Path.cubicTo(2f, 22.36f, 5.35f, 19f, 9.5f, 19f);
-        bezier10Path.lineTo(30.5f, 19f);
-        bezier10Path.cubicTo(34.64f, 19f, 38f, 22.37f, 38f, 26.5f);
-        bezier10Path.lineTo(38f, 26.5f);
-        bezier10Path.cubicTo(38f, 30.64f, 34.65f, 34f, 30.5f, 34f);
-        bezier10Path.lineTo(9.5f, 34f);
-        bezier10Path.cubicTo(5.36f, 34f, 2f, 30.63f, 2f, 26.5f);
-        bezier10Path.lineTo(2f, 26.5f);
-        bezier10Path.close();
-
-        paint.reset();
-        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-        bezier10Path.setFillType(Path.FillType.EVEN_ODD);
-        paint.setStyle(Paint.Style.FILL);
-        paint.setColor(Color.WHITE);
-        canvas.drawPath(bezier10Path, paint);
-
-        // Bezier 11
-        RectF bezier11Rect = CacheForGuildCrest.bezier11Rect;
-        bezier11Rect.set(2f, 19f, 38f, 34f);
-        Path bezier11Path = CacheForGuildCrest.bezier11Path;
-        bezier11Path.reset();
-        bezier11Path.moveTo(2f, 26.5f);
-        bezier11Path.cubicTo(2f, 22.36f, 5.35f, 19f, 9.5f, 19f);
-        bezier11Path.lineTo(30.5f, 19f);
-        bezier11Path.cubicTo(34.64f, 19f, 38f, 22.37f, 38f, 26.5f);
-        bezier11Path.lineTo(38f, 26.5f);
-        bezier11Path.cubicTo(38f, 30.64f, 34.65f, 34f, 30.5f, 34f);
-        bezier11Path.lineTo(9.5f, 34f);
-        bezier11Path.cubicTo(5.36f, 34f, 2f, 30.63f, 2f, 26.5f);
-        bezier11Path.lineTo(2f, 26.5f);
-        bezier11Path.close();
-
-        paint.reset();
-        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-        paint.setStrokeWidth(2f);
-        paint.setStrokeMiter(10f);
-        canvas.save();
-        paint.setStyle(Paint.Style.STROKE);
-        paint.setColor(crestColor3);
-        canvas.drawPath(bezier11Path, paint);
-        canvas.restore();
-
-        // Label
-        RectF labelRect = CacheForGuildCrest.labelRect;
-        labelRect.set(4f, 20f, 36f, 33f);
-        TextPaint labelTextPaint = CacheForGuildCrest.labelTextPaint;
-        labelTextPaint.reset();
-        labelTextPaint.setFlags(Paint.ANTI_ALIAS_FLAG);
-        labelTextPaint.setColor(crestColor5);
-        labelTextPaint.setTextSize(12f);
-        StaticLayout labelStaticLayout = CacheForGuildCrest.labelStaticLayout.get((int) labelRect.width(), memberCountLabel, labelTextPaint);
-        canvas.save();
-        canvas.clipRect(labelRect);
-        canvas.translate(labelRect.left, labelRect.top + (labelRect.height() - labelStaticLayout.getHeight()) / 2f);
-        labelStaticLayout.draw(canvas);
-        canvas.restore();
-
-        canvas.restore();
-    }
-
     private static class CacheForGuildCrestMedium {
         private static final Paint paint = new Paint();
         private static final RectF originalFrame = new RectF(0f, 0f, 30f, 34f);
@@ -9273,7 +7714,7 @@ public class HabiticaIcons {
 
     public static void drawGuildCrestMedium(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, float memberCount) {
         // General Declarations
-        Stack<Matrix> currentTransformation = new Stack<Matrix>();
+        Stack<Matrix> currentTransformation = new Stack<>();
         currentTransformation.push(new Matrix());
         Paint paint = CacheForGuildCrestMedium.paint;
 
@@ -9460,91 +7901,6 @@ public class HabiticaIcons {
         canvas.restore();
     }
 
-    private static class CacheForGuildCrestSmall {
-        private static final Paint paint = new Paint();
-        private static final RectF originalFrame = new RectF(0f, 0f, 16f, 16f);
-        private static final RectF resizedFrame = new RectF();
-        private static final RectF bezierRect = new RectF();
-        private static final Path bezierPath = new Path();
-        private static final RectF bezier2Rect = new RectF();
-        private static final Path bezier2Path = new Path();
-    }
-
-    public static void drawGuildCrestSmall(Canvas canvas, float memberCount) {
-        HabiticaIcons.drawGuildCrestSmall(canvas, new RectF(0f, 0f, 16f, 16f), ResizingBehavior.AspectFit, memberCount);
-    }
-
-    public static void drawGuildCrestSmall(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, float memberCount) {
-        // General Declarations
-        Paint paint = CacheForGuildCrestSmall.paint;
-
-        // Local Colors
-        int crestGold4 = Color.argb(255, 255, 166, 35);
-        int fillColor37 = Color.argb(255, 255, 255, 255);
-        int crestSilver4 = Color.argb(255, 175, 175, 175);
-        int crestBronze4 = Color.argb(255, 215, 122, 32);
-
-        // Local Variables
-        int crestColor4 = memberCount < 100f ? crestBronze4 : (memberCount < 1000f ? crestSilver4 : crestGold4);
-
-        // Resize to Target Frame
-        canvas.save();
-        RectF resizedFrame = CacheForGuildCrestSmall.resizedFrame;
-        HabiticaIcons.resizingBehaviorApply(resizing, CacheForGuildCrestSmall.originalFrame, targetFrame, resizedFrame);
-        canvas.translate(resizedFrame.left, resizedFrame.top);
-        canvas.scale(resizedFrame.width() / 16f, resizedFrame.height() / 16f);
-
-        // Bezier
-        RectF bezierRect = CacheForGuildCrestSmall.bezierRect;
-        bezierRect.set(0f, 0f, 16f, 16f);
-        Path bezierPath = CacheForGuildCrestSmall.bezierPath;
-        bezierPath.reset();
-        bezierPath.moveTo(15.94f, 3.41f);
-        bezierPath.cubicTo(15.94f, 2.94f, 15.69f, 2.5f, 15.18f, 2.25f);
-        bezierPath.cubicTo(13.64f, 1.5f, 9.97f, 0f, 8f, 0f);
-        bezierPath.cubicTo(6.02f, 0f, 2.36f, 1.5f, 0.82f, 2.25f);
-        bezierPath.cubicTo(0.31f, 2.5f, 0.06f, 2.94f, 0.05f, 3.41f);
-        bezierPath.cubicTo(0.01f, 5.65f, -0.93f, 12.24f, 7.1f, 15.81f);
-        bezierPath.cubicTo(7.65f, 16.05f, 8.35f, 16.07f, 8.9f, 15.81f);
-        bezierPath.cubicTo(16.95f, 12.24f, 15.98f, 5.65f, 15.94f, 3.41f);
-        bezierPath.close();
-
-        paint.reset();
-        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-        bezierPath.setFillType(Path.FillType.EVEN_ODD);
-        paint.setStyle(Paint.Style.FILL);
-        paint.setColor(crestColor4);
-        canvas.drawPath(bezierPath, paint);
-
-        // Bezier 2
-        RectF bezier2Rect = CacheForGuildCrestSmall.bezier2Rect;
-        bezier2Rect.set(4f, 3f, 12f, 11f);
-        Path bezier2Path = CacheForGuildCrestSmall.bezier2Path;
-        bezier2Path.reset();
-        bezier2Path.moveTo(8f, 7.57f);
-        bezier2Path.cubicTo(6.67f, 7.57f, 4f, 8.24f, 4f, 9.57f);
-        bezier2Path.lineTo(4f, 11f);
-        bezier2Path.lineTo(12f, 11f);
-        bezier2Path.lineTo(12f, 9.57f);
-        bezier2Path.cubicTo(12f, 8.24f, 9.33f, 7.57f, 8f, 7.57f);
-        bezier2Path.close();
-        bezier2Path.moveTo(8f, 3f);
-        bezier2Path.cubicTo(7.05f, 3f, 6.29f, 3.77f, 6.29f, 4.71f);
-        bezier2Path.cubicTo(6.29f, 5.66f, 7.05f, 6.43f, 8f, 6.43f);
-        bezier2Path.cubicTo(8.95f, 6.43f, 9.71f, 5.66f, 9.71f, 4.71f);
-        bezier2Path.cubicTo(9.71f, 3.77f, 8.95f, 3f, 8f, 3f);
-        bezier2Path.close();
-
-        paint.reset();
-        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-        bezier2Path.setFillType(Path.FillType.EVEN_ODD);
-        paint.setStyle(Paint.Style.FILL);
-        paint.setColor(fillColor37);
-        canvas.drawPath(bezier2Path, paint);
-
-        canvas.restore();
-    }
-
     private static class CacheForTwoHandedIcon {
         private static final Paint paint = new Paint();
         private static final RectF originalFrame = new RectF(0f, 0f, 15f, 15f);
@@ -10648,86 +9004,6 @@ public class HabiticaIcons {
 
 }
 
-class PaintCodeColor extends Color {
-    private static float[] ColorToHSV(int originalColor) {
-        float[] hsv = new float[3];
-        RGBToHSV(red(originalColor), green(originalColor), blue(originalColor), hsv);
-        return hsv;
-    }
-
-    public static float hue(int color) {
-        return ColorToHSV(color)[0];
-    }
-
-
-    public static float brightness(int color) {
-        return ColorToHSV(color)[2];
-    }
-
-    public static int colorByChangingAlpha(int color, int newAlpha) {
-        return argb(newAlpha, red(color), green(color), blue(color));
-    }
-}
-
-class PaintCodeShadow {
-    int color;
-    float dx, dy;
-    private float radius;
-    private BlurMaskFilter blurMaskFilter;
-
-    PaintCodeShadow() {
-
-    }
-
-    PaintCodeShadow get(int color) {
-        this.color = color;
-        this.dx = (float) 0.0;
-        this.dy = (float) 1.0;
-
-        if (this.radius != (float) 1.0) {
-            this.blurMaskFilter = null;
-            this.radius = (float) 1.0;
-        }
-
-        return this;
-    }
-
-    void setBlurOfPaint(Paint paint) {
-        if (this.radius <= 0)
-            return;
-
-        if (this.blurMaskFilter == null)
-            this.blurMaskFilter = new BlurMaskFilter(this.radius, BlurMaskFilter.Blur.NORMAL);
-
-        paint.setMaskFilter(this.blurMaskFilter);
-    }
-}
-
-
-class PaintCodeBitmap {
-    private BitmapShader shader;
-    private Bitmap bitmap;
-    private RectF bounds;
-
-    PaintCodeBitmap get(Bitmap bitmap) {
-        if (this.bitmap != bitmap) {
-            this.bitmap = bitmap;
-            this.bounds = new RectF(0, 0, bitmap.getWidth(), bitmap.getHeight());
-            this.shader = new BitmapShader(bitmap, Shader.TileMode.REPEAT, Shader.TileMode.REPEAT);
-        }
-        return this;
-    }
-
-    BitmapShader getShader() {
-        return this.shader;
-    }
-
-    RectF getBounds() {
-        return this.bounds;
-    }
-}
-
-
 class PaintCodeDashPathEffect {
     private DashPathEffect effect;
     private float dash, gap, phase;
@@ -10742,23 +9018,3 @@ class PaintCodeDashPathEffect {
         return this.effect;
     }
 }
-
-
-class PaintCodeStaticLayout {
-    private StaticLayout layout;
-    private int width;
-    private Layout.Alignment alignment;
-    private CharSequence source;
-    private TextPaint paint;
-
-    StaticLayout get(int width, CharSequence source, TextPaint paint) {
-        if (this.layout == null || this.width != width || this.alignment != Layout.Alignment.ALIGN_CENTER || !this.source.equals(source) || !this.paint.equals(paint)) {
-            this.width = width;
-            this.alignment = Layout.Alignment.ALIGN_CENTER;
-            this.source = source;
-            this.paint = paint;
-            this.layout = new StaticLayout(source, paint, width, Layout.Alignment.ALIGN_CENTER, 1, 0, false);
-        }
-        return this.layout;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIconsHelper.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIconsHelper.java
index b056e2ca3..23893c9ea 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIconsHelper.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIconsHelper.java
@@ -3,7 +3,6 @@ package com.habitrpg.android.habitica.ui.views;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
-import android.graphics.Color;
 import android.graphics.RectF;
 
 import androidx.annotation.ColorInt;
@@ -470,44 +469,6 @@ public class HabiticaIconsHelper {
         return imageOfCaret;
     }
 
-    private static Bitmap imageOfRageStrikeInactive = null;
-
-    public static Bitmap imageOfRageStrikeInactive() {
-        if (imageOfRageStrikeInactive != null)
-            return imageOfRageStrikeInactive;
-
-        imageOfRageStrikeInactive = Bitmap.createBitmap(scaleSize(63), scaleSize(82), Bitmap.Config.ARGB_8888);
-        Canvas canvas = new Canvas(imageOfRageStrikeInactive);
-        canvas.scale(displayDensity, displayDensity);
-        HabiticaIcons.drawRageStrikeInactive(canvas);
-
-        return imageOfRageStrikeInactive;
-    }
-
-    public static Bitmap imageOfRageStrikeActive(Context context, Bitmap rageStrikeNPC) {
-        Bitmap imageOfRageStrikeActive = Bitmap.createBitmap(scaleSize(63), scaleSize(82), Bitmap.Config.ARGB_8888);
-        Canvas canvas = new Canvas(imageOfRageStrikeActive);
-        canvas.scale(displayDensity, displayDensity);
-        HabiticaIcons.drawRageStrikeActive(canvas, context, rageStrikeNPC);
-
-        return imageOfRageStrikeActive;
-    }
-
-    private static Bitmap imageOfRage = null;
-
-    public static Bitmap imageOfRage() {
-        if (imageOfRage != null)
-            return imageOfRage;
-
-        int size = scaleSize(18);
-        imageOfRage = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
-        Canvas canvas = new Canvas(imageOfRage);
-        canvas.scale(displayDensity, displayDensity);
-        HabiticaIcons.drawRage(canvas);
-
-        return imageOfRage;
-    }
-
     public static Bitmap imageOfLocked(@ColorInt int lockColor) {
         return imageOfLocked(lockColor, 15, 17);
     }
@@ -670,15 +631,6 @@ public class HabiticaIconsHelper {
         return imageOfHabitControlMinus;
     }
 
-    public static Bitmap imageOfGuildCrest(boolean isOwner, boolean isPublic, float memberCount, String memberCountLabel) {
-        Bitmap imageOfGuildCrest = Bitmap.createBitmap(scaleSize(40), scaleSize(38), Bitmap.Config.ARGB_8888);
-        Canvas canvas = new Canvas(imageOfGuildCrest);
-        canvas.scale(displayDensity, displayDensity);
-        HabiticaIcons.drawGuildCrest(canvas, isOwner, isPublic, memberCount, memberCountLabel);
-
-        return imageOfGuildCrest;
-    }
-
     public static Bitmap imageOfGuildCrestMedium(float memberCount) {
         Bitmap imageOfGuildCrestMedium = Bitmap.createBitmap(scaleSize(30), scaleSize(34), Bitmap.Config.ARGB_8888);
         Canvas canvas = new Canvas(imageOfGuildCrestMedium);
@@ -688,12 +640,4 @@ public class HabiticaIconsHelper {
         return imageOfGuildCrestMedium;
     }
 
-    public static Bitmap imageOfGuildCrestSmall(float memberCount) {
-        Bitmap imageOfGuildCrestSmall = Bitmap.createBitmap(scaleSize(16), scaleSize(16), Bitmap.Config.ARGB_8888);
-        Canvas canvas = new Canvas(imageOfGuildCrestSmall);
-        canvas.scale(displayDensity, displayDensity);
-        HabiticaIcons.drawGuildCrestSmall(canvas, memberCount);
-
-        return imageOfGuildCrestSmall;
-    }
 }
diff --git a/gradle.properties b/gradle.properties
index 3525d00e6..d46ffb092 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,3 @@
-android.enableJetifier=true
 android.useAndroidX=true
 android.debug.obsoleteApi=true
 org.gradle.configureondemand=true
@@ -11,4 +10,4 @@ android.nonTransitiveRClass=false
 android.nonFinalResIds=false
 android.enableR8.fullMode=false
 org.gradle.caching=true
-org.gradle.parallel=true
\ No newline at end of file
+org.gradle.parallel=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f8c433e6c..06e75028c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -22,14 +22,14 @@ coordinatorlayout = "1.2.0"
 coreSplashscreen = "1.1.0-rc01"
 core_ktx = "1.15.0"
 coroutines = "1.9.0"
-crashlytics = "3.0.2"
+crashlytics = "3.0.3"
 credentials = "1.3.0"
 daggerhilt = "2.55"
 desuggar = "2.1.4"
 detekt = "1.19.0"
 deviceNames = "2.1.1"
 firebase-perf = "1.4.2"
-firebase_bom = "33.8.0"
+firebase_bom = "33.9.0"
 flexbox = "3.0.0"
 fragmentKtx = "1.8.5"
 fragmentTesting = "1.8.5"