diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index 8d875260e..c785eef06 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -238,14 +238,6 @@
                 <action android:name="com.google.firebase.MESSAGING_EVENT"/>
             </intent-filter>
         </service>
-        <service
-            android:name=".helpers.notifications.HabiticaFirebaseInstanceIDService"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
-            </intent-filter>
-        </service>
-
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="@string/content_provider"
diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 206437162..2e534b961 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -16,7 +16,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'com.android.tools.build:gradle:4.1.2'
         classpath('com.noveogroup.android:check:1.2.5') {
             exclude module: 'checkstyle'
             exclude module: 'pmd-java'
@@ -51,7 +51,7 @@ dependencies {
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
     implementation 'com.squareup.retrofit2:adapter-rxjava3:2.9.0'
     //Crash Logging
-    implementation 'com.google.firebase:firebase-crashlytics:17.3.0'
+    implementation 'com.google.firebase:firebase-crashlytics:17.3.1'
 
     //Dependency Injection
     implementation 'com.google.dagger:dagger:2.31.2'
@@ -60,7 +60,7 @@ dependencies {
     compileOnly 'com.github.pengrad:jdk9-deps:1.0'
     //App Compatibility and Material Design
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.google.android.material:material:1.2.1'
+    implementation 'com.google.android.material:material:1.3.0'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
     // Markdown
@@ -115,7 +115,7 @@ dependencies {
     implementation 'com.google.firebase:firebase-config:20.0.3'
     implementation 'com.google.firebase:firebase-perf:19.1.1'
     implementation 'com.google.android.gms:play-services-auth:19.0.0'
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.30"
     implementation 'com.nex3z:flow-layout:1.2.2'
 
     implementation 'androidx.core:core-ktx:1.3.2'
@@ -150,8 +150,8 @@ android {
         buildConfigField "String", "TESTING_LEVEL", "\"production\""
         resConfigs "en", "bg", "de", "en-rGB", "es", "fr", "hr-rHR", "in", "it", "iw", "ja", "ko", "lt", "nl", "pl", "pt-rBR", "pt-rPT", "ru", "tr", "zh", "zh-rTW"
 
-        versionCode 2835
-        versionName "3.2"
+        versionCode 2838
+        versionName "3.2.1"
     }
 
     buildFeatures {
diff --git a/Habitica/project.properties b/Habitica/project.properties
index 8e9414690..a3ee5ab64 100644
--- a/Habitica/project.properties
+++ b/Habitica/project.properties
@@ -12,4 +12,3 @@
 
 # Project target.
 target=android-17
-android.library.reference.1=../app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.0
diff --git a/Habitica/res/color/task_form_box_stroke.xml b/Habitica/res/color/task_form_box_stroke.xml
deleted file mode 100644
index f8eaeebf9..000000000
--- a/Habitica/res/color/task_form_box_stroke.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?attr/colorPrimary" android:state_focused="true"/>
-    <item android:alpha="0.87" android:color="?attr/colorPrimary" android:state_hovered="true"/>
-    <item android:alpha="0.12" android:color="?attr/colorPrimary" android:state_enabled="false"/>
-    <item android:alpha="0.38" android:color="?attr/colorPrimary"/>
-</selector>
\ No newline at end of file
diff --git a/Habitica/res/drawable-hdpi/currency_gem.webp b/Habitica/res/drawable-hdpi/currency_gem.webp
deleted file mode 100644
index 068b8e0a9..000000000
Binary files a/Habitica/res/drawable-hdpi/currency_gem.webp and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/custom_reward.webp b/Habitica/res/drawable-hdpi/custom_reward.webp
deleted file mode 100644
index a1367da23..000000000
Binary files a/Habitica/res/drawable-hdpi/custom_reward.webp and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/fab_add_purple.webp b/Habitica/res/drawable-hdpi/fab_add_purple.webp
deleted file mode 100644
index d64b19600..000000000
Binary files a/Habitica/res/drawable-hdpi/fab_add_purple.webp and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/ic_action_chat.webp b/Habitica/res/drawable-hdpi/ic_action_chat.webp
deleted file mode 100644
index 33b84bb65..000000000
Binary files a/Habitica/res/drawable-hdpi/ic_action_chat.webp and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/ic_action_delete_white_24.webp b/Habitica/res/drawable-hdpi/ic_action_delete_white_24.webp
deleted file mode 100644
index 967e21039..000000000
Binary files a/Habitica/res/drawable-hdpi/ic_action_delete_white_24.webp and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/ic_action_more_vert.webp b/Habitica/res/drawable-hdpi/ic_action_more_vert.webp
deleted file mode 100644
index 92c5c86ea..000000000
Binary files a/Habitica/res/drawable-hdpi/ic_action_more_vert.webp and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/ic_chat_black_24dp.webp b/Habitica/res/drawable-hdpi/ic_chat_black_24dp.webp
deleted file mode 100644
index ba15f19f1..000000000
Binary files a/Habitica/res/drawable-hdpi/ic_chat_black_24dp.webp and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/ic_check.webp b/Habitica/res/drawable-hdpi/ic_check.webp
deleted file mode 100644
index 348a58ae6..000000000
Binary files a/Habitica/res/drawable-hdpi/ic_check.webp and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/ic_check_purple_24dp.webp b/Habitica/res/drawable-hdpi/ic_check_purple_24dp.webp
deleted file mode 100644
index 4de874978..000000000
Binary files a/Habitica/res/drawable-hdpi/ic_check_purple_24dp.webp and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/ic_close_purple_300_24dp.webp b/Habitica/res/drawable-hdpi/ic_close_purple_300_24dp.webp
deleted file mode 100644
index 9e10ce538..000000000
Binary files a/Habitica/res/drawable-hdpi/ic_close_purple_300_24dp.webp and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/ic_content_copy_black_24dp.webp b/Habitica/res/drawable-hdpi/ic_content_copy_black_24dp.webp
deleted file mode 100644
index 9bf3b9500..000000000
Binary files a/Habitica/res/drawable-hdpi/ic_content_copy_black_24dp.webp and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/ic_emoticon_grey600_24dp.webp b/Habitica/res/drawable-hdpi/ic_emoticon_grey600_24dp.webp
deleted file mode 100644
index cb0265356..000000000
Binary files a/Habitica/res/drawable-hdpi/ic_emoticon_grey600_24dp.webp and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/ic_flag_black_24dp.webp b/Habitica/res/drawable-hdpi/ic_flag_black_24dp.webp
deleted file mode 100644
index 2f04162af..000000000
Binary files a/Habitica/res/drawable-hdpi/ic_flag_black_24dp.webp and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/ic_info_outline_black_24dp.webp b/Habitica/res/drawable-hdpi/ic_info_outline_black_24dp.webp
deleted file mode 100644
index c351ccad1..000000000
Binary files a/Habitica/res/drawable-hdpi/ic_info_outline_black_24dp.webp and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/ic_keyboard_grey600_24dp.webp b/Habitica/res/drawable-hdpi/ic_keyboard_grey600_24dp.webp
deleted file mode 100644
index 2c784e9a2..000000000
Binary files a/Habitica/res/drawable-hdpi/ic_keyboard_grey600_24dp.webp and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/ic_launch_black_24dp.webp b/Habitica/res/drawable-hdpi/ic_launch_black_24dp.webp
deleted file mode 100644
index e3f879393..000000000
Binary files a/Habitica/res/drawable-hdpi/ic_launch_black_24dp.webp and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/ic_menu_refresh.webp b/Habitica/res/drawable-hdpi/ic_menu_refresh.webp
deleted file mode 100644
index 74071d607..000000000
Binary files a/Habitica/res/drawable-hdpi/ic_menu_refresh.webp and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/icon_custom_reward.webp b/Habitica/res/drawable-hdpi/icon_custom_reward.webp
deleted file mode 100644
index 12f4e3aed..000000000
Binary files a/Habitica/res/drawable-hdpi/icon_custom_reward.webp and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/leave_light.webp b/Habitica/res/drawable-hdpi/leave_light.webp
deleted file mode 100644
index a3a8bf52a..000000000
Binary files a/Habitica/res/drawable-hdpi/leave_light.webp and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/npc_justin_only.webp b/Habitica/res/drawable-hdpi/npc_justin_only.webp
deleted file mode 100644
index ad02a7802..000000000
Binary files a/Habitica/res/drawable-hdpi/npc_justin_only.webp and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/participants_light.webp b/Habitica/res/drawable-hdpi/participants_light.webp
deleted file mode 100644
index 512d60865..000000000
Binary files a/Habitica/res/drawable-hdpi/participants_light.webp and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/pet_status_egg.png b/Habitica/res/drawable-hdpi/pet_status_egg.png
deleted file mode 100644
index 5dd39f87d..000000000
Binary files a/Habitica/res/drawable-hdpi/pet_status_egg.png and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/pet_status_potion.png b/Habitica/res/drawable-hdpi/pet_status_potion.png
deleted file mode 100644
index dc63d40c8..000000000
Binary files a/Habitica/res/drawable-hdpi/pet_status_potion.png and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/presents1.webp b/Habitica/res/drawable-hdpi/presents1.webp
deleted file mode 100644
index bfcd09963..000000000
Binary files a/Habitica/res/drawable-hdpi/presents1.webp and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/presents2.webp b/Habitica/res/drawable-hdpi/presents2.webp
deleted file mode 100644
index e0190737e..000000000
Binary files a/Habitica/res/drawable-hdpi/presents2.webp and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/speech_bubble.9.png b/Habitica/res/drawable-hdpi/speech_bubble.9.png
deleted file mode 100755
index 7a2349f85..000000000
Binary files a/Habitica/res/drawable-hdpi/speech_bubble.9.png and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/support_habitica.webp b/Habitica/res/drawable-hdpi/support_habitica.webp
deleted file mode 100644
index 425091eb8..000000000
Binary files a/Habitica/res/drawable-hdpi/support_habitica.webp and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/task_icon_tag.png b/Habitica/res/drawable-hdpi/task_icon_tag.png
deleted file mode 100644
index 16e8ced1a..000000000
Binary files a/Habitica/res/drawable-hdpi/task_icon_tag.png and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/welcome_diamond_background.webp b/Habitica/res/drawable-hdpi/welcome_diamond_background.webp
deleted file mode 100644
index 751dd5cc0..000000000
Binary files a/Habitica/res/drawable-hdpi/welcome_diamond_background.webp and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/currency_gem.webp b/Habitica/res/drawable-mdpi/currency_gem.webp
deleted file mode 100644
index 8d204385a..000000000
Binary files a/Habitica/res/drawable-mdpi/currency_gem.webp and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/custom_reward.webp b/Habitica/res/drawable-mdpi/custom_reward.webp
deleted file mode 100644
index 0572d415a..000000000
Binary files a/Habitica/res/drawable-mdpi/custom_reward.webp and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/fab_add_purple.webp b/Habitica/res/drawable-mdpi/fab_add_purple.webp
deleted file mode 100644
index 0931dd37a..000000000
Binary files a/Habitica/res/drawable-mdpi/fab_add_purple.webp and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/ic_action_chat.webp b/Habitica/res/drawable-mdpi/ic_action_chat.webp
deleted file mode 100644
index f13714c5b..000000000
Binary files a/Habitica/res/drawable-mdpi/ic_action_chat.webp and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/ic_action_delete_white_24.webp b/Habitica/res/drawable-mdpi/ic_action_delete_white_24.webp
deleted file mode 100644
index 6e929a649..000000000
Binary files a/Habitica/res/drawable-mdpi/ic_action_delete_white_24.webp and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/ic_action_more_vert.webp b/Habitica/res/drawable-mdpi/ic_action_more_vert.webp
deleted file mode 100644
index 5c9b264b9..000000000
Binary files a/Habitica/res/drawable-mdpi/ic_action_more_vert.webp and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/ic_chat_black_24dp.webp b/Habitica/res/drawable-mdpi/ic_chat_black_24dp.webp
deleted file mode 100644
index ea832c5af..000000000
Binary files a/Habitica/res/drawable-mdpi/ic_chat_black_24dp.webp and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/ic_check.webp b/Habitica/res/drawable-mdpi/ic_check.webp
deleted file mode 100644
index 7e4349374..000000000
Binary files a/Habitica/res/drawable-mdpi/ic_check.webp and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/ic_check_purple_24dp.webp b/Habitica/res/drawable-mdpi/ic_check_purple_24dp.webp
deleted file mode 100644
index 6970af282..000000000
Binary files a/Habitica/res/drawable-mdpi/ic_check_purple_24dp.webp and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/ic_close_purple_300_24dp.webp b/Habitica/res/drawable-mdpi/ic_close_purple_300_24dp.webp
deleted file mode 100644
index 36e01d094..000000000
Binary files a/Habitica/res/drawable-mdpi/ic_close_purple_300_24dp.webp and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/ic_content_copy_black_24dp.webp b/Habitica/res/drawable-mdpi/ic_content_copy_black_24dp.webp
deleted file mode 100644
index 9a5618740..000000000
Binary files a/Habitica/res/drawable-mdpi/ic_content_copy_black_24dp.webp and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/ic_emoticon_grey600_24dp.webp b/Habitica/res/drawable-mdpi/ic_emoticon_grey600_24dp.webp
deleted file mode 100644
index 8bf4576fd..000000000
Binary files a/Habitica/res/drawable-mdpi/ic_emoticon_grey600_24dp.webp and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/ic_flag_black_24dp.webp b/Habitica/res/drawable-mdpi/ic_flag_black_24dp.webp
deleted file mode 100644
index 8a619d8ff..000000000
Binary files a/Habitica/res/drawable-mdpi/ic_flag_black_24dp.webp and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/ic_gryphon.webp b/Habitica/res/drawable-mdpi/ic_gryphon.webp
deleted file mode 100644
index 8ce44af99..000000000
Binary files a/Habitica/res/drawable-mdpi/ic_gryphon.webp and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/ic_habitica.webp b/Habitica/res/drawable-mdpi/ic_habitica.webp
deleted file mode 100644
index c49b7d650..000000000
Binary files a/Habitica/res/drawable-mdpi/ic_habitica.webp and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/ic_info_outline_black_24dp.webp b/Habitica/res/drawable-mdpi/ic_info_outline_black_24dp.webp
deleted file mode 100644
index 0d45e16ee..000000000
Binary files a/Habitica/res/drawable-mdpi/ic_info_outline_black_24dp.webp and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/ic_keyboard_grey600_24dp.webp b/Habitica/res/drawable-mdpi/ic_keyboard_grey600_24dp.webp
deleted file mode 100644
index 7b310dff3..000000000
Binary files a/Habitica/res/drawable-mdpi/ic_keyboard_grey600_24dp.webp and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/ic_launch_black_24dp.webp b/Habitica/res/drawable-mdpi/ic_launch_black_24dp.webp
deleted file mode 100644
index 3d55370e1..000000000
Binary files a/Habitica/res/drawable-mdpi/ic_launch_black_24dp.webp and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/ic_menu_refresh.webp b/Habitica/res/drawable-mdpi/ic_menu_refresh.webp
deleted file mode 100644
index c355474e1..000000000
Binary files a/Habitica/res/drawable-mdpi/ic_menu_refresh.webp and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/icon_custom_reward.webp b/Habitica/res/drawable-mdpi/icon_custom_reward.webp
deleted file mode 100644
index 8cf23c98b..000000000
Binary files a/Habitica/res/drawable-mdpi/icon_custom_reward.webp and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/leave_light.webp b/Habitica/res/drawable-mdpi/leave_light.webp
deleted file mode 100644
index 910b8d916..000000000
Binary files a/Habitica/res/drawable-mdpi/leave_light.webp and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/npc_justin_only.png b/Habitica/res/drawable-mdpi/npc_justin_only.png
deleted file mode 100644
index 001f39898..000000000
Binary files a/Habitica/res/drawable-mdpi/npc_justin_only.png and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/participants_light.webp b/Habitica/res/drawable-mdpi/participants_light.webp
deleted file mode 100644
index ba793b54d..000000000
Binary files a/Habitica/res/drawable-mdpi/participants_light.webp and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/pet_status_egg.png b/Habitica/res/drawable-mdpi/pet_status_egg.png
deleted file mode 100644
index cc358b246..000000000
Binary files a/Habitica/res/drawable-mdpi/pet_status_egg.png and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/pet_status_potion.png b/Habitica/res/drawable-mdpi/pet_status_potion.png
deleted file mode 100644
index 34a1c5c92..000000000
Binary files a/Habitica/res/drawable-mdpi/pet_status_potion.png and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/presents1.webp b/Habitica/res/drawable-mdpi/presents1.webp
deleted file mode 100644
index 05ff45bd9..000000000
Binary files a/Habitica/res/drawable-mdpi/presents1.webp and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/presents2.webp b/Habitica/res/drawable-mdpi/presents2.webp
deleted file mode 100644
index 6ee21edbc..000000000
Binary files a/Habitica/res/drawable-mdpi/presents2.webp and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/sidebar_background.webp b/Habitica/res/drawable-mdpi/sidebar_background.webp
deleted file mode 100644
index 77770541f..000000000
Binary files a/Habitica/res/drawable-mdpi/sidebar_background.webp and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/speech_bubble.9.png b/Habitica/res/drawable-mdpi/speech_bubble.9.png
deleted file mode 100755
index 64eee50ae..000000000
Binary files a/Habitica/res/drawable-mdpi/speech_bubble.9.png and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/support_habitica.webp b/Habitica/res/drawable-mdpi/support_habitica.webp
deleted file mode 100644
index a943d69c3..000000000
Binary files a/Habitica/res/drawable-mdpi/support_habitica.webp and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/task_icon_tag.png b/Habitica/res/drawable-mdpi/task_icon_tag.png
deleted file mode 100644
index 880bfeb2c..000000000
Binary files a/Habitica/res/drawable-mdpi/task_icon_tag.png and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/welcome_diamond_background.webp b/Habitica/res/drawable-mdpi/welcome_diamond_background.webp
deleted file mode 100644
index 32c98225d..000000000
Binary files a/Habitica/res/drawable-mdpi/welcome_diamond_background.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/currency_gem.webp b/Habitica/res/drawable-xhdpi/currency_gem.webp
deleted file mode 100644
index 577a314d7..000000000
Binary files a/Habitica/res/drawable-xhdpi/currency_gem.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/custom_reward.webp b/Habitica/res/drawable-xhdpi/custom_reward.webp
deleted file mode 100644
index f38a5b0be..000000000
Binary files a/Habitica/res/drawable-xhdpi/custom_reward.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/fab_add_purple.webp b/Habitica/res/drawable-xhdpi/fab_add_purple.webp
deleted file mode 100644
index e36654767..000000000
Binary files a/Habitica/res/drawable-xhdpi/fab_add_purple.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/ic_action_chat.webp b/Habitica/res/drawable-xhdpi/ic_action_chat.webp
deleted file mode 100644
index a9fa6a9a6..000000000
Binary files a/Habitica/res/drawable-xhdpi/ic_action_chat.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/ic_action_delete_white_24.webp b/Habitica/res/drawable-xhdpi/ic_action_delete_white_24.webp
deleted file mode 100644
index 88179c7bc..000000000
Binary files a/Habitica/res/drawable-xhdpi/ic_action_delete_white_24.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/ic_action_more_vert.webp b/Habitica/res/drawable-xhdpi/ic_action_more_vert.webp
deleted file mode 100644
index 70fd852dd..000000000
Binary files a/Habitica/res/drawable-xhdpi/ic_action_more_vert.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/ic_chat_black_24dp.webp b/Habitica/res/drawable-xhdpi/ic_chat_black_24dp.webp
deleted file mode 100644
index 3e0724919..000000000
Binary files a/Habitica/res/drawable-xhdpi/ic_chat_black_24dp.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/ic_check.webp b/Habitica/res/drawable-xhdpi/ic_check.webp
deleted file mode 100644
index d35e3d641..000000000
Binary files a/Habitica/res/drawable-xhdpi/ic_check.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/ic_check_purple_24dp.webp b/Habitica/res/drawable-xhdpi/ic_check_purple_24dp.webp
deleted file mode 100644
index b4b4379a6..000000000
Binary files a/Habitica/res/drawable-xhdpi/ic_check_purple_24dp.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/ic_close_purple_300_24dp.webp b/Habitica/res/drawable-xhdpi/ic_close_purple_300_24dp.webp
deleted file mode 100644
index 3c791a465..000000000
Binary files a/Habitica/res/drawable-xhdpi/ic_close_purple_300_24dp.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/ic_content_copy_black_24dp.webp b/Habitica/res/drawable-xhdpi/ic_content_copy_black_24dp.webp
deleted file mode 100644
index 66bf5f428..000000000
Binary files a/Habitica/res/drawable-xhdpi/ic_content_copy_black_24dp.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/ic_emoticon_grey600_24dp.webp b/Habitica/res/drawable-xhdpi/ic_emoticon_grey600_24dp.webp
deleted file mode 100644
index dcefdf14c..000000000
Binary files a/Habitica/res/drawable-xhdpi/ic_emoticon_grey600_24dp.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/ic_flag_black_24dp.webp b/Habitica/res/drawable-xhdpi/ic_flag_black_24dp.webp
deleted file mode 100644
index 3d5a573ba..000000000
Binary files a/Habitica/res/drawable-xhdpi/ic_flag_black_24dp.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/ic_gryphon.webp b/Habitica/res/drawable-xhdpi/ic_gryphon.webp
deleted file mode 100644
index 1c66f1f4e..000000000
Binary files a/Habitica/res/drawable-xhdpi/ic_gryphon.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/ic_habitica.webp b/Habitica/res/drawable-xhdpi/ic_habitica.webp
deleted file mode 100644
index 414b4a852..000000000
Binary files a/Habitica/res/drawable-xhdpi/ic_habitica.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/ic_info_outline_black_24dp.webp b/Habitica/res/drawable-xhdpi/ic_info_outline_black_24dp.webp
deleted file mode 100644
index 261ba15ef..000000000
Binary files a/Habitica/res/drawable-xhdpi/ic_info_outline_black_24dp.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/ic_keyboard_grey600_24dp.webp b/Habitica/res/drawable-xhdpi/ic_keyboard_grey600_24dp.webp
deleted file mode 100644
index 9ac031595..000000000
Binary files a/Habitica/res/drawable-xhdpi/ic_keyboard_grey600_24dp.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/ic_launch_black_24dp.webp b/Habitica/res/drawable-xhdpi/ic_launch_black_24dp.webp
deleted file mode 100644
index 001c664b1..000000000
Binary files a/Habitica/res/drawable-xhdpi/ic_launch_black_24dp.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/ic_menu_refresh.webp b/Habitica/res/drawable-xhdpi/ic_menu_refresh.webp
deleted file mode 100644
index 81b2f25f5..000000000
Binary files a/Habitica/res/drawable-xhdpi/ic_menu_refresh.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/icon_custom_reward.webp b/Habitica/res/drawable-xhdpi/icon_custom_reward.webp
deleted file mode 100644
index 770bde65e..000000000
Binary files a/Habitica/res/drawable-xhdpi/icon_custom_reward.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/leave_light.webp b/Habitica/res/drawable-xhdpi/leave_light.webp
deleted file mode 100644
index 3c9cb8d1d..000000000
Binary files a/Habitica/res/drawable-xhdpi/leave_light.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/npc_justin_only.webp b/Habitica/res/drawable-xhdpi/npc_justin_only.webp
deleted file mode 100644
index bcd47ce5c..000000000
Binary files a/Habitica/res/drawable-xhdpi/npc_justin_only.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/participants_light.webp b/Habitica/res/drawable-xhdpi/participants_light.webp
deleted file mode 100644
index 4abb8a624..000000000
Binary files a/Habitica/res/drawable-xhdpi/participants_light.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/pet_status_egg.png b/Habitica/res/drawable-xhdpi/pet_status_egg.png
deleted file mode 100644
index de8b3fdc2..000000000
Binary files a/Habitica/res/drawable-xhdpi/pet_status_egg.png and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/pet_status_potion.png b/Habitica/res/drawable-xhdpi/pet_status_potion.png
deleted file mode 100644
index 3a2ebe35e..000000000
Binary files a/Habitica/res/drawable-xhdpi/pet_status_potion.png and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/presents1.webp b/Habitica/res/drawable-xhdpi/presents1.webp
deleted file mode 100644
index 547541544..000000000
Binary files a/Habitica/res/drawable-xhdpi/presents1.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/presents2.webp b/Habitica/res/drawable-xhdpi/presents2.webp
deleted file mode 100644
index e7d87f7f8..000000000
Binary files a/Habitica/res/drawable-xhdpi/presents2.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/speech_bubble.9.png b/Habitica/res/drawable-xhdpi/speech_bubble.9.png
deleted file mode 100755
index 04f81bfa7..000000000
Binary files a/Habitica/res/drawable-xhdpi/speech_bubble.9.png and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/support_habitica.webp b/Habitica/res/drawable-xhdpi/support_habitica.webp
deleted file mode 100644
index 3062f4195..000000000
Binary files a/Habitica/res/drawable-xhdpi/support_habitica.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/task_icon_tag.png b/Habitica/res/drawable-xhdpi/task_icon_tag.png
deleted file mode 100644
index 28adc1085..000000000
Binary files a/Habitica/res/drawable-xhdpi/task_icon_tag.png and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/welcome_diamond_background.webp b/Habitica/res/drawable-xhdpi/welcome_diamond_background.webp
deleted file mode 100644
index 642afe001..000000000
Binary files a/Habitica/res/drawable-xhdpi/welcome_diamond_background.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/currency_gem.webp b/Habitica/res/drawable-xxhdpi/currency_gem.webp
deleted file mode 100644
index 097bea2ac..000000000
Binary files a/Habitica/res/drawable-xxhdpi/currency_gem.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/custom_reward.webp b/Habitica/res/drawable-xxhdpi/custom_reward.webp
deleted file mode 100644
index e717832fb..000000000
Binary files a/Habitica/res/drawable-xxhdpi/custom_reward.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/fab_add_purple.webp b/Habitica/res/drawable-xxhdpi/fab_add_purple.webp
deleted file mode 100644
index 6980d0566..000000000
Binary files a/Habitica/res/drawable-xxhdpi/fab_add_purple.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/ic_action_chat.webp b/Habitica/res/drawable-xxhdpi/ic_action_chat.webp
deleted file mode 100644
index 014001816..000000000
Binary files a/Habitica/res/drawable-xxhdpi/ic_action_chat.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/ic_action_delete_white_24.webp b/Habitica/res/drawable-xxhdpi/ic_action_delete_white_24.webp
deleted file mode 100644
index 546b59dec..000000000
Binary files a/Habitica/res/drawable-xxhdpi/ic_action_delete_white_24.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/ic_action_more_vert.webp b/Habitica/res/drawable-xxhdpi/ic_action_more_vert.webp
deleted file mode 100644
index 9b0568512..000000000
Binary files a/Habitica/res/drawable-xxhdpi/ic_action_more_vert.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/ic_chat_black_24dp.webp b/Habitica/res/drawable-xxhdpi/ic_chat_black_24dp.webp
deleted file mode 100644
index 69c6072d9..000000000
Binary files a/Habitica/res/drawable-xxhdpi/ic_chat_black_24dp.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/ic_check.webp b/Habitica/res/drawable-xxhdpi/ic_check.webp
deleted file mode 100644
index 5af7e6ad5..000000000
Binary files a/Habitica/res/drawable-xxhdpi/ic_check.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/ic_check_purple_24dp.webp b/Habitica/res/drawable-xxhdpi/ic_check_purple_24dp.webp
deleted file mode 100644
index 026a007a3..000000000
Binary files a/Habitica/res/drawable-xxhdpi/ic_check_purple_24dp.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/ic_close_purple_300_24dp.webp b/Habitica/res/drawable-xxhdpi/ic_close_purple_300_24dp.webp
deleted file mode 100644
index 6c7282000..000000000
Binary files a/Habitica/res/drawable-xxhdpi/ic_close_purple_300_24dp.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/ic_content_copy_black_24dp.webp b/Habitica/res/drawable-xxhdpi/ic_content_copy_black_24dp.webp
deleted file mode 100644
index 78ff789f2..000000000
Binary files a/Habitica/res/drawable-xxhdpi/ic_content_copy_black_24dp.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/ic_emoticon_grey600_24dp.webp b/Habitica/res/drawable-xxhdpi/ic_emoticon_grey600_24dp.webp
deleted file mode 100644
index 13832f0f1..000000000
Binary files a/Habitica/res/drawable-xxhdpi/ic_emoticon_grey600_24dp.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/ic_flag_black_24dp.webp b/Habitica/res/drawable-xxhdpi/ic_flag_black_24dp.webp
deleted file mode 100644
index bcb5060b1..000000000
Binary files a/Habitica/res/drawable-xxhdpi/ic_flag_black_24dp.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/ic_gryphon.webp b/Habitica/res/drawable-xxhdpi/ic_gryphon.webp
deleted file mode 100644
index 150907f75..000000000
Binary files a/Habitica/res/drawable-xxhdpi/ic_gryphon.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/ic_habitica.webp b/Habitica/res/drawable-xxhdpi/ic_habitica.webp
deleted file mode 100644
index e21223ba5..000000000
Binary files a/Habitica/res/drawable-xxhdpi/ic_habitica.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/ic_info_outline_black_24dp.webp b/Habitica/res/drawable-xxhdpi/ic_info_outline_black_24dp.webp
deleted file mode 100644
index 06cc783e4..000000000
Binary files a/Habitica/res/drawable-xxhdpi/ic_info_outline_black_24dp.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/ic_keyboard_grey600_24dp.webp b/Habitica/res/drawable-xxhdpi/ic_keyboard_grey600_24dp.webp
deleted file mode 100644
index a454f9a9b..000000000
Binary files a/Habitica/res/drawable-xxhdpi/ic_keyboard_grey600_24dp.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/ic_launch_black_24dp.webp b/Habitica/res/drawable-xxhdpi/ic_launch_black_24dp.webp
deleted file mode 100644
index d4d76852a..000000000
Binary files a/Habitica/res/drawable-xxhdpi/ic_launch_black_24dp.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/icon_custom_reward.webp b/Habitica/res/drawable-xxhdpi/icon_custom_reward.webp
deleted file mode 100644
index dcbb29c32..000000000
Binary files a/Habitica/res/drawable-xxhdpi/icon_custom_reward.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/leave_light.webp b/Habitica/res/drawable-xxhdpi/leave_light.webp
deleted file mode 100644
index 118bc6405..000000000
Binary files a/Habitica/res/drawable-xxhdpi/leave_light.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/npc_justin_only.webp b/Habitica/res/drawable-xxhdpi/npc_justin_only.webp
deleted file mode 100644
index 954b66896..000000000
Binary files a/Habitica/res/drawable-xxhdpi/npc_justin_only.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/participants_light.webp b/Habitica/res/drawable-xxhdpi/participants_light.webp
deleted file mode 100644
index 586b5a4e6..000000000
Binary files a/Habitica/res/drawable-xxhdpi/participants_light.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/pet_status_egg.png b/Habitica/res/drawable-xxhdpi/pet_status_egg.png
deleted file mode 100644
index b4f145ea0..000000000
Binary files a/Habitica/res/drawable-xxhdpi/pet_status_egg.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/pet_status_potion.png b/Habitica/res/drawable-xxhdpi/pet_status_potion.png
deleted file mode 100644
index 5edb9dab0..000000000
Binary files a/Habitica/res/drawable-xxhdpi/pet_status_potion.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/presents1.webp b/Habitica/res/drawable-xxhdpi/presents1.webp
deleted file mode 100644
index 1c7fe9c92..000000000
Binary files a/Habitica/res/drawable-xxhdpi/presents1.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/presents2.webp b/Habitica/res/drawable-xxhdpi/presents2.webp
deleted file mode 100644
index 395d996df..000000000
Binary files a/Habitica/res/drawable-xxhdpi/presents2.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/speech_bubble.9.png b/Habitica/res/drawable-xxhdpi/speech_bubble.9.png
deleted file mode 100755
index 77efa54a2..000000000
Binary files a/Habitica/res/drawable-xxhdpi/speech_bubble.9.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/support_habitica.webp b/Habitica/res/drawable-xxhdpi/support_habitica.webp
deleted file mode 100644
index eeecb4ac8..000000000
Binary files a/Habitica/res/drawable-xxhdpi/support_habitica.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/task_icon_tag.png b/Habitica/res/drawable-xxhdpi/task_icon_tag.png
deleted file mode 100644
index 0419931d7..000000000
Binary files a/Habitica/res/drawable-xxhdpi/task_icon_tag.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/welcome_diamond_background.webp b/Habitica/res/drawable-xxhdpi/welcome_diamond_background.webp
deleted file mode 100644
index 4dad1b0cc..000000000
Binary files a/Habitica/res/drawable-xxhdpi/welcome_diamond_background.webp and /dev/null differ
diff --git a/Habitica/res/drawable-xxxhdpi/ic_check_purple_24dp.webp b/Habitica/res/drawable-xxxhdpi/ic_check_purple_24dp.webp
deleted file mode 100644
index e1a98dce0..000000000
Binary files a/Habitica/res/drawable-xxxhdpi/ic_check_purple_24dp.webp and /dev/null differ
diff --git a/Habitica/res/drawable/divider.xml b/Habitica/res/drawable/divider.xml
deleted file mode 100644
index 822780bc5..000000000
--- a/Habitica/res/drawable/divider.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <size android:width="1dip" />
-    <solid android:color="#666666" />
-</shape> 
\ No newline at end of file
diff --git a/Habitica/res/drawable/edittext.xml b/Habitica/res/drawable/edittext.xml
deleted file mode 100644
index c6d6d5cff..000000000
--- a/Habitica/res/drawable/edittext.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:top="18dp">
-        <shape android:shape="rectangle">
-            <solid android:color="@color/content_background_offset" />
-            <corners android:radius="4dp" android:topLeftRadius="8dp" android:topRightRadius="8dp" />
-        </shape>
-    </item>
-
-    <item android:bottom="2dp" android:top="18dp">
-        <shape android:shape="rectangle">
-            <solid android:color="@color/window_background" />
-            <corners android:topLeftRadius="4dp" android:topRightRadius="4dp" android:bottomLeftRadius="2dp" android:bottomRightRadius="2dp" />
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/Habitica/res/drawable/emoticon.xml b/Habitica/res/drawable/emoticon.xml
deleted file mode 100644
index 99f885520..000000000
--- a/Habitica/res/drawable/emoticon.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- drawable/emoticon.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#000" android:pathData="M12,17.5C14.33,17.5 16.3,16.04 17.11,14H6.89C7.69,16.04 9.67,17.5 12,17.5M8.5,11A1.5,1.5 0 0,0 10,9.5A1.5,1.5 0 0,0 8.5,8A1.5,1.5 0 0,0 7,9.5A1.5,1.5 0 0,0 8.5,11M15.5,11A1.5,1.5 0 0,0 17,9.5A1.5,1.5 0 0,0 15.5,8A1.5,1.5 0 0,0 14,9.5A1.5,1.5 0 0,0 15.5,11M12,20A8,8 0 0,1 4,12A8,8 0 0,1 12,4A8,8 0 0,1 20,12A8,8 0 0,1 12,20M12,2C6.47,2 2,6.5 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z" />
-</vector>
\ No newline at end of file
diff --git a/Habitica/res/drawable/gem_circle_background.xml b/Habitica/res/drawable/gem_circle_background.xml
deleted file mode 100644
index 7d3268084..000000000
--- a/Habitica/res/drawable/gem_circle_background.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval" >
-    <solid android:color="@color/white"/>
-    <stroke android:color="@color/gem_icon_color" android:width="2dp" />
-</shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/gem_value_circle_background.xml b/Habitica/res/drawable/gem_value_circle_background.xml
deleted file mode 100644
index e4109e01b..000000000
--- a/Habitica/res/drawable/gem_value_circle_background.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle" >
-    <solid android:color="@color/white"/>
-    <corners android:radius="80dp"/>
-    <stroke android:color="@color/gem_icon_color" android:width="2dp" />
-    
-</shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/keyboard.xml b/Habitica/res/drawable/keyboard.xml
deleted file mode 100644
index df6149a29..000000000
--- a/Habitica/res/drawable/keyboard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- drawable/keyboard.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#000" android:pathData="M19,10H17V8H19M19,13H17V11H19M16,10H14V8H16M16,13H14V11H16M16,17H8V15H16M7,10H5V8H7M7,13H5V11H7M8,11H10V13H8M8,8H10V10H8M11,11H13V13H11M11,8H13V10H11M20,5H4C2.89,5 2,5.89 2,7V17A2,2 0 0,0 4,19H20A2,2 0 0,0 22,17V7C22,5.89 21.1,5 20,5Z" />
-</vector>
\ No newline at end of file
diff --git a/Habitica/res/drawable/md_transparent.xml b/Habitica/res/drawable/md_transparent.xml
deleted file mode 100644
index 399a46bf1..000000000
--- a/Habitica/res/drawable/md_transparent.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@android:color/transparent" />
-</shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/nav_icon_colors.xml b/Habitica/res/drawable/nav_icon_colors.xml
deleted file mode 100644
index cd141807d..000000000
--- a/Habitica/res/drawable/nav_icon_colors.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true" android:color="@android:color/white" />
-    <item android:state_pressed="true" android:state_enabled="true" android:color="@android:color/white" />
-    <item android:color="@color/brand_500" />
-</selector>
\ No newline at end of file
diff --git a/Habitica/res/drawable/nav_item_color_state.xml b/Habitica/res/drawable/nav_item_color_state.xml
deleted file mode 100644
index c9ab128ae..000000000
--- a/Habitica/res/drawable/nav_item_color_state.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/content_background" android:state_enabled="true" />
-    <item android:color="@color/brand_background_dark" android:state_enabled="false" />
-</selector>
\ No newline at end of file
diff --git a/Habitica/res/drawable/npc_daniel.webp b/Habitica/res/drawable/npc_daniel.webp
deleted file mode 100644
index 9ada4ee55..000000000
Binary files a/Habitica/res/drawable/npc_daniel.webp and /dev/null differ
diff --git a/Habitica/res/drawable/progressbar_red.xml b/Habitica/res/drawable/progressbar_red.xml
deleted file mode 100644
index 2a756725a..000000000
--- a/Habitica/res/drawable/progressbar_red.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:id="@android:id/background">
-        <shape>
-            <solid
-                android:color="?attr/colorContentBackground"
-                />
-
-        </shape>
-    </item>
-    <item android:id="@android:id/progress">
-        <clip>
-            <shape>
-
-            <solid
-                android:color="@color/hpColor"
-                />
-            </shape>
-        </clip>
-    </item>
-</layer-list>
diff --git a/Habitica/res/drawable/progressbar_yellow.xml b/Habitica/res/drawable/progressbar_yellow.xml
deleted file mode 100644
index f51304b31..000000000
--- a/Habitica/res/drawable/progressbar_yellow.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:id="@android:id/background">
-        <shape>
-            <solid
-                android:color="@color/white"
-                />
-
-        </shape>
-    </item>
-    <item android:id="@android:id/progress">
-        <clip>
-            <shape>
-
-            <solid
-                android:color="@color/xpColor"
-                />
-            </shape>
-        </clip>
-    </item>
-</layer-list>
diff --git a/Habitica/res/drawable/seeds_badge_store.webp b/Habitica/res/drawable/seeds_badge_store.webp
deleted file mode 100644
index 4745de6de..000000000
Binary files a/Habitica/res/drawable/seeds_badge_store.webp and /dev/null differ
diff --git a/Habitica/res/drawable/todo_checkbox.xml b/Habitica/res/drawable/todo_checkbox.xml
deleted file mode 100644
index c00dbb67b..000000000
--- a/Habitica/res/drawable/todo_checkbox.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_checked="true" android:drawable="@drawable/todo_checked" />
-    <item android:state_checked="false" android:drawable="@drawable/todo_unchecked" />
-
-</selector>
\ No newline at end of file
diff --git a/Habitica/res/drawable/white_rounded_bg.xml b/Habitica/res/drawable/white_rounded_bg.xml
deleted file mode 100644
index 6661d90cf..000000000
--- a/Habitica/res/drawable/white_rounded_bg.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="5dp" />
-    <solid android:color="@color/white" />
-</shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/white_rounded_border.xml b/Habitica/res/drawable/white_rounded_border.xml
deleted file mode 100644
index 4f58fc66d..000000000
--- a/Habitica/res/drawable/white_rounded_border.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <stroke
-        android:width="1dp"
-        android:color="@color/white"/>
-    <corners android:radius="6dp" />
-</shape>
diff --git a/Habitica/res/drawable/widget_background.xml b/Habitica/res/drawable/widget_background.xml
deleted file mode 100644
index d20a9e9e3..000000000
--- a/Habitica/res/drawable/widget_background.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:shape="rectangle">
-
-    <!-- view background color -->
-    <solid
-            android:color="@color/widget_background" >
-    </solid>
-
-    <!-- Here is the corner radius -->
-    <corners
-            android:radius="@dimen/widget_rounding"   >
-    </corners>
-
-</shape>
\ No newline at end of file
diff --git a/Habitica/res/layout/activity_maintenance.xml b/Habitica/res/layout/activity_maintenance.xml
index 4e8786645..e986615a3 100644
--- a/Habitica/res/layout/activity_maintenance.xml
+++ b/Habitica/res/layout/activity_maintenance.xml
@@ -19,7 +19,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="180dp"
                 android:scaleType="centerInside"/>
-        <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
+        <TextView
                 android:id="@+id/descriptionTextView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"/>
diff --git a/Habitica/res/layout/activity_report_message.xml b/Habitica/res/layout/activity_report_message.xml
index e9d5f836c..a005a9039 100644
--- a/Habitica/res/layout/activity_report_message.xml
+++ b/Habitica/res/layout/activity_report_message.xml
@@ -4,75 +4,67 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:tools="http://schemas.android.com/tools">
-
     <View
         android:id="@+id/touch_outside"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
-
-    <FrameLayout
+    <LinearLayout
+        android:orientation="vertical" android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:id="@+id/bottom_sheet"
         app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
         app:behavior_peekHeight="350dp"
         app:behavior_hideable="true"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:background="@color/content_background">
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/app_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:elevation="0dp">
 
-        <LinearLayout
-            android:id="@+id/content_container"
-            android:orientation="vertical" android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@color/content_background"
-            >
-            <com.google.android.material.appbar.AppBarLayout
-                android:id="@+id/app_bar"
+            <androidx.appcompat.widget.Toolbar
+                android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:elevation="0dp">
-
-                <androidx.appcompat.widget.Toolbar
-                    android:id="@+id/toolbar"
-                    android:layout_width="match_parent"
+                android:minHeight="?attr/actionBarSize"
+                android:theme="@style/Toolbar"
+                app:title=""
+                android:background="@color/content_background"
+                app:layout_scrollFlags="scroll|enterAlways"
+                app:titleTextColor="@color/text_primary"
+                app:theme="@style/ReportMessageToolbar"
+                app:popupTheme="@style/ThemeOverlay.AppCompat.Dark">
+                <ImageButton
+                    android:id="@+id/close_button"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:minHeight="?attr/actionBarSize"
-                    android:theme="@style/Toolbar"
-                    app:title=""
-                    android:background="@color/content_background"
-                    app:layout_scrollFlags="scroll|enterAlways"
-                    app:titleTextColor="@color/text_primary"
-                    app:theme="@style/ReportMessageToolbar"
-                    app:popupTheme="@style/ThemeOverlay.AppCompat.Dark">
-                    <ImageButton
-                        android:id="@+id/close_button"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:src="@drawable/ic_close_grey_800_24dp"
-                        android:background="@color/transparent"
-                        android:paddingEnd="@dimen/spacing_small"/>
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/report_violation"
-                        android:textSize="20sp"
-                        android:textColor="@color/text_primary"
-                        android:layout_marginEnd="36dp"
-                        android:id="@+id/toolbar_title" />
-                    <Button
-                        android:id="@+id/report_button"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/report"
-                        android:textColor="@color/red_50"
-                        style="@style/Widget.AppCompat.Button.Borderless"
-                        android:layout_marginEnd="8dp"
-                        android:layout_gravity="end" />
-                </androidx.appcompat.widget.Toolbar>
+                    android:src="@drawable/ic_close_grey_800_24dp"
+                    android:background="@color/transparent"
+                    android:paddingEnd="@dimen/spacing_small"/>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/report_violation"
+                    android:textSize="20sp"
+                    android:textColor="@color/text_primary"
+                    android:layout_marginEnd="36dp"
+                    android:id="@+id/toolbar_title" />
+                <Button
+                    android:id="@+id/report_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/report"
+                    android:textColor="@color/red_50"
+                    style="@style/Widget.AppCompat.Button.Borderless"
+                    android:layout_marginEnd="8dp"
+                    android:layout_gravity="end" />
+            </androidx.appcompat.widget.Toolbar>
 
-            </com.google.android.material.appbar.AppBarLayout>
-            <androidx.core.widget.NestedScrollView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginBottom="0dp">
+        </com.google.android.material.appbar.AppBarLayout>
+        <androidx.core.widget.NestedScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginBottom="0dp">
             <LinearLayout
                 android:orientation="vertical" android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -136,7 +128,6 @@
                     android:textColorLink="?colorAccent"
                     />
             </LinearLayout>
-            </androidx.core.widget.NestedScrollView>
-        </LinearLayout>
-    </FrameLayout>
+        </androidx.core.widget.NestedScrollView>
+    </LinearLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/autocomplete_emoji.xml b/Habitica/res/layout/autocomplete_emoji.xml
index 0eef15c18..9bdcf7c97 100644
--- a/Habitica/res/layout/autocomplete_emoji.xml
+++ b/Habitica/res/layout/autocomplete_emoji.xml
@@ -6,7 +6,7 @@
     android:paddingBottom="@dimen/spacing_medium"
     android:paddingStart="@dimen/spacing_large"
     android:paddingEnd="@dimen/spacing_large">
-    <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
+    <TextView
         android:id="@+id/emoji_textview"
         android:layout_width="wrap_content"
         android:layout_height="30dp"
diff --git a/Habitica/res/layout/avatar_with_bars.xml b/Habitica/res/layout/avatar_with_bars.xml
index 2d5a4460f..2053e5cc9 100644
--- a/Habitica/res/layout/avatar_with_bars.xml
+++ b/Habitica/res/layout/avatar_with_bars.xml
@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_centerHorizontal="true"
     android:adjustViewBounds="true"
     android:background="?attr/headerBackgroundColor"
     android:focusable="true"
diff --git a/Habitica/res/layout/challenge_item.xml b/Habitica/res/layout/challenge_item.xml
index 9828cedf1..681b68884 100644
--- a/Habitica/res/layout/challenge_item.xml
+++ b/Habitica/res/layout/challenge_item.xml
@@ -47,7 +47,7 @@
         android:orientation="vertical">
 
 
-        <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
+        <TextView
             android:id="@+id/challenge_name"
             style="@style/ChallengeName"
             android:layout_width="match_parent"
@@ -56,7 +56,7 @@
             android:maxLines="3"
             tools:text="Name" />
 
-        <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
+        <TextView
             android:id="@+id/challenge_shorttext"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/Habitica/res/layout/chat_item.xml b/Habitica/res/layout/chat_item.xml
index 6aacc5fd8..92540ded8 100644
--- a/Habitica/res/layout/chat_item.xml
+++ b/Habitica/res/layout/chat_item.xml
@@ -85,7 +85,7 @@
                 tools:text="2d ago"
                 android:textSize="12sp"
                 android:textColor="@color/text_quad"/>
-            <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
+            <TextView
                 android:id="@+id/message_text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/Habitica/res/layout/checklist_item_row.xml b/Habitica/res/layout/checklist_item_row.xml
index 55ae48abf..bb3c06cb9 100644
--- a/Habitica/res/layout/checklist_item_row.xml
+++ b/Habitica/res/layout/checklist_item_row.xml
@@ -1,42 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal" android:layout_width="match_parent"
+    android:layout_height="fill_parent"
+    android:minHeight="@dimen/checklist_item_min_height"
     xmlns:tools="http://schemas.android.com/tools">
-    <LinearLayout
-        android:orientation="horizontal" android:layout_width="match_parent"
-        android:layout_height="fill_parent"
-        android:minHeight="@dimen/checklist_item_min_height">
-        <FrameLayout
-            android:id="@+id/checkBoxHolder"
-            android:layout_width="@dimen/button_width"
-            android:layout_height="match_parent"
-            tools:background="@color/red_10">
-            <View
-                android:id="@+id/checkBoxBackground"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:gravity="center"
-                android:background="@drawable/checklist_unchecked"
-                android:layout_gravity="center" />
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"/>
-                <ImageView
-                    android:id="@+id/checkmark"
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
-                    android:layout_gravity="center"
-                    android:scaleType="center"
-                    android:src="@drawable/checkmark" />
-        </FrameLayout>
-        <com.habitrpg.android.habitica.ui.views.EllipsisTextView
-            android:id="@+id/checkedTextView"
-            style="@style/Body2"
+    <FrameLayout
+        android:id="@+id/checkBoxHolder"
+        android:layout_width="@dimen/button_width"
+        android:layout_height="match_parent"
+        tools:background="@color/red_10">
+        <View
+            android:id="@+id/checkBoxBackground"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:gravity="center"
+            android:background="@drawable/checklist_unchecked"
+            android:layout_gravity="center" />
+        <View
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="5dp"
-            android:paddingStart="16dp"
-            android:layout_gravity="center_vertical"/>
-    </LinearLayout>
-</FrameLayout>
\ No newline at end of file
+            android:layout_height="match_parent"/>
+        <ImageView
+            android:id="@+id/checkmark"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:layout_gravity="center"
+            android:scaleType="center"
+            android:src="@drawable/checkmark" />
+    </FrameLayout>
+    <com.habitrpg.android.habitica.ui.views.EllipsisTextView
+        android:id="@+id/checkedTextView"
+        style="@style/Body2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="5dp"
+        android:paddingStart="16dp"
+        android:layout_gravity="center_vertical"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/circular_progress.xml b/Habitica/res/layout/circular_progress.xml
new file mode 100644
index 000000000..84aa5df2f
--- /dev/null
+++ b/Habitica/res/layout/circular_progress.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_gravity="center"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+<com.google.android.material.progressindicator.CircularProgressIndicator android:layout_width="60dp"
+    android:layout_height="60dp"
+    app:indicatorColor="@color/text_brand_neon"
+    android:indeterminateTint="@color/text_brand_neon"
+    android:progressTint="@color/text_brand_neon"
+    android:layout_gravity="center"
+    android:indeterminate="true" />
+</FrameLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/customization_grid_background_item.xml b/Habitica/res/layout/customization_grid_background_item.xml
index 2dff4eb5f..058ae23f6 100644
--- a/Habitica/res/layout/customization_grid_background_item.xml
+++ b/Habitica/res/layout/customization_grid_background_item.xml
@@ -1,20 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/card_view"
-    android:layout_width="match_parent"
+    android:id="@+id/wrapper"
+    android:layout_width="76dp"
     android:layout_height="wrap_content"
-    android:minHeight="60dp">
-
-    <LinearLayout
-        android:id="@+id/wrapper"
-        android:layout_width="76dp"
-        android:layout_height="wrap_content"
-        android:background="@drawable/layout_rounded_bg_window"
-        android:orientation="vertical"
-        android:layout_gravity="center">
-
+    android:background="@drawable/layout_rounded_bg_window"
+    android:orientation="vertical"
+    android:layout_gravity="center">
         <com.facebook.drawee.view.SimpleDraweeView
             android:id="@+id/imageView"
             android:layout_width="76dp"
@@ -38,5 +31,4 @@
                 android:textSize="15sp"
                 android:layout_gravity="center" />
         </FrameLayout>
-    </LinearLayout>
-</FrameLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/customization_grid_item.xml b/Habitica/res/layout/customization_grid_item.xml
index 5d9ba5d57..f46ee6748 100644
--- a/Habitica/res/layout/customization_grid_item.xml
+++ b/Habitica/res/layout/customization_grid_item.xml
@@ -1,20 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/card_view"
-    android:layout_width="match_parent"
+    android:id="@+id/wrapper"
+    android:layout_width="76dp"
     android:layout_height="wrap_content"
-    android:minHeight="60dp">
-
-    <LinearLayout
-        android:id="@+id/wrapper"
-        android:layout_width="76dp"
-        android:layout_height="wrap_content"
-        android:background="@drawable/layout_rounded_bg_window"
-        android:orientation="vertical"
-        android:layout_gravity="center">
-
+    android:background="@drawable/layout_rounded_bg_window"
+    android:orientation="vertical"
+    android:layout_gravity="center">
         <com.facebook.drawee.view.SimpleDraweeView
             android:id="@+id/imageView"
             android:layout_width="60dp"
@@ -37,5 +30,4 @@
                         android:textSize="15sp"
                         android:layout_gravity="center" />
         </FrameLayout>
-    </LinearLayout>
-</FrameLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_task_filter.xml b/Habitica/res/layout/dialog_task_filter.xml
index 080d732a7..3a191934e 100644
--- a/Habitica/res/layout/dialog_task_filter.xml
+++ b/Habitica/res/layout/dialog_task_filter.xml
@@ -3,95 +3,90 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:layout_marginBottom="16dp">
+    <TextView
+        android:id="@+id/task_type_title"
+        style="@style/Caption3"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        tools:text="@string/habits"
+        android:textAllCaps="true"/>
+    <RadioGroup
+        android:id="@+id/task_filter_wrapper"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:orientation="horizontal"
+        android:layout_marginTop="12dp"
+        android:layout_marginBottom="24dp">
+        <RadioButton
+            android:id="@+id/all_task_filter"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/all"
+            style="@style/TaskFilterRadioButton"
+            android:checked="true"
+            />
+        <RadioButton
+            android:id="@+id/second_task_filter"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/weak"
+            style="@style/TaskFilterRadioButton"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp" />
+        <RadioButton
+            android:id="@+id/third_task_filter"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/strong"
+            style="@style/TaskFilterRadioButton"/>
+    </RadioGroup>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/separator" />
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="16dp"
-        android:orientation="vertical">
+        android:orientation="horizontal"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp">
+
         <TextView
-            android:id="@+id/task_type_title"
+            android:id="@+id/tags_title"
             style="@style/Caption3"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            tools:text="@string/habits"
+            android:layout_gravity="center"
+            android:layout_weight="2"
+            android:text="@string/tags"
             android:textAllCaps="true"/>
-        <RadioGroup
-            android:id="@+id/task_filter_wrapper"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:orientation="horizontal"
-            android:layout_marginTop="12dp"
-            android:layout_marginBottom="24dp">
-            <RadioButton
-                android:id="@+id/all_task_filter"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/all"
-                style="@style/TaskFilterRadioButton"
-                android:checked="true"
-                />
-            <RadioButton
-                android:id="@+id/second_task_filter"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/weak"
-                style="@style/TaskFilterRadioButton"
-                android:layout_marginStart="8dp"
-                android:layout_marginEnd="8dp" />
-            <RadioButton
-                android:id="@+id/third_task_filter"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/strong"
-                style="@style/TaskFilterRadioButton"/>
-        </RadioGroup>
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="@color/separator" />
+
+        <Button
+            android:id="@+id/tag_edit_button"
+            style="@style/Body1_Button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end"
+            android:text="@string/edit_tag_btn_edit"
+            android:textColor="?colorPrimary"
+            android:textSize="16sp"
+            android:gravity="end|center_vertical"
+            android:paddingEnd="0dp"
+            android:paddingStart="0dp"/>
+    </LinearLayout>
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
         <LinearLayout
+            android:id="@+id/tags_list"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp">
-
-            <TextView
-                android:id="@+id/tags_title"
-                style="@style/Caption3"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_weight="2"
-                android:text="@string/tags"
-                android:textAllCaps="true"/>
-
-                <Button
-                    android:id="@+id/tag_edit_button"
-                    style="@style/Body1_Button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="end"
-                    android:text="@string/edit_tag_btn_edit"
-                    android:textColor="?colorPrimary"
-                    android:textSize="16sp"
-                    android:gravity="end|center_vertical"
-                    android:paddingEnd="0dp"/>
-        </LinearLayout>
-        <ScrollView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-            <LinearLayout
-                android:id="@+id/tags_list"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="24dp"
-                android:orientation="vertical"
-                android:showDividers="middle"
-                android:divider="@color/transparent"
-                android:dividerPadding="8dp"/>
-        </ScrollView>
-
-    </LinearLayout>
+            android:layout_marginBottom="24dp"
+            android:orientation="vertical"
+            android:showDividers="middle"
+            android:divider="@color/transparent"
+            android:dividerPadding="8dp"/>
+    </ScrollView>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_yesterdaily_task.xml b/Habitica/res/layout/dialog_yesterdaily_task.xml
index 68f7fc7ef..a8bdeca74 100644
--- a/Habitica/res/layout/dialog_yesterdaily_task.xml
+++ b/Habitica/res/layout/dialog_yesterdaily_task.xml
@@ -35,7 +35,7 @@
                 android:scaleType="center"
                 android:src="@drawable/checkmark" />
         </FrameLayout>
-        <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
+        <TextView
             android:id="@+id/text_view"
             style="@style/Subheader3"
             android:layout_width="match_parent"
diff --git a/Habitica/res/layout/fragment_avatar_overview.xml b/Habitica/res/layout/fragment_avatar_overview.xml
index f7fd6fdf5..4c4b1fa98 100644
--- a/Habitica/res/layout/fragment_avatar_overview.xml
+++ b/Habitica/res/layout/fragment_avatar_overview.xml
@@ -20,12 +20,8 @@
             style="@style/SectionTitle"
             android:text="@string/avatar_body"
             android:textAppearance="?android:attr/textAppearanceMedium" />
-
-        <FrameLayout
-            android:background="@drawable/layout_rounded_bg_window"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
             <LinearLayout
+                android:background="@drawable/layout_rounded_bg_window"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
@@ -66,24 +62,19 @@
                     android:id="@+id/avatarSkinView"
                     app:equipmentTitle="@string/avatar_skin"/>
             </LinearLayout>
-        </FrameLayout>
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/avatar_extras"
             android:textAppearance="?android:attr/textAppearanceMedium"
             style="@style/SectionTitle"/>
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@drawable/layout_rounded_bg_window">
             <LinearLayout
                 android:orientation="vertical"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:divider="?android:listDivider"
-                android:showDividers="middle">
+                android:showDividers="middle"
+                android:background="@drawable/layout_rounded_bg_window">
                 <com.habitrpg.android.habitica.ui.views.EquipmentItemRow
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -117,7 +108,6 @@
                     android:id="@+id/avatar_headband_view"
                     app:equipmentTitle="@string/avatar_headband"/>
             </LinearLayout>
-        </FrameLayout>
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -125,16 +115,13 @@
             android:textAppearance="?android:attr/textAppearanceMedium"
             style="@style/SectionTitle"/>
 
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@drawable/layout_rounded_bg_window">
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:divider="?android:listDivider"
-                android:showDividers="middle">
+                android:showDividers="middle"
+                android:background="@drawable/layout_rounded_bg_window">
                 <com.habitrpg.android.habitica.ui.views.EquipmentItemRow
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -161,29 +148,22 @@
                     android:id="@+id/avatarHairMustacheView"
                     app:equipmentTitle="@string/avatar_mustache" />
             </LinearLayout>
-        </FrameLayout>
-
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/avatar_background"
             android:textAppearance="?android:attr/textAppearanceMedium"
             style="@style/SectionTitle"/>
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@drawable/layout_rounded_bg_window">
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:background="@drawable/layout_rounded_bg_window">
                 <com.habitrpg.android.habitica.ui.views.EquipmentItemRow
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:id="@+id/avatarBackgroundView"
                     app:equipmentTitle="@string/avatar_background" />
             </LinearLayout>
-        </FrameLayout>
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/Habitica/res/layout/fragment_challenge_detail.xml b/Habitica/res/layout/fragment_challenge_detail.xml
index 1bb240dbe..aaae42d2a 100644
--- a/Habitica/res/layout/fragment_challenge_detail.xml
+++ b/Habitica/res/layout/fragment_challenge_detail.xml
@@ -20,7 +20,7 @@
             android:orientation="vertical"
             android:paddingStart="16dp"
             android:paddingEnd="16dp">
-            <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
+            <TextView
                 android:id="@+id/challenge_name"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -172,7 +172,7 @@
             android:layout_height="wrap_content"
             app:title="@string/challenge_categories"
             android:background="?attr/colorContentBackground">
-            <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
+            <TextView
                 android:id="@+id/challenge_description"
                 style="@style/Body2"
                 android:layout_width="wrap_content"
diff --git a/Habitica/res/layout/item_user_guild.xml b/Habitica/res/layout/item_user_guild.xml
index 871a67f6f..78bd2bf72 100644
--- a/Habitica/res/layout/item_user_guild.xml
+++ b/Habitica/res/layout/item_user_guild.xml
@@ -2,28 +2,21 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
+    android:orientation="horizontal"
     android:layout_marginHorizontal="10dp"
     android:layout_marginVertical="4dp"
     android:background="@drawable/layout_rounded_bg_window"
-    android:padding="12dp">
-    <LinearLayout
-        android:layout_width="match_parent"
+    android:padding="12dp"
+    android:gravity="center">
+    <ImageView
+        android:id="@+id/guild_badge_view"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_marginEnd="12dp" />
+    <TextView
+        android:id="@+id/title_text_view"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center">
-
-        <ImageView
-            android:id="@+id/guild_badge_view"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_marginEnd="12dp" />
-        <TextView
-            android:id="@+id/title_text_view"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            style="@style/Subheader1"/>
-    </LinearLayout>
+        android:layout_weight="1"
+        style="@style/Subheader1"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/preference_child_summary_error.xml b/Habitica/res/layout/preference_child_summary_error.xml
index ded60fe4e..1fb6acc58 100644
--- a/Habitica/res/layout/preference_child_summary_error.xml
+++ b/Habitica/res/layout/preference_child_summary_error.xml
@@ -40,10 +40,4 @@
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="@color/red_10" />
     </RelativeLayout>
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:gravity="center_vertical"
-        android:orientation="vertical"
-        android:paddingStart="16dp" />
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/progress_bar.xml b/Habitica/res/layout/progress_bar.xml
index 1caf7118a..9708330f7 100644
--- a/Habitica/res/layout/progress_bar.xml
+++ b/Habitica/res/layout/progress_bar.xml
@@ -13,7 +13,7 @@
         android:weightSum="1">
         <ImageView
             android:id="@+id/pendingBar"
-            android:layout_width="0dip"
+            android:layout_width="1dip"
             android:layout_height="match_parent"
             android:src="@drawable/layout_rounded_bg" />
 
@@ -29,12 +29,12 @@
         android:weightSum="1">
         <ImageView
             android:id="@+id/bar"
-            android:layout_width="0dip"
+            android:layout_width="1dip"
             android:layout_height="match_parent"
             android:src="@drawable/layout_rounded_bg"/>
         <ImageView
             android:id="@+id/emptyBarSpace"
-            android:layout_width="0dip"
+            android:layout_width="1dip"
             android:layout_height="match_parent" />
     </LinearLayout>
 </merge>
diff --git a/Habitica/res/layout/purchase_subscription_view.xml b/Habitica/res/layout/purchase_subscription_view.xml
index 6daa2009e..c0474f039 100644
--- a/Habitica/res/layout/purchase_subscription_view.xml
+++ b/Habitica/res/layout/purchase_subscription_view.xml
@@ -73,7 +73,7 @@
                 android:id="@+id/gemCapTextView"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                tools:text="@string/subscribe1month.gemcap"
+                tools:text="@string/subscribe1month_gemcap"
                 style="@style/Pill"
                 android:textSize="12sp"
                 android:layout_marginTop="4dp"
diff --git a/Habitica/res/layout/quest_progress.xml b/Habitica/res/layout/quest_progress.xml
index b051afc45..57865a73d 100644
--- a/Habitica/res/layout/quest_progress.xml
+++ b/Habitica/res/layout/quest_progress.xml
@@ -90,7 +90,7 @@
             android:id="@+id/pendingDamageTextView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textSize="12dp"
+            android:textSize="12sp"
             android:textColor="@color/red_100"/>
     </LinearLayout>
     <com.habitrpg.android.habitica.ui.views.ValueBar
diff --git a/Habitica/res/layout/shop_header.xml b/Habitica/res/layout/shop_header.xml
index 4af51548f..1c7715334 100644
--- a/Habitica/res/layout/shop_header.xml
+++ b/Habitica/res/layout/shop_header.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     android:layout_width="match_parent"
@@ -39,4 +39,4 @@
         android:layout_marginBottom="4dp"
         style="@style/Body1"
         tools:text="Welcome to the Market! Stock up on new gear or buy rare eggs and potions. Check in periodically for new stock." />
-</FrameLayout>
\ No newline at end of file
+</merge>
\ No newline at end of file
diff --git a/Habitica/res/layout/skill_task_item_card.xml b/Habitica/res/layout/skill_task_item_card.xml
index df5d2b96f..1334ee324 100644
--- a/Habitica/res/layout/skill_task_item_card.xml
+++ b/Habitica/res/layout/skill_task_item_card.xml
@@ -5,9 +5,6 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:background="?attr/colorContentBackground">
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent">
@@ -20,13 +17,13 @@
                 android:paddingEnd="@dimen/spacing_large"
                 android:paddingBottom="20dp"
                 android:paddingTop="20dp">
-                <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
+                <TextView
                     android:id="@+id/titleTextView"
                     style="@style/CardTitle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
 
-                <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
+                <TextView
                     android:id="@+id/notesTextView"
                     style="@style/CardText"
                     android:layout_width="match_parent"
@@ -40,7 +37,6 @@
                 android:layout_alignParentTop="true"
                 android:layout_alignParentEnd="true" />
         </RelativeLayout>
-    </LinearLayout>
     <View
         android:layout_width="match_parent"
         android:layout_height="0.5dp"
diff --git a/Habitica/res/layout/snackbar_view.xml b/Habitica/res/layout/snackbar_view.xml
index 77132f4d2..fe2f8f56b 100644
--- a/Habitica/res/layout/snackbar_view.xml
+++ b/Habitica/res/layout/snackbar_view.xml
@@ -1,86 +1,83 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
+    android:id="@+id/snackbar_view"
+    android:orientation="horizontal"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:paddingStart="6dp"
+    android:paddingEnd="0dp"
+    android:gravity="center"
+    tools:background="@drawable/snackbar_background_green"
+    android:layout_marginBottom="32dp"
+    android:layout_gravity="center_horizontal"
+    android:elevation="24dp"
     android:clipToPadding="false">
+    <ImageView
+        android:id="@+id/leftImageView"
+        android:layout_height="@dimen/snackbar_image_size"
+        android:layout_width="@dimen/snackbar_image_size"
+        android:background="@drawable/white_circle_background"
+        android:visibility="gone"
+        tools:visibility="visible"
+        android:layout_marginTop="6dp"
+        android:layout_marginBottom="6dp"/>
     <LinearLayout
-        android:id="@+id/snackbar_view"
-        android:orientation="horizontal"
-        android:layout_width="wrap_content"
+        android:id="@+id/content_container"
+        android:layout_width="0dp"
+        android:layout_weight="1"
         android:layout_height="wrap_content"
-        android:paddingStart="6dp"
-        android:gravity="center"
-        tools:background="@drawable/snackbar_background_green"
-        android:layout_marginBottom="32dp"
-        android:layout_gravity="center_horizontal"
-        android:elevation="24dp">
-        <ImageView
-            android:id="@+id/leftImageView"
-            android:layout_height="@dimen/snackbar_image_size"
-            android:layout_width="@dimen/snackbar_image_size"
-            android:background="@drawable/white_circle_background"
+        android:orientation="vertical"
+        android:paddingStart="12dp"
+        android:paddingEnd="18dp"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp">
+        <TextView
+            android:id="@+id/snackbar_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            tools:text="This is the Title"
+            android:gravity="center"
+            style="@style/Title2"
+            android:textSize="18sp"
             android:visibility="gone"
             tools:visibility="visible"
-            android:layout_marginTop="6dp"
-            android:layout_marginBottom="6dp"/>
-        <LinearLayout
-            android:id="@+id/content_container"
-            android:layout_width="0dp"
-            android:layout_weight="1"
+            android:textColor="@color/white"/>
+        <TextView
+            android:id="@+id/snackbar_text"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:paddingStart="12dp"
-            android:paddingEnd="18dp"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp">
-            <TextView
-                android:id="@+id/snackbar_title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                tools:text="This is the Title"
-                android:gravity="center"
-                style="@style/Title2"
-                android:textSize="18sp"
-                android:visibility="gone"
-                tools:visibility="visible"
-                android:textColor="@color/white"/>
-            <TextView
-                android:id="@+id/snackbar_text"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                tools:text="This is the Content"
-                android:gravity="center"
-                style="@style/Body1"
-                android:textSize="13sp"
-                android:visibility="gone"
-                tools:visibility="visible"
-                android:textColor="@color/white"/>
-        </LinearLayout>
-        <LinearLayout
-            android:id="@+id/rightView"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="center_vertical"
-            android:background="@drawable/snackbar_right_bg"
-            android:paddingStart="8dp"
-            android:paddingEnd="8dp"
-            android:layout_marginEnd="1dp"
-            android:layout_marginTop="1dp"
-            android:layout_marginBottom="1dp"
+            tools:text="This is the Content"
+            android:gravity="center"
+            style="@style/Body1"
+            android:textSize="13sp"
             android:visibility="gone"
-            tools:visibility="visible">
-            <ImageView
-                android:id="@+id/rightIconView"
-                android:layout_width="@dimen/currency_icon_size"
-                android:layout_height="@dimen/currency_icon_size" />
-            <TextView
-                android:id="@+id/rightTextView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingStart="4dp"
-                tools:text="12"/>
-            </LinearLayout>
+            tools:visibility="visible"
+            android:textColor="@color/white"/>
     </LinearLayout>
-</FrameLayout>
\ No newline at end of file
+    <LinearLayout
+        android:id="@+id/rightView"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:gravity="center_vertical"
+        android:background="@drawable/snackbar_right_bg"
+        android:paddingStart="8dp"
+        android:paddingEnd="8dp"
+        android:layout_marginEnd="1dp"
+        android:layout_marginTop="1dp"
+        android:layout_marginBottom="1dp"
+        android:visibility="gone"
+        tools:visibility="visible">
+        <ImageView
+            android:id="@+id/rightIconView"
+            android:layout_width="@dimen/currency_icon_size"
+            android:layout_height="@dimen/currency_icon_size" />
+        <TextView
+            android:id="@+id/rightTextView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingStart="4dp"
+            android:paddingEnd="0dp"
+            tools:text="12"/>
+    </LinearLayout>
+</LinearLayout>
diff --git a/Habitica/res/layout/tavern_chat_intro_item.xml b/Habitica/res/layout/tavern_chat_intro_item.xml
index 9dd30971e..065d1aa2c 100644
--- a/Habitica/res/layout/tavern_chat_intro_item.xml
+++ b/Habitica/res/layout/tavern_chat_intro_item.xml
@@ -50,7 +50,7 @@
         android:textAlignment="center"
         android:textColor="@color/gray_300"
         android:textSize="12sp"
-        tools:text="@Username" />
+        tools:text="/@Username" />
 
     <TextView
         android:id="@+id/filler_2"
@@ -64,7 +64,7 @@
         android:textColor="@color/gray_300"
         android:textSize="12sp" />
 
-    <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
+    <TextView
         android:id="@+id/message_text"
         android:layout_width="348dp"
         android:layout_height="42dp"
diff --git a/Habitica/res/values-bg/strings.profile.xml b/Habitica/res/values-bg/strings.profile.xml
index ca65ba3f6..6fa8db1b8 100644
--- a/Habitica/res/values-bg/strings.profile.xml
+++ b/Habitica/res/values-bg/strings.profile.xml
@@ -9,7 +9,5 @@
     <string name="profile_level">Ниво:</string>
     <string name="profile_class_bonus">Класов бонус:</string>
     <string name="profile_allocated">Разпределени:</string>
-    <string name="profile_private_message">Лично съобщение</string>
     <string name="profile_achievements">Постижения</string>
-
 </resources>
diff --git a/Habitica/res/values-cs/strings.xml b/Habitica/res/values-cs/strings.xml
index 057605c66..8c95657e4 100755
--- a/Habitica/res/values-cs/strings.xml
+++ b/Habitica/res/values-cs/strings.xml
@@ -80,7 +80,7 @@
     <string name="saturday">Sobota</string>
     <string name="sunday">Neděle</string>
     <string name="faint_subtitle">Nezoufejte!</string>
-    <string name="faint_penalty_body">Ztratil jsi úroveň, zlato a kousek vybavení, ale můžeš je získat zpět když se budeš dost snažit! Hodně štěstí--Ať se ti daří.</string>
+    <string name="faint_penalty_body">Ztratil jsi úroveň, zlato a kousek vybavení, ale můžeš je získat zpět když se budeš dost snažit! Hodně štěstí—Ať se ti daří.</string>
     <string name="faint_header">Došlo ti zdraví!</string>
     <string name="faint_button">Doplnit zdraví &amp; a zkusit to znovu</string>
     <string name="filter">Filtr</string>
diff --git a/Habitica/res/values-de/strings.profile.xml b/Habitica/res/values-de/strings.profile.xml
index 65cea12f0..cac7622c4 100644
--- a/Habitica/res/values-de/strings.profile.xml
+++ b/Habitica/res/values-de/strings.profile.xml
@@ -3,12 +3,11 @@
     <string name="profile_pets_and_mounts">Haustiere &amp; Reittiere</string>
     <string name="profile_pets_found">Gefundene Haustiere</string>
     <string name="profile_mounts_tamed">Gezähmte Reittiere</string>
-    <string name="profile_loading_data">Lade Mitgliederdaten...</string>
+    <string name="profile_loading_data">Lade Mitgliederdaten…</string>
     <string name="profile_send_message_to">Nachricht an %s senden</string>
     <string name="profile_message_sent_to">Nachricht an %s gesendet</string>
     <string name="profile_level">Level:</string>
     <string name="profile_class_bonus">Klassen-Bonus:</string>
     <string name="profile_allocated">Verteilt:</string>
-    <string name="profile_private_message">Private Nachricht</string>
     <string name="profile_achievements">Erfolge</string>
 </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-de/strings.xml b/Habitica/res/values-de/strings.xml
index e343d6f17..46262b4ed 100644
--- a/Habitica/res/values-de/strings.xml
+++ b/Habitica/res/values-de/strings.xml
@@ -504,7 +504,7 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
     <string name="insufficientHourglasses">Du wirst mehr mystische Sanduhren benötigen um diesen Gegenstand zu kaufen!</string>
     <string name="get_hourglasses">Kaufe Sanduhren</string>
     <string name="subscribe_for_hourglasses">Abonniere für Sanduhren</string>
-    <string name="timetravelers_closed_description">Erhalte eine mystische Sanduhr alle drei Monate für ein aufeinanderfolgendes Abonnement, nutze diese dann, um Limitiertes freizuschalten: Gegenstände, Haustiere oder Reittiere aus der Vergangenheit... und aus der Zukunft!</string>
+    <string name="timetravelers_closed_description">Erhalte eine mystische Sanduhr alle drei Monate für ein aufeinanderfolgendes Abonnement, nutze diese dann, um Limitiertes freizuschalten: Gegenstände, Haustiere oder Reittiere aus der Vergangenheit… und aus der Zukunft!</string>
     <string name="want_to_subscribe">Ich möchte ein Abo abschließen</string>
     <string name="seasonal_closed_description">Die Großen Galas werden an Sonnenwenden und Tag-Nacht-Gleichen veranstaltet, also komme zu dieser Zeit wieder, um eine lustige Auswahl von speziellen saisonalen Gegenständen zu finden!</string>
     <string name="come_back_soon">Komm bald zurück!</string>
@@ -602,7 +602,7 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
     <string name="questShop_owner_long">Ian der Questmeister</string>
     <string name="seasonalShop_owner_long">Jahreszeitenzauberin</string>
     <string name="rage_attack">Raserei-Angriff:</string>
-    <string name="tavern_description_world_boss">Ihr Lieben, kümmert Euch nicht um das Monster -- dies ist immer noch ein sicherer Platz für eine kleine Pause zum Chatten.</string>
+    <string name="tavern_description_world_boss">Ihr Lieben, kümmert Euch nicht um das Monster — dies ist immer noch ein sicherer Platz für eine kleine Pause zum Chatten.</string>
     <string name="report">Melden</string>
     <string name="reply">Antworten</string>
     <string name="challenge_prize">Herausforderungspreis</string>
@@ -1100,9 +1100,7 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
     <string name="how_it_works">So funktioniert es</string>
     <string name="fall_promo_info_instructions">Zwischen 22. und 30. September kannst Du wie gewohnt ein Edelstein-Paket kaufen, Deinem Konto wird aber der Aktions-Betrag Edelsteine hinzugefügt. Mehr Edelsteine zum ausgeben, teilen oder aufsparen für spätere Neuerungen!</string>
     <string name="spooky_promo_info_prompt">Der Edelstein-Sonderverkauf ist zurück! Das ist die letzte Chance, mehr Edelsteine als je zuvor zu bekommen, also füll\' Deine Lager solange Du noch kannst!</string>
-    <string name="spooky_promo_info_limitations">Diese Aktion ist nur während dem zeitlich beschränkten Event gültig. Der Event beginnt am 29. Oktober um 8:00 AM EDT ( 12:00 UTC) und endet am 2. November um 8:00 PM EDT (00:00 UTC). Das Aktionsangebot ist nur verfügbar, wenn Du Edelsteine für Dich selbst kaufst.</string>
     <string name="spooky_promo_info_instructions">Zwischen 29. Oktober und 2. November kannst Du wie gewohnt ein Edelstein-Paket kaufen, Deinem Konto wird aber der Aktions-Betrag Edelsteine hinzugefügt. Mehr Edelsteine zum ausgeben, teilen oder aufsparen für spätere Neuerungen!</string>
     <string name="view_gem_bundles">Edelstein-Pakete anzeigen</string>
     <string name="fall_promo_info_prompt">Die Herbstgala ist in vollem Gange. Deshalb haben wir gedacht, dass dies der perfekte Zeitpunkt für den allerersten Edelstein-Sonderverkauf ist! Jetzt bekommst Du mit jedem Einkauf mehr Edelsteine als je zuvor.</string>
-    <string name="fall_promo_info_limitations">Diese Aktion ist nur während dem zeitlich beschränkten Event gültig. Der Event beginnt am 22. September um 8:00 AM EDT ( 12:00 UTC) und endet am 30. September um 8:00 PM EDT (00:00 UTC). Das Aktionsangebot ist nur verfügbar, wenn Du Edelsteine für Dich selbst kaufst.</string>
 </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-en-rGB/strings.profile.xml b/Habitica/res/values-en-rGB/strings.profile.xml
index 1ee1e270d..2f3ff3baa 100644
--- a/Habitica/res/values-en-rGB/strings.profile.xml
+++ b/Habitica/res/values-en-rGB/strings.profile.xml
@@ -3,13 +3,11 @@
     <string name="profile_pets_and_mounts">Pets &amp; Mounts</string>
     <string name="profile_pets_found">Pets Found</string>
     <string name="profile_mounts_tamed">Mounts Tamed</string>
-    <string name="profile_loading_data">Loading member data...</string>
+    <string name="profile_loading_data">Loading member data…</string>
     <string name="profile_send_message_to">Send message to %s</string>
     <string name="profile_message_sent_to">Message sent to %s</string>
     <string name="profile_level">Level:</string>
     <string name="profile_class_bonus">Class-Bonus:</string>
     <string name="profile_allocated">Allocated:</string>
-    <string name="profile_private_message">Private Message</string>
     <string name="profile_achievements">Achievements</string>
-
 </resources>
diff --git a/Habitica/res/values-es/strings.profile.xml b/Habitica/res/values-es/strings.profile.xml
index 4add76f2b..06109f47b 100644
--- a/Habitica/res/values-es/strings.profile.xml
+++ b/Habitica/res/values-es/strings.profile.xml
@@ -3,13 +3,11 @@
     <string name="profile_pets_and_mounts">Mascotas y monturas</string>
     <string name="profile_pets_found">Mascotas encontradas</string>
     <string name="profile_mounts_tamed">Monturas domadas</string>
-    <string name="profile_loading_data">Cargando información de miembros...</string>
+    <string name="profile_loading_data">Cargando información de miembros…</string>
     <string name="profile_send_message_to">Enviar mensaje a %s</string>
     <string name="profile_message_sent_to">Mensaje enviado a %s</string>
     <string name="profile_level">Nivel:</string>
     <string name="profile_class_bonus">Bonus de clase:</string>
     <string name="profile_allocated">Asignado:</string>
-    <string name="profile_private_message">Mensaje privado</string>
     <string name="profile_achievements">Logros</string>
-
 </resources>
diff --git a/Habitica/res/values-es/strings.xml b/Habitica/res/values-es/strings.xml
index c74dc8afd..a84bd6ec3 100644
--- a/Habitica/res/values-es/strings.xml
+++ b/Habitica/res/values-es/strings.xml
@@ -502,7 +502,7 @@
     <string name="insufficientHourglasses">¡Necesitarás más Relojes de Arena Místicos para comprar este objeto!</string>
     <string name="get_hourglasses">Conseguir Relojes de Arena</string>
     <string name="subscribe_for_hourglasses">Suscribir para conseguir Relojes de Arena</string>
-    <string name="timetravelers_closed_description">Consigue un Reloj de arena Místico por cada tres meses seguidos de suscripción. Podrás usarlo para desbloquear objetos exclusivos, mascotas o monturas del pasado... ¡y del futuro!</string>
+    <string name="timetravelers_closed_description">Consigue un Reloj de arena Místico por cada tres meses seguidos de suscripción. Podrás usarlo para desbloquear objetos exclusivos, mascotas o monturas del pasado… ¡y del futuro!</string>
     <string name="want_to_subscribe">Quiero Suscribirme</string>
     <string name="seasonal_closed_description">Las Grandes Galas ocurren cerca de los solsticios y equinoccios, ¡así que vuelve de vez en cuando para encontrar una interesante variedad de artículos especiales de temporada!</string>
     <string name="come_back_soon">¡Vuelve pronto!</string>
diff --git a/Habitica/res/values-fr/strings.profile.xml b/Habitica/res/values-fr/strings.profile.xml
index 4b5934634..ff438d359 100644
--- a/Habitica/res/values-fr/strings.profile.xml
+++ b/Habitica/res/values-fr/strings.profile.xml
@@ -3,13 +3,12 @@
     <string name="profile_pets_and_mounts">Familiers &amp; montures</string>
     <string name="profile_pets_found">Familiers trouvés</string>
     <string name="profile_mounts_tamed">Montures dressées</string>
-    <string name="profile_loading_data">Chargement des données de membre...</string>
+    <string name="profile_loading_data">Chargement des données de membre…</string>
     <string name="profile_send_message_to">Envoyer un message à %s</string>
     <string name="profile_message_sent_to">Message envoyé à %s</string>
     <string name="profile_level">Niveau :</string>
     <string name="profile_class_bonus">Bonus de classe :</string>
     <string name="profile_allocated">Points alloués :</string>
-    <string name="profile_private_message">Message privé</string>
     <string name="profile_achievements">Succès</string>
 
 </resources>
diff --git a/Habitica/res/values-fr/strings.xml b/Habitica/res/values-fr/strings.xml
index abae9a5a3..d6d3ecfb6 100644
--- a/Habitica/res/values-fr/strings.xml
+++ b/Habitica/res/values-fr/strings.xml
@@ -505,7 +505,7 @@
     <string name="insufficientHourglasses">Vous n\'avez pas assez de sabliers mystiques pour acheter cet objet !</string>
     <string name="get_hourglasses">Obtenir des sabliers mystiques</string>
     <string name="subscribe_for_hourglasses">S\'abonner pour obtenir des sabliers mystiques</string>
-    <string name="timetravelers_closed_description">Obtenez un sablier mystique pour chaque série de trois mois d\'abonnement consécutifs, puis utilisez-les pour débloquer des objets, des familiers et des montures en édition limitée du passé... Ou du futur !</string>
+    <string name="timetravelers_closed_description">Obtenez un sablier mystique pour chaque série de trois mois d\'abonnement consécutifs, puis utilisez-les pour débloquer des objets, des familiers et des montures en édition limitée du passé… Ou du futur !</string>
     <string name="want_to_subscribe">Je veux m\'abonner</string>
     <string name="seasonal_closed_description">Les grand galas ont lieu lors des solstices et des équinoxes, revenez ici à ces périodes pour obtenir des objets saisonniers amusants !</string>
     <string name="come_back_soon">Revenez bientôt !</string>
@@ -604,7 +604,7 @@
     <string name="questShop_owner_long">Ian le guide des quêtes</string>
     <string name="seasonalShop_owner_long">Sorcière saisonnière</string>
     <string name="rage_attack">Attaque de rage :</string>
-    <string name="tavern_description_world_boss">Oh, ne faites pas attention au monstre ci-dessous -- c\'est toujours un endroit sûr pour discuter pendant vos pauses.</string>
+    <string name="tavern_description_world_boss">Oh, ne faites pas attention au monstre ci-dessous — c\'est toujours un endroit sûr pour discuter pendant vos pauses.</string>
     <string name="report">Signaler</string>
     <string name="reply">Répondre</string>
     <string name="challenge_prize">Récompense du défi</string>
diff --git a/Habitica/res/values-hi/strings.profile.xml b/Habitica/res/values-hi/strings.profile.xml
index 60d729c1d..2203720ec 100644
--- a/Habitica/res/values-hi/strings.profile.xml
+++ b/Habitica/res/values-hi/strings.profile.xml
@@ -2,9 +2,8 @@
 <resources>
     <string name="profile_mounts_tamed">सवारी जो नामांकित हैं</string>
     <string name="profile_achievements">उपलब्धियों</string>
-    <string name="profile_private_message">निजी संदेश</string>
     <string name="profile_allocated">आवंटित:</string>
-    <string name="profile_loading_data">सदस्य का डेटा प्राप्त करना...</string>
+    <string name="profile_loading_data">सदस्य का डेटा प्राप्त करना…</string>
     <string name="profile_class_bonus">वर्ग का बोनस:</string>
     <string name="profile_level">स्तर:</string>
     <string name="profile_message_sent_to">%s के लिए संदेश भेजा</string>
diff --git a/Habitica/res/values-hr-rHR/strings.profile.xml b/Habitica/res/values-hr-rHR/strings.profile.xml
index 573954131..7e2988177 100644
--- a/Habitica/res/values-hr-rHR/strings.profile.xml
+++ b/Habitica/res/values-hr-rHR/strings.profile.xml
@@ -3,7 +3,7 @@
     <string name="profile_pets_and_mounts">Ljubimci &amp; Jahače životinje</string>
     <string name="profile_pets_found">Ljubimaca pronađeno</string>
     <string name="profile_mounts_tamed">jahačih životinja pripitomljeno</string>
-    <string name="profile_loading_data">Učitavanje podataka o članu...</string>
+    <string name="profile_loading_data">Učitavanje podataka o članu…</string>
     <string name="profile_send_message_to">Pošalji poruku %s</string>
     <string name="profile_message_sent_to">Poruka poslana %s</string>
     <string name="profile_level">Level:</string>
diff --git a/Habitica/res/values-hr-rHR/strings.xml b/Habitica/res/values-hr-rHR/strings.xml
index 818bc68f5..fbf280979 100644
--- a/Habitica/res/values-hr-rHR/strings.xml
+++ b/Habitica/res/values-hr-rHR/strings.xml
@@ -503,7 +503,7 @@
     <string name="insufficientHourglasses">Trebat će ti više Mističnih pješčanih satova kako bi kupio/la ovaj predmet!</string>
     <string name="get_hourglasses">Nabavi pješčane satove</string>
     <string name="subscribe_for_hourglasses">Pretplati se za Pješčane satove</string>
-    <string name="timetravelers_closed_description">Zaradi jedan Mistični pješčani sat za svaka tri mjeseca uzastopne pretplate, onda ih koristi za otključavanje predmeta, ljubimaca i jahačih životinja ograničenih izdanja iz prošlosti... i budućnosti!</string>
+    <string name="timetravelers_closed_description">Zaradi jedan Mistični pješčani sat za svaka tri mjeseca uzastopne pretplate, onda ih koristi za otključavanje predmeta, ljubimaca i jahačih životinja ograničenih izdanja iz prošlosti… i budućnosti!</string>
     <string name="want_to_subscribe">Želim se pretplatiti</string>
     <string name="seasonal_closed_description">Četiri Velike gale se održavaju oko vremena suncostaja i ravnodnevnica, pa se vrati tada kako bi otkrio/la zabavan izbor posebnih sezonskih predmeta!</string>
     <string name="come_back_soon">Vrati se brzo!</string>
diff --git a/Habitica/res/values-hu/strings.xml b/Habitica/res/values-hu/strings.xml
index 57bf15125..8f93f2017 100755
--- a/Habitica/res/values-hu/strings.xml
+++ b/Habitica/res/values-hu/strings.xml
@@ -16,7 +16,7 @@
     <string name="Language_summary">A Habitica nyelvének megváltoztatása</string>
     <string name="SP_user_qr_code">A QR kódod</string>
     <string name="PS_contact_title">Kapcsolat</string>
-    <string name="unknown_error">Hiba történt...</string>
+    <string name="unknown_error">Hiba történt…</string>
     <string name="pref_account_header">Fiók</string>
     <string name="pref_first_day_of_the_week_title">A hét első napja</string>
     <string name="pref_first_day_of_the_week_summary">A hét első napja minden naptárban</string>
diff --git a/Habitica/res/values-in/strings.xml b/Habitica/res/values-in/strings.xml
index 3825855f0..e69168d09 100644
--- a/Habitica/res/values-in/strings.xml
+++ b/Habitica/res/values-in/strings.xml
@@ -474,7 +474,7 @@
     <string name="insufficientHourglasses">Kamu perlu lebih banyak Jam Pasir Mistis untuk membeli item ini!</string>
     <string name="get_hourglasses">Dapatkan jam pasir</string>
     <string name="subscribe_for_hourglasses">Berlangganan untuk Jam Pasir</string>
-    <string name="timetravelers_closed_description">Dapatkan satu Jam Pasir Mistis setiap tiga bulan berturut-turut kamu berlangganan, lalu gunakan untuk membuka item-item edisi terbatas, peliharaan, dan tunggangan dari masa lalu... dan masa depan!</string>
+    <string name="timetravelers_closed_description">Dapatkan satu Jam Pasir Mistis setiap tiga bulan berturut-turut kamu berlangganan, lalu gunakan untuk membuka item-item edisi terbatas, peliharaan, dan tunggangan dari masa lalu… dan masa depan!</string>
     <string name="want_to_subscribe">Aku mau Berlangganan</string>
     <string name="seasonal_closed_description">Grand Gala diadakan dekat dengan titik balik matahari dan ekuinoks, jadi cek kembali nanti untuk menemukan sekumpulan seru item musiman yang spesial!</string>
     <string name="come_back_soon">Datang kembali nanti!</string>
diff --git a/Habitica/res/values-it/strings.profile.xml b/Habitica/res/values-it/strings.profile.xml
index c8d1466cb..6b3f96257 100644
--- a/Habitica/res/values-it/strings.profile.xml
+++ b/Habitica/res/values-it/strings.profile.xml
@@ -3,13 +3,12 @@
     <string name="profile_pets_and_mounts">Animali e cavalcature</string>
     <string name="profile_pets_found">Animali trovati</string>
     <string name="profile_mounts_tamed">Cavalcature addomesticate</string>
-    <string name="profile_loading_data">Caricamento dati utente...</string>
+    <string name="profile_loading_data">Caricamento dati utente…</string>
     <string name="profile_send_message_to">Invia messaggio a %s</string>
     <string name="profile_message_sent_to">Messaggio inviato a %s</string>
     <string name="profile_level">Livello:</string>
     <string name="profile_class_bonus">Bonus classe:</string>
     <string name="profile_allocated">Allocati:</string>
-    <string name="profile_private_message">Messaggio privato</string>
     <string name="profile_achievements">Medaglie</string>
 
 </resources>
diff --git a/Habitica/res/values-it/strings.xml b/Habitica/res/values-it/strings.xml
index 8a5085e4c..687bffa83 100644
--- a/Habitica/res/values-it/strings.xml
+++ b/Habitica/res/values-it/strings.xml
@@ -501,7 +501,7 @@
     <string name="insufficientHourglasses">Ti servono più Clessidre Mistiche per comprare questo oggetto!</string>
     <string name="get_hourglasses">Ottieni clessidre</string>
     <string name="subscribe_for_hourglasses">Abbonati per le Clessidre</string>
-    <string name="timetravelers_closed_description">Ottieni una Clessidra Mistica per ogni tre mesi di abbonamento consecutivi, che puoi usare per sbloccare elementi in edizione limitata come oggetti, animali e cavalcature del passato... o del futuro!</string>
+    <string name="timetravelers_closed_description">Ottieni una Clessidra Mistica per ogni tre mesi di abbonamento consecutivi, che puoi usare per sbloccare elementi in edizione limitata come oggetti, animali e cavalcature del passato… o del futuro!</string>
     <string name="want_to_subscribe">Voglio abbonarmi</string>
     <string name="seasonal_closed_description">I Gran Galà stagionali hanno luogo nei pressi dei solstizi e degli equinozi, quindi torna più avanti per trovare un vivace assortimento di oggetti stagionali!</string>
     <string name="come_back_soon">Torna presto!</string>
diff --git a/Habitica/res/values-ko/strings.profile.xml b/Habitica/res/values-ko/strings.profile.xml
index d8cf52cb2..0417aa818 100644
--- a/Habitica/res/values-ko/strings.profile.xml
+++ b/Habitica/res/values-ko/strings.profile.xml
@@ -10,5 +10,5 @@
     <string name="profile_allocated">할당된 포인트:</string>
     <string name="profile_private_message">개인 메시지</string>
     <string name="profile_achievements">업적</string>
-    <string name="profile_loading_data">회원 정보를 불러오는 중입니다...</string>
+    <string name="profile_loading_data">회원 정보를 불러오는 중입니다…</string>
 </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-ko/strings.xml b/Habitica/res/values-ko/strings.xml
index e3012995c..b69a9923a 100644
--- a/Habitica/res/values-ko/strings.xml
+++ b/Habitica/res/values-ko/strings.xml
@@ -511,7 +511,7 @@
     <string name="insufficientHourglasses">이 아이템을 구입하려면 더 많은 신비한 모래시계가 필요합니다!</string>
     <string name="get_hourglasses">모래시계 받기</string>
     <string name="subscribe_for_hourglasses">모래시계를 얻으려면 정기 구독을 해주세요</string>
-    <string name="timetravelers_closed_description">연속 정기구독 3달마다 신비한 모래시계 한 개씩을 얻을 수 있고 그것을 사용해서 과거와... 그리고 미래의 한정판 아이템, 펫, 그리고 탑승펫 등을 열 수 있습니다!</string>
+    <string name="timetravelers_closed_description">연속 정기구독 3달마다 신비한 모래시계 한 개씩을 얻을 수 있고 그것을 사용해서 과거와… 그리고 미래의 한정판 아이템, 펫, 그리고 탑승펫 등을 열 수 있습니다!</string>
     <string name="want_to_subscribe">정기후원 하고 싶어요</string>
     <string name="seasonal_closed_description">그랜드 갈라는 춘분, 하지, 추분 그리고 동지 즈음에 열리니 그 때마다 재미있는 여러 계절별 특별 아이템을 찾으러 오세요!</string>
     <string name="come_back_soon">어서 다시 만나요!</string>
diff --git a/Habitica/res/values-lt/strings.profile.xml b/Habitica/res/values-lt/strings.profile.xml
index 4f2f467b1..7f40fabb0 100644
--- a/Habitica/res/values-lt/strings.profile.xml
+++ b/Habitica/res/values-lt/strings.profile.xml
@@ -9,7 +9,7 @@
     <string name="profile_class_bonus">Klasės-Bonusai:</string>
     <string name="profile_allocated">Priskirta:</string>
     <string name="profile_private_message">Privati Žinutė</string>
-    <string name="profile_loading_data">Įkeliami narių duomenys ...</string>
+    <string name="profile_loading_data">Įkeliami narių duomenys …</string>
     <string name="profile_achievements">Pasiekimai</string>
 
 </resources>
diff --git a/Habitica/res/values-nl/strings.profile.xml b/Habitica/res/values-nl/strings.profile.xml
index 1ed354dd6..9bb14e813 100644
--- a/Habitica/res/values-nl/strings.profile.xml
+++ b/Habitica/res/values-nl/strings.profile.xml
@@ -3,7 +3,7 @@
     <string name="profile_pets_and_mounts">Huis- &amp; rijdieren</string>
     <string name="profile_pets_found">Gevonden huisdieren</string>
     <string name="profile_mounts_tamed">Getemde rijdieren</string>
-    <string name="profile_loading_data">Gebruikersgegevens aan het laden...</string>
+    <string name="profile_loading_data">Gebruikersgegevens aan het laden…</string>
     <string name="profile_send_message_to">Stuur bericht naar %s</string>
     <string name="profile_message_sent_to">Bericht verzonden naar %s</string>
     <string name="profile_level">Niveau:</string>
diff --git a/Habitica/res/values-pl/strings.profile.xml b/Habitica/res/values-pl/strings.profile.xml
index 2e545c82b..4fcf4db36 100644
--- a/Habitica/res/values-pl/strings.profile.xml
+++ b/Habitica/res/values-pl/strings.profile.xml
@@ -3,7 +3,7 @@
     <string name="profile_pets_and_mounts">Chowańce i Wierzchowce</string>
     <string name="profile_pets_found">Znalezione chowańce</string>
     <string name="profile_mounts_tamed">Okiełznane wierzchowce</string>
-    <string name="profile_loading_data">Ładowanie danych użytkownika...</string>
+    <string name="profile_loading_data">Ładowanie danych użytkownika…</string>
     <string name="profile_send_message_to">Wyślij wiadomość do %s</string>
     <string name="profile_message_sent_to">Wiadomość wysłana do %s</string>
     <string name="profile_level">Poziom:</string>
diff --git a/Habitica/res/values-pt-rBR/strings.profile.xml b/Habitica/res/values-pt-rBR/strings.profile.xml
index 3536adfcf..89b3cfb8c 100644
--- a/Habitica/res/values-pt-rBR/strings.profile.xml
+++ b/Habitica/res/values-pt-rBR/strings.profile.xml
@@ -3,7 +3,7 @@
     <string name="profile_pets_and_mounts">Mascotes &amp; Montarias</string>
     <string name="profile_pets_found">Mascotes Encontrados</string>
     <string name="profile_mounts_tamed">Montarias Domesticadas</string>
-    <string name="profile_loading_data">Carregando informações dos membros...</string>
+    <string name="profile_loading_data">Carregando informações dos membros…</string>
     <string name="profile_send_message_to">Enviar mensagem para %s</string>
     <string name="profile_message_sent_to">Mensagem enviada para %s</string>
     <string name="profile_level">Nível:</string>
diff --git a/Habitica/res/values-pt-rBR/strings.xml b/Habitica/res/values-pt-rBR/strings.xml
index 806100508..ba81a6076 100644
--- a/Habitica/res/values-pt-rBR/strings.xml
+++ b/Habitica/res/values-pt-rBR/strings.xml
@@ -88,7 +88,7 @@
     <string name="levelup_detail">Por completar seus objetivos da vida real, você subiu de nível e agora está totalmente curado!</string>
     <string name="onwards">Hurra!</string>
     <string name="faint_subtitle">Não se desespere!</string>
-    <string name="faint_penalty_body">Você perdeu um Nível, seu Ouro, e uma peça de Equipamento, mas você pode ganhar todos eles de volta com trabalho duro! Boa sorte -- Você se sairá bem.</string>
+    <string name="faint_penalty_body">Você perdeu um Nível, seu Ouro, e uma peça de Equipamento, mas você pode ganhar todos eles de volta com trabalho duro! Boa sorte — Você se sairá bem.</string>
     <string name="faint_header">Você perdeu toda sua Vida!</string>
     <string name="faint_button">Restaurar Vida &amp; Tentar Novamente</string>
     <string name="filter">Filtro</string>
@@ -503,7 +503,7 @@
     <string name="insufficientHourglasses">Você precisará de mais Ampulhetas Místicas para comprar este item!</string>
     <string name="get_hourglasses">Obter ampulhetas</string>
     <string name="subscribe_for_hourglasses">Assinar pelas Ampulhetas</string>
-    <string name="timetravelers_closed_description">Receba uma Ampulheta Mística a cada três meses de assinatura consecutiva então as use para liberar itens, mascotes e montarias de edição limitada do passado... e do futuro!</string>
+    <string name="timetravelers_closed_description">Receba uma Ampulheta Mística a cada três meses de assinatura consecutiva então as use para liberar itens, mascotes e montarias de edição limitada do passado… e do futuro!</string>
     <string name="want_to_subscribe">Eu quero Assinar</string>
     <string name="seasonal_closed_description">As Grande Galas acontecem próximo da virada das quatro estações do ano, então volte aqui nesses períodos para ver os itens sazonais especiais!</string>
     <string name="come_back_soon">Volte logo!</string>
@@ -858,9 +858,9 @@
     <string name="task_title">Título da tarefa</string>
     <string name="add_local_authentication">Adicionar autenticação local</string>
     <string name="defeat">Derrotar</string>
-    <string name="gift_confirmation_text_sub_g1g1">Você enviou para %s uma assinatura por % s mês/meses no Habitica e a mesma assinatura foi aplicada à sua conta para a nossa promoção \"Presenteie com uma e ganhe outra\"!</string>
+    <string name="gift_confirmation_text_sub_g1g1">Você enviou para %s uma assinatura por %s mês/meses no Habitica e a mesma assinatura foi aplicada à sua conta para a nossa promoção \"Presenteie com uma e ganhe outra\"!</string>
     <string name="gift_confirmation_text_gems">Você enviou algumas gemas para %s.</string>
-    <string name="gift_confirmation_text_sub">Você enviou para %s uma assinatura por % s mês/meses no Habitica.</string>
+    <string name="gift_confirmation_text_sub">Você enviou para %s uma assinatura por %s mês/meses no Habitica.</string>
     <string name="gift_gems_subtitle">Selecione abaixo o pacote de gemas que você deseja presentear!</string>
     <string name="join_party_description_guild">Dê o nome de usuário abaixo a um amigo ou vá para %s para conhecer potenciais camaradas!</string>
     <string name="insufficientGoldTitle">Ouro insuficiente</string>
diff --git a/Habitica/res/values-pt-rPT/strings.profile.xml b/Habitica/res/values-pt-rPT/strings.profile.xml
index 8d8d7050c..328dce075 100644
--- a/Habitica/res/values-pt-rPT/strings.profile.xml
+++ b/Habitica/res/values-pt-rPT/strings.profile.xml
@@ -3,7 +3,7 @@
     <string name="profile_pets_and_mounts">Animais de Estimação e Montadas</string>
     <string name="profile_pets_found">Animais de Estimação Encontrados</string>
     <string name="profile_mounts_tamed">Montadas Domesticadas</string>
-    <string name="profile_loading_data">A carregar os dados de membro...</string>
+    <string name="profile_loading_data">A carregar os dados de membro…</string>
     <string name="profile_send_message_to">Enviar mensagem para %s</string>
     <string name="profile_message_sent_to">Mensagem enviada para %s</string>
     <string name="profile_level">Nível:</string>
diff --git a/Habitica/res/values-pt-rPT/strings.xml b/Habitica/res/values-pt-rPT/strings.xml
index a2041dd1a..b7a511925 100644
--- a/Habitica/res/values-pt-rPT/strings.xml
+++ b/Habitica/res/values-pt-rPT/strings.xml
@@ -643,7 +643,7 @@
     <string name="come_back_soon">Volta rápido!</string>
     <string name="seasonal_closed_description">As Grandes Galas acontecem perto dos solstícios e equinócios, então volta nesses períodos para encontrar itens sazonais especiais!</string>
     <string name="want_to_subscribe">Eu quero assinar</string>
-    <string name="timetravelers_closed_description">Recebe uma Ampulheta Mística por cada três meses consecutivos de assinatura e então usa-as para desbloquear itens, mascotes e montarias de edição limitada do passado... e futuro!</string>
+    <string name="timetravelers_closed_description">Recebe uma Ampulheta Mística por cada três meses consecutivos de assinatura e então usa-as para desbloquear itens, mascotes e montarias de edição limitada do passado… e futuro!</string>
     <string name="subscribe_for_hourglasses">Assinar por Ampulhetas</string>
     <string name="get_hourglasses">Conseguir Ampulhetas</string>
     <string name="insufficientHourglasses">Precisarás de mais Ampulhetas Místicas para comprar este item!</string>
diff --git a/Habitica/res/values-ro/strings.xml b/Habitica/res/values-ro/strings.xml
index 3ae7b2ad5..de52a20bc 100755
--- a/Habitica/res/values-ro/strings.xml
+++ b/Habitica/res/values-ro/strings.xml
@@ -479,7 +479,7 @@
     <string name="insufficientHourglasses">Ai nevoie de mai multe Clepsidre Mistice pentru a cumpăra acest obiect!</string>
     <string name="get_hourglasses">Fă rost de clepsidre</string>
     <string name="subscribe_for_hourglasses">Abonează-te pentru Clepsidre</string>
-    <string name="timetravelers_closed_description">Câștigă o Clepsidră Mistică pentru fiecare trei luni consecutive de abonare, apoi utilizează-le pentru a debloca obiecte în ediție limitată, animale de companie sau de călărit din trecut... și viitor!</string>
+    <string name="timetravelers_closed_description">Câștigă o Clepsidră Mistică pentru fiecare trei luni consecutive de abonare, apoi utilizează-le pentru a debloca obiecte în ediție limitată, animale de companie sau de călărit din trecut… și viitor!</string>
     <string name="want_to_subscribe">Vreau să mă abonez</string>
     <string name="seasonal_closed_description">Galele Grand au loc în apropierea solstițiilor și echinocțiilor, așa că întoarce-te atunci pentru a găsi un asortiment de obiecte sezonale speciale!</string>
     <string name="come_back_soon">Revino în curând!</string>
diff --git a/Habitica/res/values-ru/strings.profile.xml b/Habitica/res/values-ru/strings.profile.xml
index b55dc4b05..363b05cb9 100644
--- a/Habitica/res/values-ru/strings.profile.xml
+++ b/Habitica/res/values-ru/strings.profile.xml
@@ -3,7 +3,7 @@
     <string name="profile_pets_and_mounts">Питомцы и Скакуны</string>
     <string name="profile_pets_found">Питомцев найдено</string>
     <string name="profile_mounts_tamed">Пойманных скакунов</string>
-    <string name="profile_loading_data">Загрузка данных участника...</string>
+    <string name="profile_loading_data">Загрузка данных участника…</string>
     <string name="profile_send_message_to">Отправить сообщение %s</string>
     <string name="profile_message_sent_to">Сообщение отправлено %s</string>
     <string name="profile_level">Уровень:</string>
diff --git a/Habitica/res/values-ru/strings.xml b/Habitica/res/values-ru/strings.xml
index 43b4142ac..19afc99ed 100644
--- a/Habitica/res/values-ru/strings.xml
+++ b/Habitica/res/values-ru/strings.xml
@@ -494,7 +494,7 @@
     <string name="insufficientHourglasses">Вам нужно больше мистических песочных очков чтобы купить этот предмет!</string>
     <string name="get_hourglasses">Получить песочные часы</string>
     <string name="subscribe_for_hourglasses">Оформите подписку для получения Мистических песочных часов</string>
-    <string name="timetravelers_closed_description">Зарабатывайте одни мистические песочные часы за каждые три последующие месяца подписки, чтобы потом использовать их для открытия труднодоступного снаряжения, питомцев и скакунов из прошлого... и даже будущего!</string>
+    <string name="timetravelers_closed_description">Зарабатывайте одни мистические песочные часы за каждые три последующие месяца подписки, чтобы потом использовать их для открытия труднодоступного снаряжения, питомцев и скакунов из прошлого… и даже будущего!</string>
     <string name="want_to_subscribe">Я хочу подписаться</string>
     <string name="seasonal_closed_description">Великие праздники случаются ближе к солнцестоянию и равноденствия, поэтому в это время возможно найти забавный ассортимент специальных сезонных предметов!</string>
     <string name="come_back_soon">Возвращайся скорее!</string>
diff --git a/Habitica/res/values-sv/strings.profile.xml b/Habitica/res/values-sv/strings.profile.xml
index 391f24087..dc156683d 100644
--- a/Habitica/res/values-sv/strings.profile.xml
+++ b/Habitica/res/values-sv/strings.profile.xml
@@ -6,7 +6,7 @@
     <string name="profile_level">Level:</string>
     <string name="profile_message_sent_to">Meddelande skickat till %s</string>
     <string name="profile_send_message_to">Skicka meddelande till %s</string>
-    <string name="profile_loading_data">Laddar medlemmens data...</string>
+    <string name="profile_loading_data">Laddar medlemmens data…</string>
     <string name="profile_mounts_tamed">Tama riddjur</string>
     <string name="profile_pets_found">Sällskapsdjur funna</string>
     <string name="profile_pets_and_mounts">Sällskapsdjur &amp; Riddjur</string>
diff --git a/Habitica/res/values-sv/strings.xml b/Habitica/res/values-sv/strings.xml
index 2a3f58ba9..61125e69d 100755
--- a/Habitica/res/values-sv/strings.xml
+++ b/Habitica/res/values-sv/strings.xml
@@ -452,7 +452,7 @@
     <string name="insufficientHourglasses">Du behöver mer Mystiska Timglas för att köpa detta objekt!</string>
     <string name="get_hourglasses">Skaffa timglas</string>
     <string name="subscribe_for_hourglasses">Prenumerera för Timglas</string>
-    <string name="timetravelers_closed_description">Tjäna ett Mystiskt timglas för varje tredje månad du prenumererat i följd. Använd dom sen för att låsa upp begränsade utgåvor, husdjur och riddjur från det förflutna... och framtiden!</string>
+    <string name="timetravelers_closed_description"><![CDATA[Tjäna ett Mystiskt timglas för varje tredje månad du prenumererat i följd. Använd dom sen för att låsa upp begränsade utgåvor, husdjur och riddjur från det förflutna… och framtiden!]]></string>
     <string name="want_to_subscribe">Jag vill Prenumerera</string>
     <string name="come_back_soon">Kom tillbaka snart!</string>
     <string name="level">Nivå</string>
diff --git a/Habitica/res/values-tr/strings.profile.xml b/Habitica/res/values-tr/strings.profile.xml
index c9b401367..9753e7c5c 100644
--- a/Habitica/res/values-tr/strings.profile.xml
+++ b/Habitica/res/values-tr/strings.profile.xml
@@ -3,7 +3,7 @@
     <string name="profile_pets_and_mounts">Evcil &amp; Binek Hayvanlar</string>
     <string name="profile_pets_found">Bulunan Evcil Hayvanlar</string>
     <string name="profile_mounts_tamed">Evcilleştirilen Binek Hayvanları</string>
-    <string name="profile_loading_data">Üye verileri yükleniyor...</string>
+    <string name="profile_loading_data">Üye verileri yükleniyor…</string>
     <string name="profile_send_message_to">%s kişisine mesaj gönder</string>
     <string name="profile_message_sent_to">%s kişisine mesaj gönderildi</string>
     <string name="profile_level">Seviye:</string>
diff --git a/Habitica/res/values-tr/strings.sidebar.xml b/Habitica/res/values-tr/strings.sidebar.xml
index c20d92837..1e0a14ab5 100644
--- a/Habitica/res/values-tr/strings.sidebar.xml
+++ b/Habitica/res/values-tr/strings.sidebar.xml
@@ -6,7 +6,6 @@
     <string name="sidebar_inbox">Mesajlar</string>
     <string name="sidebar_tavern">Taverna</string>
     <string name="sidebar_party">Takım</string>
-    <string name="sidebar_purchaseGems">Elmas Satın Al</string>
     <string name="sidebar_guilds">Loncalar</string>
     <string name="sidebar_challenges">Mücadeleler</string>
     <string name="sidebar_section_inventory">Envanter</string>
diff --git a/Habitica/res/values-tr/strings.xml b/Habitica/res/values-tr/strings.xml
index d411f70eb..53dd24872 100644
--- a/Habitica/res/values-tr/strings.xml
+++ b/Habitica/res/values-tr/strings.xml
@@ -504,7 +504,7 @@
     <string name="insufficientHourglasses">Bu eşyayı almak için daha çok Mistik Kum Saatine ihtiyacın var!</string>
     <string name="get_hourglasses">Kum Saatleri al</string>
     <string name="subscribe_for_hourglasses">Kum Saatleri için abone ol</string>
-    <string name="timetravelers_closed_description">"Her 3 aylık devamlı üyelik başına bir Mistik Kum Saati kazan, daha sonra onu kullanarak sınırlı sayıdaki ekipmanların, hayvanların ve bineklerin kilidini  aç, geçmişten ..._ ve gelecekten!"</string>
+    <string name="timetravelers_closed_description">"Her 3 aylık devamlı üyelik başına bir Mistik Kum Saati kazan, daha sonra onu kullanarak sınırlı sayıdaki ekipmanların, hayvanların ve bineklerin kilidini  aç, geçmişten …_ ve gelecekten!"</string>
     <string name="want_to_subscribe">Abone olmak istiyorum</string>
     <string name="seasonal_closed_description">Büyük Galalar gündönümü ve ekinoks zamanlarına yakın gerçekleşirler, çeşit çeşit özel mevsimsel eşyalar bulmak için bu zamanlarda ziyaret et!</string>
     <string name="come_back_soon">Yakında yine gel!</string>
diff --git a/Habitica/res/values-uk/strings.profile.xml b/Habitica/res/values-uk/strings.profile.xml
index 661c1d03b..6a2f3e23e 100644
--- a/Habitica/res/values-uk/strings.profile.xml
+++ b/Habitica/res/values-uk/strings.profile.xml
@@ -7,7 +7,7 @@
     <string name="profile_level">Рівень:</string>
     <string name="profile_message_sent_to">Повідомлення відправлено %s</string>
     <string name="profile_send_message_to">Відправити повідомлення %s</string>
-    <string name="profile_loading_data">Завантаження даних учасника...</string>
+    <string name="profile_loading_data">Завантаження даних учасника…</string>
     <string name="profile_mounts_tamed">Приручені скакуни</string>
     <string name="profile_pets_found">Знайдені улюбленці</string>
     <string name="profile_pets_and_mounts">Улюбленці та Скакуни</string>
diff --git a/Habitica/res/values-vi/strings.profile.xml b/Habitica/res/values-vi/strings.profile.xml
index 4ca03cce2..b4750afcb 100644
--- a/Habitica/res/values-vi/strings.profile.xml
+++ b/Habitica/res/values-vi/strings.profile.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="profile_pets_and_mounts">Thú cưng &amp; Thú cưỡi</string>
     <string name="profile_pets_found">Thú cưng Đã có</string>
-    <string name="profile_loading_data">Đang tải dữ liệu thành viên...</string>
+    <string name="profile_loading_data">Đang tải dữ liệu thành viên…</string>
     <string name="profile_send_message_to">Gửi tin nhắn tới %s</string>
     <string name="profile_message_sent_to">Tin nhắn đã gửi tới %s</string>
     <string name="profile_level">Cấp độ:</string>
diff --git a/Habitica/res/values-vi/strings.xml b/Habitica/res/values-vi/strings.xml
index a5c3f6348..b350bf701 100755
--- a/Habitica/res/values-vi/strings.xml
+++ b/Habitica/res/values-vi/strings.xml
@@ -580,7 +580,7 @@
     <string name="come_back_soon">Quay trở lại sớm nhé!</string>
     <string name="seasonal_closed_description">Những buổi tiệc lớn xảy ra gần các thời điểm Chí và Phân trong năm, vì vậy nhớ ghé xem để tìm thấy các vật phẩm đặc biệt theo mùa thú vị các loại!</string>
     <string name="want_to_subscribe">Tôi muốn Đăng ký</string>
-    <string name="timetravelers_closed_description">Kiếm một Đồng hồ cát Bí ẩn mỗi ba tháng liên tục đăng kí, và sau đó sử dụng chúng để mở khóa những vật phẩm giới hạn, thú cưng, và thú cưỡi từ quá khứ... và tương lai!</string>
+    <string name="timetravelers_closed_description">Kiếm một Đồng hồ cát Bí ẩn mỗi ba tháng liên tục đăng kí, và sau đó sử dụng chúng để mở khóa những vật phẩm giới hạn, thú cưng, và thú cưỡi từ quá khứ… và tương lai!</string>
     <string name="subscribe_for_hourglasses">Đăng kí để có Đồng hồ cát</string>
     <string name="get_hourglasses">Lấy đồng hồ cát</string>
     <string name="insufficientHourglasses">Bạn sẽ cần nhiều Đồng hồ cát bí ẩn hơn để mua vật phẩm này!</string>
diff --git a/Habitica/res/values-zh/strings.profile.xml b/Habitica/res/values-zh/strings.profile.xml
index 374b5f69a..daa37e3fb 100644
--- a/Habitica/res/values-zh/strings.profile.xml
+++ b/Habitica/res/values-zh/strings.profile.xml
@@ -3,7 +3,7 @@
     <string name="profile_pets_and_mounts">宠物和坐骑</string>
     <string name="profile_pets_found">发现的宠物</string>
     <string name="profile_mounts_tamed">驯养的坐骑</string>
-    <string name="profile_loading_data">正在加载成员数据...</string>
+    <string name="profile_loading_data">正在加载成员数据…</string>
     <string name="profile_send_message_to">给%s发送信息</string>
     <string name="profile_message_sent_to">发送给%s的信息</string>
     <string name="profile_level">级别：</string>
diff --git a/Habitica/res/values/dimens.xml b/Habitica/res/values/dimens.xml
index 676a722bb..eecdca919 100644
--- a/Habitica/res/values/dimens.xml
+++ b/Habitica/res/values/dimens.xml
@@ -3,7 +3,6 @@
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">8dp</dimen>
-    <dimen name="card_horizontal_padding">4dip</dimen>
 
     <dimen name="card_medium_text">18.0sp</dimen>
     <dimen name="card_small_text">14.0sp</dimen>
@@ -11,9 +10,7 @@
     <dimen name="card_padding_compact">6dp</dimen>
     <dimen name="section_leftright_padding">6dp</dimen>
     <dimen name="section_top_padding">16dp</dimen>
-    <dimen name="card_margin">6dp</dimen>
 
-    <dimen name="party_invite_button">34dp</dimen>
     <dimen name="party_accept_button_start_margin">5dp</dimen>
     <dimen name="party_invite_avatar">46dp</dimen>  <!--50?-->
     <dimen name="party_invite_separator">4dp</dimen>
diff --git a/Habitica/res/values/strings.profile.xml b/Habitica/res/values/strings.profile.xml
index 0c2734e1c..dedf8fecb 100644
--- a/Habitica/res/values/strings.profile.xml
+++ b/Habitica/res/values/strings.profile.xml
@@ -3,13 +3,11 @@
     <string name="profile_pets_and_mounts">Pets &amp; Mounts</string>
     <string name="profile_pets_found">Pets Found</string>
     <string name="profile_mounts_tamed">Mounts Tamed</string>
-    <string name="profile_loading_data">Loading member data...</string>
+    <string name="profile_loading_data">Loading member data…</string>
     <string name="profile_send_message_to">Send message to %s</string>
     <string name="profile_message_sent_to">Message sent to %s</string>
     <string name="profile_level">Level:</string>
     <string name="profile_class_bonus">Class-Bonus:</string>
     <string name="profile_allocated">Allocated:</string>
-    <string name="profile_private_message">Private Message</string>
     <string name="profile_achievements">Achievements</string>
-
 </resources>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt
index 042b6e886..8d67b9787 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt
@@ -18,7 +18,7 @@ import com.amplitude.api.Identify
 import com.facebook.drawee.backends.pipeline.Fresco
 import com.facebook.imagepipeline.core.ImagePipelineConfig
 import com.google.firebase.analytics.FirebaseAnalytics
-import com.google.firebase.iid.FirebaseInstanceId
+import com.google.firebase.installations.FirebaseInstallations
 import com.google.firebase.remoteconfig.FirebaseRemoteConfig
 import com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings
 import com.habitrpg.android.habitica.api.HostConfig
@@ -170,7 +170,7 @@ abstract class HabiticaBaseApplication : Application() {
                 return "DONT-NEED-IT"
             }
 
-            override fun getCache(): Cache? {
+            override fun getCache(): Cache {
                 return Billing.newCache()
             }
 
@@ -193,16 +193,12 @@ abstract class HabiticaBaseApplication : Application() {
     }
 
     private fun setupNotifications() {
-        FirebaseInstanceId.getInstance().instanceId.addOnCompleteListener { task ->
+        FirebaseInstallations.getInstance().id.addOnCompleteListener { task ->
             if (!task.isSuccessful) {
                 Log.w("Token", "getInstanceId failed", task.exception)
                 return@addOnCompleteListener
             }
-
-            // Get new Instance ID token
-            val token = task.result?.token
-
-            // Log and toast
+            val token = task.result
             if (BuildConfig.DEBUG) {
                 Log.d("Token", "Firebase Notification Token: $token")
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.kt
index 1695509aa..f042a67ee 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.kt
@@ -112,7 +112,7 @@ class HabiticaPurchaseVerifier(context: Context, apiClient: ApiClient) : BasePur
     private fun loadPendingGifts(): MutableMap<String?, String?> {
         val outputMap: MutableMap<String?, String?> = HashMap()
         try {
-            val jsonString = preferences?.getString(PENDING_GIFTS_KEY, JSONObject().toString())
+            val jsonString = preferences?.getString(PENDING_GIFTS_KEY, JSONObject().toString()) ?: ""
             val jsonObject = JSONObject(jsonString)
             val keysItr = jsonObject.keys()
             while (keysItr.hasNext()) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.kt
index 2cd201072..e7222f05a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.kt
@@ -38,9 +38,8 @@ interface UserRepository : BaseRepository {
 
     fun getSpecialItems(user: User): Flowable<RealmResults<Skill>>
 
-    fun useSkill(user: User?, key: String, target: String?, taskId: String): Flowable<SkillResponse>
-
-    fun useSkill(user: User?, key: String, target: String?): Flowable<SkillResponse>
+    fun useSkill(key: String, target: String?, taskId: String): Flowable<SkillResponse>
+    fun useSkill(key: String, target: String?): Flowable<SkillResponse>
 
     fun changeClass(): Flowable<User>
 
@@ -73,9 +72,9 @@ interface UserRepository : BaseRepository {
     fun verifyUsername(username: String): Flowable<VerifyUsernameResponse>
 
     fun allocatePoint(stat: String): Flowable<Stats>
+    fun bulkAllocatePoints(strength: Int, intelligence: Int, constitution: Int, perception: Int): Flowable<Stats>
 
-    fun bulkAllocatePoints(user: User?, strength: Int, intelligence: Int, constitution: Int, perception: Int): Flowable<Stats>
-    fun useCustomization(user: User?, type: String, category: String?, identifier: String): Flowable<User>
+    fun useCustomization(type: String, category: String?, identifier: String): Flowable<User>
     fun retrieveAchievements(): Flowable<List<Achievement>>
     fun getAchievements(): Flowable<RealmResults<Achievement>>
     fun getQuestAchievements(): Flowable<RealmResults<QuestAchievement>>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
index 2b2e0c41a..15daaa33d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
@@ -100,6 +100,10 @@ class TaskRepositoryImpl(localRepository: TaskLocalRepository, apiClient: ApiCli
                 .map { (res, user): Pair<TaskDirectionData, User> ->
                     // save local task changes
                     val result = TaskScoringResult()
+                    if (res.lvl == 0) {
+                        // Team tasks that require approval have weird data that we should just ignore.
+                        return@map result
+                    }
                     val stats = user.stats
 
                     result.healthDelta = res.hp - (stats?.hp ?: 0.0)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
index f84e644ee..d73563a59 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
@@ -23,7 +23,9 @@ import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.models.user.User
 import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.core.Maybe
+import io.reactivex.rxjava3.functions.BiFunction
 import io.realm.RealmResults
+import org.reactivestreams.Publisher
 import java.util.*
 import java.util.concurrent.TimeUnit
 
@@ -112,27 +114,21 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
     override fun getSpecialItems(user: User): Flowable<RealmResults<Skill>> =
             localRepository.getSpecialItems(user)
 
-    override fun useSkill(user: User?, key: String, target: String?, taskId: String): Flowable<SkillResponse> {
-        return apiClient.useSkill(key, target ?: "", taskId).doOnNext { skillResponse ->
-            if (user != null) {
-                mergeUser(user, skillResponse.user)
-            }
+    override fun useSkill(key: String, target: String?, taskId: String): Flowable<SkillResponse> {
+        return zipWithLiveUser(apiClient.useSkill(key, target ?: "", taskId)) { skillResponse, user ->
+            mergeUser(user, skillResponse.user)
+            skillResponse
         }
     }
 
-    override fun useSkill(user: User?, key: String, target: String?): Flowable<SkillResponse> {
-        return apiClient.useSkill(key, target ?: "")
-                .map { response ->
-                    response.hpDiff = response.user.stats?.hp ?: 0 - (user?.stats?.hp ?: 0.0)
-                    response.expDiff = response.user.stats?.exp ?: 0 - (user?.stats?.exp ?: 0.0)
-                    response.goldDiff = response.user.stats?.gp ?: 0 - (user?.stats?.gp ?: 0.0)
+    override fun useSkill(key: String, target: String?): Flowable<SkillResponse> {
+        return zipWithLiveUser(apiClient.useSkill(key, target ?: "")) { response, user ->
+                    response.hpDiff = response.user.stats?.hp ?: 0 - (user.stats?.hp ?: 0.0)
+                    response.expDiff = response.user.stats?.exp ?: 0 - (user.stats?.exp ?: 0.0)
+                    response.goldDiff = response.user.stats?.gp ?: 0 - (user.stats?.gp ?: 0.0)
+                    mergeUser(user, response.user)
                     response
                 }
-                .doOnNext { skillResponse ->
-                    if (user != null) {
-                        mergeUser(user, skillResponse.user)
-                    }
-                }
     }
 
     override fun changeClass(): Flowable<User> = apiClient.changeClass().flatMap { retrieveUser(withTasks = false, forced = true) }
@@ -146,14 +142,16 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
         if (path.last() == '.' && customization.type == "background") {
             path += user?.preferences?.background
         }
-        return Flowable.zip(apiClient.unlockPath(path), localRepository.getUser(userID).firstElement().toFlowable(), { unlockResponse, copiedUser ->
-                    copiedUser.preferences = unlockResponse.preferences
-                    copiedUser.purchased = unlockResponse.purchased
-                    copiedUser.items = unlockResponse.items
-                    copiedUser.balance = copiedUser.balance - (customization.price ?: 0) / 4.0
-                    localRepository.saveUser(copiedUser, false)
+        return zipWithLiveUser(apiClient.unlockPath(path)) { unlockResponse, copiedUser ->
+            localRepository.modify(copiedUser) { copiedUser ->
+                copiedUser.preferences = unlockResponse.preferences
+                copiedUser.purchased = unlockResponse.purchased
+                copiedUser.items = unlockResponse.items
+                copiedUser.balance = copiedUser.balance - (customization.price ?: 0) / 4.0
+                localRepository.saveUser(copiedUser, false)
+            }
             unlockResponse
-                })
+        }
     }
 
     override fun unlockPath(set: CustomizationSet): Flowable<UnlockResponse> {
@@ -165,7 +163,9 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
             return Flowable.just(null)
         }
         path = path.substring(1)
-        return Flowable.zip(apiClient.unlockPath(path), localRepository.getUser(userID).firstElement().toFlowable(), { unlockResponse, copiedUser ->
+        return Flowable.zip(apiClient.unlockPath(path), localRepository.getUser(userID).firstElement().toFlowable()
+                .map { localRepository.getLiveObject(it) }
+                .skipNil(), { unlockResponse, copiedUser ->
                     copiedUser.preferences = unlockResponse.preferences
                     copiedUser.purchased = unlockResponse.purchased
                     copiedUser.items = unlockResponse.items
@@ -240,32 +240,32 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
             apiClient.updatePassword(oldPassword.trim(), newPassword.trim(), newPasswordConfirmation.trim())
 
     override fun allocatePoint(stat: String): Flowable<Stats> {
-        localRepository.getUser(userID).subscribe( { liveUser ->
-            when (stat) {
-                Stats.STRENGTH -> liveUser.stats?.strength = liveUser.stats?.strength?.inc()
-                Stats.INTELLIGENCE -> liveUser.stats?.intelligence = liveUser.stats?.intelligence?.inc()
-                Stats.CONSTITUTION -> liveUser.stats?.constitution= liveUser.stats?.constitution?.inc()
-                Stats.PERCEPTION -> liveUser.stats?.per = liveUser.stats?.per?.inc()
-            }
-            liveUser.stats?.points = liveUser.stats?.points?.dec()
-        }, RxErrorHandler.handleEmptyError())
-        return apiClient.allocatePoint(stat)
-                .doOnNext { stats ->
-                        /*localRepository.modify(user) { liveUser ->
-                            liveUser.stats?.strength = stats.strength
-                            liveUser.stats?.constitution = stats.constitution
-                            liveUser.stats?.per = stats.per
-                            liveUser.stats?.intelligence = stats.intelligence
-                            liveUser.stats?.points = stats.points
-                            liveUser.stats?.mp = stats.mp
-                        }*/
+        getLiveUser().firstElement().subscribe( { liveUser ->
+            localRepository.executeTransaction {
+                when (stat) {
+                    Stats.STRENGTH -> liveUser.stats?.strength = liveUser.stats?.strength?.inc()
+                    Stats.INTELLIGENCE -> liveUser.stats?.intelligence = liveUser.stats?.intelligence?.inc()
+                    Stats.CONSTITUTION -> liveUser.stats?.constitution= liveUser.stats?.constitution?.inc()
+                    Stats.PERCEPTION -> liveUser.stats?.per = liveUser.stats?.per?.inc()
                 }
+                liveUser.stats?.points = liveUser.stats?.points?.dec()
+            }
+        }, RxErrorHandler.handleEmptyError())
+        return zipWithLiveUser(apiClient.allocatePoint(stat)) { stats, user ->
+            localRepository.modify(user) { liveUser ->
+                liveUser.stats?.strength = stats.strength
+                liveUser.stats?.constitution = stats.constitution
+                liveUser.stats?.per = stats.per
+                liveUser.stats?.intelligence = stats.intelligence
+                liveUser.stats?.points = stats.points
+                liveUser.stats?.mp = stats.mp
+            }
+            stats
+        }
     }
 
-    override fun bulkAllocatePoints(user: User?, strength: Int, intelligence: Int, constitution: Int, perception: Int): Flowable<Stats> =
-            apiClient.bulkAllocatePoints(strength, intelligence, constitution, perception)
-                    .doOnNext { stats ->
-                        if (user != null && user.isManaged) {
+    override fun bulkAllocatePoints(strength: Int, intelligence: Int, constitution: Int, perception: Int): Flowable<Stats> =
+            zipWithLiveUser(apiClient.bulkAllocatePoints(strength, intelligence, constitution, perception)) { stats, user ->
                             localRepository.modify(user) { liveUser ->
                                 liveUser.stats?.strength = stats.strength
                                 liveUser.stats?.constitution = stats.constitution
@@ -274,8 +274,8 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
                                 liveUser.stats?.points = stats.points
                                 liveUser.stats?.mp = stats.mp
                             }
-                        }
-                    }
+                stats
+            }
 
     override fun runCron(tasks: MutableList<Task>) {
         var observable: Maybe<Any> = localRepository.getUser(userID).firstElement()
@@ -302,26 +302,28 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
                 .subscribe({ }, RxErrorHandler.handleEmptyError())
     }
 
-    override fun useCustomization(user: User?, type: String, category: String?, identifier: String): Flowable<User> {
-        if (user != null && appConfigManager.enableLocalChanges()) {
-            localRepository.modify(user) { liveUser ->
-                when (type) {
-                    "skin" -> liveUser.preferences?.skin =identifier
-                    "shirt" -> liveUser.preferences?.shirt = identifier
-                    "hair" -> {
-                        when (category) {
-                            "color" -> liveUser.preferences?.hair?.color = identifier
-                            "flower" -> liveUser.preferences?.hair?.flower = identifier.toInt()
-                            "mustache" -> liveUser.preferences?.hair?.mustache = identifier.toInt()
-                            "beard" -> liveUser.preferences?.hair?.beard = identifier.toInt()
-                            "bangs" -> liveUser.preferences?.hair?.bangs = identifier.toInt()
-                            "base" -> liveUser.preferences?.hair?.base = identifier.toInt()
+    override fun useCustomization(type: String, category: String?, identifier: String): Flowable<User> {
+        if (appConfigManager.enableLocalChanges()) {
+            localRepository.getUser(userID).firstElement().subscribe( { liveUser ->
+                localRepository.modify(liveUser) { liveUser ->
+                    when (type) {
+                        "skin" -> liveUser.preferences?.skin = identifier
+                        "shirt" -> liveUser.preferences?.shirt = identifier
+                        "hair" -> {
+                            when (category) {
+                                "color" -> liveUser.preferences?.hair?.color = identifier
+                                "flower" -> liveUser.preferences?.hair?.flower = identifier.toInt()
+                                "mustache" -> liveUser.preferences?.hair?.mustache = identifier.toInt()
+                                "beard" -> liveUser.preferences?.hair?.beard = identifier.toInt()
+                                "bangs" -> liveUser.preferences?.hair?.bangs = identifier.toInt()
+                                "base" -> liveUser.preferences?.hair?.base = identifier.toInt()
+                            }
                         }
+                        "background" -> liveUser.preferences?.background = identifier
+                        "chair" -> liveUser.preferences?.chair = identifier
                     }
-                    "background" -> liveUser.preferences?.background = identifier
-                    "chair" -> liveUser.preferences?.chair = identifier
                 }
-            }
+            }, RxErrorHandler.handleEmptyError())
         }
         var updatePath = "preferences.$type"
         if (category != null) {
@@ -376,6 +378,16 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
         return localRepository.getTeamPlan(teamID)
     }
 
+    private fun getLiveUser(): Flowable<User> {
+        return localRepository.getUser(userID)
+                .map { localRepository.getLiveObject(it) }
+                .skipNil()
+    }
+
+    private fun <T> zipWithLiveUser(flowable: Flowable<T>, mergeFunc: BiFunction<T, User, T>): Flowable<T> {
+        return Flowable.zip(flowable, getLiveUser().firstElement().toFlowable(), mergeFunc)
+    }
+
     private fun mergeUser(oldUser: User?, newUser: User): User {
         if (oldUser == null || !oldUser.isValid) {
             return oldUser ?: newUser
@@ -413,3 +425,8 @@ class UserRepositoryImpl(localRepository: UserLocalRepository, apiClient: ApiCli
         return copiedUser
     }
 }
+
+private fun <T> Flowable<T?>.skipNil(): Flowable<T> {
+    @Suppress("UNCHECKED_CAST")
+    return skipWhile { it == null } as? Flowable<T> ?: Flowable.empty()
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationOpenHandler.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationOpenHandler.kt
index 723cf8d75..0cb6bae89 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationOpenHandler.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationOpenHandler.kt
@@ -13,7 +13,7 @@ class NotificationOpenHandler {
 
     companion object {
 
-        fun handleOpenedByNotification(identifier: String, intent: Intent, user: User?) {
+        fun handleOpenedByNotification(identifier: String, intent: Intent) {
             GlobalScope.launch(context = Dispatchers.Main) {
                 when (identifier) {
                     PushNotificationManager.PARTY_INVITE_PUSH_NOTIFICATION_KEY -> openPartyScreen()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaFirebaseMessagingService.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaFirebaseMessagingService.kt
index b9971cebe..12395505b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaFirebaseMessagingService.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaFirebaseMessagingService.kt
@@ -1,6 +1,6 @@
 package com.habitrpg.android.habitica.helpers.notifications
 
-import com.google.firebase.iid.FirebaseInstanceId
+import com.google.firebase.messaging.FirebaseMessaging
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
 import com.habitrpg.android.habitica.HabiticaBaseApplication
@@ -34,9 +34,12 @@ class HabiticaFirebaseMessagingService : FirebaseMessagingService() {
     override fun onNewToken(s: String) {
         super.onNewToken(s)
         userComponent?.inject(this)
-        val refreshedToken = FirebaseInstanceId.getInstance().token
-        if (refreshedToken != null && this::pushNotificationManager.isInitialized) {
-            pushNotificationManager.refreshedToken = refreshedToken
+        FirebaseMessaging.getInstance().token.addOnCompleteListener { task ->
+            val refreshedToken = task.result
+            if (refreshedToken != null && this::pushNotificationManager.isInitialized) {
+                pushNotificationManager.refreshedToken = refreshedToken
+            }
         }
+
     }
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.kt
index 02272b51b..a94ab90a1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.kt
@@ -3,7 +3,7 @@ package com.habitrpg.android.habitica.helpers.notifications
 import android.content.Context
 import android.content.SharedPreferences
 import androidx.core.content.edit
-import com.google.firebase.iid.FirebaseInstanceId
+import com.google.firebase.messaging.FirebaseMessaging
 import com.google.firebase.messaging.RemoteMessage
 import com.habitrpg.android.habitica.data.ApiClient
 import com.habitrpg.android.habitica.helpers.AmplitudeManager
@@ -32,7 +32,7 @@ class PushNotificationManager(var apiClient: ApiClient, private val sharedPrefer
 
     fun addPushDeviceUsingStoredToken() {
         if (this.refreshedToken.isEmpty()) {
-            this.refreshedToken = FirebaseInstanceId.getInstance().token ?: ""
+            this.refreshedToken = FirebaseMessaging.getInstance().token.result
         }
 
         if (this.refreshedToken.isEmpty() || this.user == null || this.userHasPushDevice() || !this.userIsSubscribedToNotifications()) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.kt
index 81311c32e..9236c4064 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.kt
@@ -32,7 +32,7 @@ constructor(private val soundManager: SoundManager, threadExecutor: ThreadExecut
                 return@defer Flowable.just<Stats>(requestValues.user.stats)
             }
 
-            if (requestValues.newLevel == 10L) {
+            if (requestValues.newLevel == 10) {
                 val binding = DialogLevelup10Binding.inflate(requestValues.activity.layoutInflater)
                 binding.healerIconView.setImageBitmap(HabiticaIconsHelper.imageOfHealerLightBg())
                 binding.mageIconView.setImageBitmap(HabiticaIconsHelper.imageOfMageLightBg())
@@ -89,7 +89,7 @@ constructor(private val soundManager: SoundManager, threadExecutor: ThreadExecut
                 .subscribe({ }, RxErrorHandler.handleEmptyError())
     }
 
-    class RequestValues(val user: User, val level: Long?, val activity: AppCompatActivity) : UseCase.RequestValues {
-        val newLevel: Long = level ?: 0
+    class RequestValues(val user: User, val level: Int?, val activity: AppCompatActivity) : UseCase.RequestValues {
+        val newLevel: Int = level ?: 0
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.kt
index aa30bb7d7..722a11da8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.kt
@@ -53,7 +53,7 @@ constructor(threadExecutor: ThreadExecutor, postExecutionThread: PostExecutionTh
         }
     }
 
-    class RequestValues( val context: AppCompatActivity, val snackbarTargetView: ViewGroup, val user: User?, val xp: Double?, val hp: Double?, val gold: Double?, val mp: Double?, val questDamage: Double?, val hasLeveledUp: Boolean?, val level: Long?) : UseCase.RequestValues
+    class RequestValues( val context: AppCompatActivity, val snackbarTargetView: ViewGroup, val user: User?, val xp: Double?, val hp: Double?, val gold: Double?, val mp: Double?, val questDamage: Double?, val hasLeveledUp: Boolean?, val level: Int?) : UseCase.RequestValues
 
     companion object {
 
@@ -107,7 +107,7 @@ constructor(threadExecutor: ThreadExecutor, postExecutionThread: PostExecutionTh
             return textView
         }
 
-        fun getNotificationAndAddStatsToUserAsText(context: Context, xp: Double, hp: Double, gold: Double, mp: Double): Pair<SpannableStringBuilder, SnackbarDisplayType> {
+        fun getNotificationAndAddStatsToUserAsText(xp: Double, hp: Double, gold: Double, mp: Double): Pair<SpannableStringBuilder, SnackbarDisplayType> {
             val builder = SpannableStringBuilder()
             var displayType = SnackbarDisplayType.NORMAL
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ScoreTaskLocallyInteractor.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ScoreTaskLocallyInteractor.kt
index 71c44d2cf..0d8afd231 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ScoreTaskLocallyInteractor.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ScoreTaskLocallyInteractor.kt
@@ -75,10 +75,10 @@ class ScoreTaskLocallyInteractor {
                 }
                 if (result.exp >= stats.toNextLevel?.toDouble() ?: 0.0) {
                     result.exp = result.exp - (stats.toNextLevel?.toDouble() ?: 0.0)
-                    result.lvl = (user.stats?.lvl ?: 0 + 1).toLong()
+                    result.lvl = user.stats?.lvl ?: 0 + 1
                     result.hp = 50.0
                 } else {
-                    result.lvl = (user.stats?.lvl ?: 0).toLong()
+                    result.lvl = user.stats?.lvl ?: 0
                 }
 
                 result
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionData.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionData.kt
index 31fde57f5..13c8412bd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionData.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionData.kt
@@ -1,11 +1,6 @@
 package com.habitrpg.android.habitica.models.responses
 
-/**
- * This class represent the data sent back from the API when calling /user/tasks/{id}/{direction}.
- * It holds almost the same thing as Stats, except toNextLevel & maxHealth & maxHP.
- * It also holds a delta, which represent the task value modification.
- * Created by MagicMicky on 12/06/2014.
- */
+
 class TaskDirectionData {
     var delta: Float = 0.toFloat()
     var _tmp: TaskDirectionDataTemp? = null
@@ -13,5 +8,5 @@ class TaskDirectionData {
     var hp: Double = 0.0
     var gp: Double = 0.0
     var mp: Double = 0.0
-    var lvl: Long = 0
+    var lvl: Int = 0
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskScoringResult.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskScoringResult.kt
index 5aee0d490..db134dff0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskScoringResult.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskScoringResult.kt
@@ -1,14 +1,13 @@
 package com.habitrpg.android.habitica.models.responses
 
-class TaskScoringResult() {
-
+class TaskScoringResult {
     var drop: TaskDirectionDataDrop? = null
     var experienceDelta: Double? = null
     var healthDelta: Double? = null
     var goldDelta: Double? = null
     var manaDelta: Double? = null
     var hasLeveledUp: Boolean = false
-    var level: Long? = null
+    var level: Int? = null
     var questDamage: Double? = null
     var questItemsFound: Int? = null
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt
index 367d07c28..a1d88a5ff 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt
@@ -39,7 +39,7 @@ open class Task : RealmObject, BaseObject, Parcelable {
     var text: String = ""
     var notes: String? = null
     @TaskTypes
-    var type: String = ""
+    var type: String = Task.TYPE_HABIT
     var challengeID: String? = null
     var challengeBroken: String? = null
     var attribute: String? = Stats.STRENGTH
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt
index 6bb7d5eb6..2f414a9b6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt
@@ -1,7 +1,6 @@
 package com.habitrpg.android.habitica.ui.activities
 
 import android.app.Activity
-import android.app.ProgressDialog
 import android.content.Context
 import android.content.Intent
 import android.graphics.drawable.ColorDrawable
@@ -10,8 +9,8 @@ import android.view.*
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import android.widget.EditText
+import android.widget.TextView
 import androidx.appcompat.widget.AppCompatCheckedTextView
-import androidx.appcompat.widget.AppCompatTextView
 import androidx.appcompat.widget.Toolbar
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.UserComponent
@@ -33,6 +32,7 @@ import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengesOv
 import com.habitrpg.android.habitica.ui.helpers.ToolbarColorHelper
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
+import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaProgressDialog
 import io.reactivex.rxjava3.core.Flowable
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
@@ -130,8 +130,7 @@ class ChallengeFormActivity : BaseActivity() {
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         if (item.itemId == R.id.action_save && !savingInProgress && validateAllFields()) {
             savingInProgress = true
-            @Suppress("DEPRECATION")
-            val dialog = ProgressDialog.show(this, "", "Saving challenge data. Please wait...", true, false)
+            val dialog = HabiticaProgressDialog.show(this, R.string.saving)
 
             val observable: Flowable<Challenge> = if (editMode) {
                 updateChallenge()
@@ -145,7 +144,7 @@ class ChallengeFormActivity : BaseActivity() {
                         challengeRepository.retrieveChallenges(0, true)
                     }
                     .subscribe({
-                        dialog.dismiss()
+                        dialog?.dismiss()
                         savingInProgress = false
                         finish()
                         if (!editMode) {
@@ -155,7 +154,7 @@ class ChallengeFormActivity : BaseActivity() {
                             }
                         }
                     }, { throwable ->
-                dialog.dismiss()
+                dialog?.dismiss()
                 savingInProgress = false
                 RxErrorHandler.reportError(throwable)
             }))
@@ -520,7 +519,7 @@ class ChallengeFormActivity : BaseActivity() {
     private class GroupArrayAdapter(context: Context) : ArrayAdapter<Group>(context, android.R.layout.simple_spinner_item) {
 
         override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
-            val checkedTextView = super.getView(position, convertView, parent) as? AppCompatTextView
+            val checkedTextView = super.getView(position, convertView, parent) as? TextView
             checkedTextView?.text = getItem(position)?.name
             return checkedTextView ?: View(context)
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt
index 1ab0b3682..63dfc037c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt
@@ -18,6 +18,7 @@ import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.user.*
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
+import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaProgressDialog
 import io.reactivex.rxjava3.functions.Consumer
 import javax.inject.Inject
 
@@ -49,8 +50,7 @@ class ClassSelectionActivity : BaseActivity(), Consumer<User> {
     @Inject
     lateinit var userRepository: UserRepository
 
-    @Suppress("DEPRECATION")
-    private var progressDialog: ProgressDialog? = null
+    private var progressDialog: HabiticaProgressDialog? = null
 
     override fun getLayoutResId(): Int {
         return R.layout.activity_class_selection
@@ -260,8 +260,7 @@ class ClassSelectionActivity : BaseActivity(), Consumer<User> {
     }
 
     private fun displayProgressDialog(progressText: String) {
-        @Suppress("DEPRECATION")
-        progressDialog = ProgressDialog.show(this, progressText, null, true)
+        val dialog = HabiticaProgressDialog.show(this, progressText)
     }
 
     override fun accept(user: User) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FixCharacterValuesActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FixCharacterValuesActivity.kt
index 79f86bd6d..5604383b8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FixCharacterValuesActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FixCharacterValuesActivity.kt
@@ -18,6 +18,7 @@ import com.habitrpg.android.habitica.models.user.Stats
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.modules.AppModule
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaProgressDialog
 import javax.inject.Inject
 import javax.inject.Named
 
@@ -73,8 +74,7 @@ class FixCharacterValuesActivity: BaseActivity() {
         val id = item.itemId
 
         if (id == R.id.action_save_changes) {
-            @Suppress("DEPRECATION")
-            val progressDialog = ProgressDialog.show(this, getString(R.string.saving), "")
+            val dialog = HabiticaProgressDialog.show(this, R.string.saving)
             val userInfo = HashMap<String, Any>()
             userInfo["stats.hp"] = binding.healthEditText.getDoubleValue()
             userInfo["stats.exp"] = binding.experienceEditText.getDoubleValue()
@@ -85,7 +85,7 @@ class FixCharacterValuesActivity: BaseActivity() {
             compositeSubscription.add(repository.updateUser(userInfo)
                     .flatMap { repository.retrieveUser(false, true, true) }
                     .subscribe({}, RxErrorHandler.handleEmptyError(), {
-                progressDialog.dismiss()
+                dialog?.dismiss()
                 finish()
             }))
             return true
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
index 997ba799c..9e1372f2f 100755
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
@@ -376,7 +376,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
             additionalData["identifier"] = identifier
             AmplitudeManager.sendEvent("open notification", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT, additionalData)
             retrieveUser(true)
-            NotificationOpenHandler.handleOpenedByNotification(identifier, intent, user)
+            NotificationOpenHandler.handleOpenedByNotification(identifier, intent)
         }
 
         launchTrace?.stop()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ReportMessageActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ReportMessageActivity.kt
index 891700c37..aef01c53c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ReportMessageActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ReportMessageActivity.kt
@@ -56,7 +56,7 @@ class ReportMessageActivity : BaseActivity() {
         raisedElevation = binding.appBar.elevation
         setStatusBarDim(true)
 
-        binding.contentContainer.setOnTouchListener { _, _ -> true }
+        binding.bottomSheet.setOnTouchListener { _, _ -> true }
         binding.touchOutside.setOnClickListener { finish() }
         binding.reportExplanationTextview.setMarkdown(getString(R.string.report_explanation))
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.kt
index 29f6c7963..119fe78cc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.kt
@@ -32,9 +32,7 @@ class SkillTasksRecyclerViewAdapter : BaseRecyclerViewAdapter<Task, SkillTasksRe
     }
 
     override fun onBindViewHolder(holder: TaskViewHolder, position: Int) {
-        data?.let {
-            holder.bindHolder(it[position])
-        }
+        holder.bindHolder(data[position])
     }
 
     fun getTaskSelectionEvents(): Flowable<Task> {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.kt
index ac3bac6fe..a71669cc2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.kt
@@ -28,7 +28,7 @@ class ChallengesListViewAdapter(private val viewUserChallengesOnly: Boolean, pri
     }
 
     override fun onBindViewHolder(holder: ChallengeViewHolder, position: Int) {
-        data?.get(position)?.let { challenge ->
+        data[position].let { challenge ->
             holder.bind(challenge, challengeMemberships?.first { challenge.id == it.challengeID } != null)
             holder.itemView.setOnClickListener {
                 if (challenge.isManaged && challenge.isValid) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/GuildListAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/GuildListAdapter.kt
index c6a6e58ad..4c5d32449 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/GuildListAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/GuildListAdapter.kt
@@ -4,7 +4,6 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Filter
 import android.widget.Filterable
-import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.core.os.bundleOf
 import androidx.recyclerview.widget.RecyclerView
@@ -17,33 +16,26 @@ import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.NumberAbbreviator
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.social.Group
 import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.helpers.EmojiParser
-import com.habitrpg.android.habitica.ui.helpers.setMarkdown
-import com.habitrpg.android.habitica.ui.views.HabiticaIcons
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import io.realm.Case
 import io.realm.OrderedRealmCollection
 import java.util.*
 
-class GuildListAdapter(private val onlyShowUsersGuilds: Boolean) : BaseRecyclerViewAdapter<Group, RecyclerView.ViewHolder>(), Filterable {
+class GuildListAdapter : BaseRecyclerViewAdapter<Group, RecyclerView.ViewHolder>(), Filterable {
 
     var socialRepository: SocialRepository? = null
-    private var memberGuildIDs: List<String> = listOf()
 
-    fun setMemberGuildIDs(memberGuildIDs: List<String>) {
-        this.memberGuildIDs = memberGuildIDs
-    }
+    var onlyShowUsersGuilds = false
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        val guildViewHolder = if (onlyShowUsersGuilds) {
+        return if (onlyShowUsersGuilds) {
             UserGuildViewHolder(parent.inflate(R.layout.item_user_guild))
         } else {
             GuildViewHolder(parent.inflate(R.layout.item_public_guild))
         }
-        return guildViewHolder
     }
 
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
@@ -51,19 +43,14 @@ class GuildListAdapter(private val onlyShowUsersGuilds: Boolean) : BaseRecyclerV
         if (onlyShowUsersGuilds && holder is UserGuildViewHolder) {
             holder.bind(guild)
         } else if (holder is GuildViewHolder) {
-            val isInGroup = isInGroup(guild)
-            holder.bind(guild, isInGroup)
+            holder.bind(guild)
             holder.itemView.tag = guild
         }
-        holder.itemView.setOnClickListener { v ->
+        holder.itemView.setOnClickListener {
             MainNavigationController.navigate(R.id.guildFragment, bundleOf(Pair("groupID", guild.id)))
         }
     }
 
-    private fun isInGroup(guild: Group): Boolean {
-        return this.memberGuildIDs.contains(guild.id)
-    }
-
     private var unfilteredData: OrderedRealmCollection<Group>? = null
 
     fun setUnfilteredData(data: OrderedRealmCollection<Group>?) {
@@ -120,7 +107,7 @@ class GuildListAdapter(private val onlyShowUsersGuilds: Boolean) : BaseRecyclerV
     class GuildViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
         val binding = ItemPublicGuildBinding.bind(itemView)
 
-        fun bind(guild: Group, isInGroup: Boolean) {
+        fun bind(guild: Group) {
             binding.nameTextView.text = guild.name
             val number = when {
                 guild.memberCount < 1000 -> 2
@@ -135,10 +122,10 @@ class GuildListAdapter(private val onlyShowUsersGuilds: Boolean) : BaseRecyclerV
             binding.guildBadgeView.setImageBitmap(HabiticaIconsHelper.imageOfGuildCrestSmall(guild.memberCount.toFloat()))
 
             binding.tagWrapper.removeAllViews()
-            guild.categories?.forEach {
+            guild.categories?.forEach { category ->
                 val textView = PillTextviewBinding.inflate(itemView.context.layoutInflater, binding.tagWrapper, true)
-                textView.root.text = it.name?.split("_")?.map { it.capitalize(Locale.getDefault()) }?.joinToString(" ")
-                textView.root.background = if (it.slug == "habitica_official") {
+                textView.root.text = category.name?.split("_")?.joinToString(" ") { it.capitalize(Locale.getDefault()) }
+                textView.root.background = if (category.slug == "habitica_official") {
                     textView.root.setTextColor(ContextCompat.getColor(itemView.context, R.color.white))
                     ContextCompat.getDrawable(itemView.context, R.drawable.pill_bg_purple_400)
                 } else {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt
index b5e55a0fe..c7a9764fd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt
@@ -204,36 +204,6 @@ class StatsFragment: BaseMainFragment<FragmentStatsBinding>() {
     }
 
     private fun updateStats(user: User) {
-        val levelStat = min((user.stats?.lvl ?: 0) / 2.0f, 50f).toInt()
-
-        totalStrength = levelStat
-        totalIntelligence = levelStat
-        totalConstitution = levelStat
-        totalPerception = levelStat
-
-        binding?.strengthStatsView?.levelValue = levelStat
-        binding?.intelligenceStatsView?.levelValue = levelStat
-        binding?.constitutionStatsView?.levelValue = levelStat
-        binding?.perceptionStatsView?.levelValue = levelStat
-
-        totalStrength += user.stats?.buffs?.str?.toInt() ?: 0
-        totalIntelligence += user.stats?.buffs?._int?.toInt() ?: 0
-        totalConstitution += user.stats?.buffs?.con?.toInt() ?: 0
-        totalPerception += user.stats?.buffs?.per?.toInt() ?: 0
-        binding?.strengthStatsView?.buffValue = user.stats?.buffs?.str?.toInt() ?: 0
-        binding?.intelligenceStatsView?.buffValue = user.stats?.buffs?._int?.toInt() ?: 0
-        binding?.constitutionStatsView?.buffValue = user.stats?.buffs?.con?.toInt() ?: 0
-        binding?.perceptionStatsView?.buffValue = user.stats?.buffs?.per?.toInt() ?: 0
-
-        totalStrength += user.stats?.strength ?: 0
-        totalIntelligence += user.stats?.intelligence ?: 0
-        totalConstitution += user.stats?.constitution ?: 0
-        totalPerception += user.stats?.per ?: 0
-        binding?.strengthStatsView?.allocatedValue = user.stats?.strength ?: 0
-        binding?.intelligenceStatsView?.allocatedValue = user.stats?.intelligence ?: 0
-        binding?.constitutionStatsView?.allocatedValue = user.stats?.constitution ?: 0
-        binding?.perceptionStatsView?.allocatedValue = user.stats?.per ?: 0
-
         val outfit = user.items?.gear?.equipped
         val outfitList = ArrayList<String>()
         outfit?.let { thisOutfit ->
@@ -249,35 +219,63 @@ class StatsFragment: BaseMainFragment<FragmentStatsBinding>() {
 
         compositeSubscription.add(inventoryRepository.getEquipment(outfitList).firstElement()
                 .retry(1)
-                .subscribe(Consumer {
-            val userStatComputer = UserStatComputer()
-            val statsRows = user?.let { it1 -> userStatComputer.computeClassBonus(it, it1) } ?: return@Consumer
+                .subscribe( {
+                    val levelStat = min((user.stats?.lvl ?: 0) / 2.0f, 50f).toInt()
 
-            var strength = 0
-            var intelligence = 0
-            var constitution = 0
-            var perception = 0
+                    totalStrength = levelStat
+                    totalIntelligence = levelStat
+                    totalConstitution = levelStat
+                    totalPerception = levelStat
 
-            for (row in statsRows) {
-                if (row.javaClass == UserStatComputer.AttributeRow::class.java) {
-                    val attributeRow = row as UserStatComputer.AttributeRow
-                    strength += attributeRow.strVal.toInt()
-                    intelligence += attributeRow.intVal.toInt()
-                    constitution += attributeRow.conVal.toInt()
-                    perception += attributeRow.perVal.toInt()
-                }
-            }
+                    binding?.strengthStatsView?.levelValue = levelStat
+                    binding?.intelligenceStatsView?.levelValue = levelStat
+                    binding?.constitutionStatsView?.levelValue = levelStat
+                    binding?.perceptionStatsView?.levelValue = levelStat
 
-            totalStrength += strength
-            totalIntelligence += intelligence
-            totalConstitution += constitution
-            totalPerception += perception
+                    totalStrength += user.stats?.buffs?.str?.toInt() ?: 0
+                    totalIntelligence += user.stats?.buffs?._int?.toInt() ?: 0
+                    totalConstitution += user.stats?.buffs?.con?.toInt() ?: 0
+                    totalPerception += user.stats?.buffs?.per?.toInt() ?: 0
+                    binding?.strengthStatsView?.buffValue = user.stats?.buffs?.str?.toInt() ?: 0
+                    binding?.intelligenceStatsView?.buffValue = user.stats?.buffs?._int?.toInt() ?: 0
+                    binding?.constitutionStatsView?.buffValue = user.stats?.buffs?.con?.toInt() ?: 0
+                    binding?.perceptionStatsView?.buffValue = user.stats?.buffs?.per?.toInt() ?: 0
+
+                    totalStrength += user.stats?.strength ?: 0
+                    totalIntelligence += user.stats?.intelligence ?: 0
+                    totalConstitution += user.stats?.constitution ?: 0
+                    totalPerception += user.stats?.per ?: 0
+                    binding?.strengthStatsView?.allocatedValue = user.stats?.strength ?: 0
+                    binding?.intelligenceStatsView?.allocatedValue = user.stats?.intelligence ?: 0
+                    binding?.constitutionStatsView?.allocatedValue = user.stats?.constitution ?: 0
+                    binding?.perceptionStatsView?.allocatedValue = user.stats?.per ?: 0
+                    val userStatComputer = UserStatComputer()
+                    val statsRows = userStatComputer.computeClassBonus(it, user)
+
+                    var strength = 0
+                    var intelligence = 0
+                    var constitution = 0
+                    var perception = 0
+
+                    for (row in statsRows) {
+                        if (row.javaClass == UserStatComputer.AttributeRow::class.java) {
+                            val attributeRow = row as UserStatComputer.AttributeRow
+                            strength += attributeRow.strVal.toInt()
+                            intelligence += attributeRow.intVal.toInt()
+                            constitution += attributeRow.conVal.toInt()
+                            perception += attributeRow.perVal.toInt()
+                        }
+                    }
+
+                    totalStrength += strength
+                    totalIntelligence += intelligence
+                    totalConstitution += constitution
+                    totalPerception += perception
                     binding?.strengthStatsView?.equipmentValue = strength
                     binding?.intelligenceStatsView?.equipmentValue = intelligence
                     binding?.constitutionStatsView?.equipmentValue = constitution
                     binding?.perceptionStatsView?.equipmentValue = perception
 
-        }, RxErrorHandler.handleEmptyError()))
+                }, RxErrorHandler.handleEmptyError()))
     }
-
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt
index 68170e97c..2a0eaa97c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt
@@ -49,7 +49,7 @@ class AvatarCustomizationFragment : BaseMainFragment<FragmentRecyclerviewBinding
                         userRepository.unlockPath(user, customization)
                                 .flatMap { userRepository.retrieveUser(false, true, true) }
                     } else {
-                        userRepository.useCustomization(user, customization.type ?: "", customization.category, customization.identifier ?: "")
+                        userRepository.useCustomization(customization.type ?: "", customization.category, customization.identifier ?: "")
                     }
                 }
                 .subscribe({ }, RxErrorHandler.handleEmptyError()))
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AuthenticationPreferenceFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AuthenticationPreferenceFragment.kt
index c8e96746c..03c44b056 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AuthenticationPreferenceFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AuthenticationPreferenceFragment.kt
@@ -1,6 +1,5 @@
 package com.habitrpg.android.habitica.ui.fragments.preferences
 
-import android.app.ProgressDialog
 import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
@@ -24,6 +23,7 @@ import com.habitrpg.android.habitica.helpers.MainNavigationController
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.user.User
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
+import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaProgressDialog
 import com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionDetailsView
 import javax.inject.Inject
 
@@ -225,13 +225,12 @@ class AuthenticationPreferenceFragment: BasePreferencesFragment() {
     }
 
     private fun deleteAccount(password: String) {
-        @Suppress("DEPRECATION")
-        val dialog = ProgressDialog.show(context, context?.getString(R.string.deleting_account), null, true)
+        val dialog = HabiticaProgressDialog.show(context, R.string.deleting_account)
         compositeSubscription.add(userRepository.deleteAccount(password).subscribe({ _ ->
             context?.let { HabiticaBaseApplication.logout(it) }
             activity?.finish()
         }) { throwable ->
-            dialog.dismiss()
+            dialog?.dismiss()
             RxErrorHandler.reportError(throwable)
         })
     }
@@ -264,10 +263,9 @@ class AuthenticationPreferenceFragment: BasePreferencesFragment() {
     }
 
     private fun resetAccount() {
-        @Suppress("DEPRECATION")
-        val dialog = ProgressDialog.show(context, context?.getString(R.string.resetting_account), null, true)
-        compositeSubscription.add(userRepository.resetAccount().subscribe({ dialog.dismiss() }) { throwable ->
-            dialog.dismiss()
+        val dialog = HabiticaProgressDialog.show(context, R.string.resetting_account)
+        compositeSubscription.add(userRepository.resetAccount().subscribe({ dialog?.dismiss() }) { throwable ->
+            dialog?.dismiss()
             RxErrorHandler.reportError(throwable)
         })
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.kt
index c7c9962b6..906894033 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.kt
@@ -150,9 +150,9 @@ class SkillsFragment : BaseMainFragment<FragmentSkillsBinding>() {
             return
         }
         val observable: Flowable<SkillResponse> = if (taskId != null) {
-            userRepository.useSkill(user, skill.key, skill.target, taskId)
+            userRepository.useSkill(skill.key, skill.target, taskId)
         } else {
-            userRepository.useSkill(user, skill.key, skill.target)
+            userRepository.useSkill(skill.key, skill.target)
         }
         compositeSubscription.add(observable.subscribe({ skillResponse -> this.displaySkillResult(skill, skillResponse) },
                 RxErrorHandler.handleEmptyError()))
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildListFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildListFragment.kt
index 789a41fe5..92002899e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildListFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildListFragment.kt
@@ -17,18 +17,19 @@ import com.habitrpg.android.habitica.ui.helpers.KeyboardUtil
 import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
 import javax.inject.Inject
 
-class GuildListFragment(val onlyShowUsersGuilds: Boolean) : BaseFragment<FragmentGuildListBinding>(), SearchView.OnQueryTextListener, SwipeRefreshLayout.OnRefreshListener {
+class GuildListFragment : BaseFragment<FragmentGuildListBinding>(), SearchView.OnQueryTextListener, SwipeRefreshLayout.OnRefreshListener {
 
     @Inject
     lateinit var socialRepository: SocialRepository
 
     override var binding: FragmentGuildListBinding? = null
+    var onlyShowUsersGuilds: Boolean = false
 
     override fun createBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentGuildListBinding {
         return FragmentGuildListBinding.inflate(inflater, container, false)
     }
 
-    private var viewAdapter = GuildListAdapter(onlyShowUsersGuilds)
+    private var viewAdapter = GuildListAdapter()
 
     override fun injectFragment(component: UserComponent) {
         component.inject(this)
@@ -38,15 +39,13 @@ class GuildListFragment(val onlyShowUsersGuilds: Boolean) : BaseFragment<Fragmen
         super.onViewCreated(view, savedInstanceState)
 
         binding?.recyclerView?.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(activity)
-        compositeSubscription.add(socialRepository.getGroupMemberships()
-                .map { it.map { membership -> membership.groupID } }
-                .subscribeWithErrorHandler { viewAdapter.setMemberGuildIDs(it) })
         viewAdapter.socialRepository = socialRepository
         binding?.recyclerView?.adapter = viewAdapter
         binding?.recyclerView?.itemAnimator = SafeDefaultItemAnimator()
 
         binding?.refreshLayout?.setOnRefreshListener(this)
 
+        viewAdapter.onlyShowUsersGuilds = onlyShowUsersGuilds
         if (onlyShowUsersGuilds) {
             compositeSubscription.add(socialRepository.getUserGroups("guild").subscribe({ viewAdapter.setUnfilteredData(it) }, RxErrorHandler.handleEmptyError()))
         } else {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildOverviewFragment.kt
index 202fc8cd1..1c773b9f9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildOverviewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/guilds/GuildOverviewFragment.kt
@@ -32,8 +32,8 @@ class GuildOverviewFragment : BaseMainFragment<FragmentViewpagerBinding>(), Sear
     }
 
     private var statePagerAdapter: FragmentStatePagerAdapter? = null
-    private var userGuildsFragment: GuildListFragment? = GuildListFragment(true)
-    private var publicGuildsFragment: GuildListFragment? = GuildListFragment(false)
+    private var userGuildsFragment: GuildListFragment? = GuildListFragment()
+    private var publicGuildsFragment: GuildListFragment? = GuildListFragment()
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
@@ -111,8 +111,10 @@ class GuildOverviewFragment : BaseMainFragment<FragmentViewpagerBinding>(), Sear
 
             override fun getItem(position: Int): Fragment {
                 return if (position == 0) {
+                    userGuildsFragment?.onlyShowUsersGuilds = true
                     userGuildsFragment
                 } else {
+                    userGuildsFragment?.onlyShowUsersGuilds = false
                     publicGuildsFragment
                 } ?: Fragment()
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/NoPartyFragmentFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/NoPartyFragmentFragment.kt
index df579880a..d016aa122 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/NoPartyFragmentFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/NoPartyFragmentFragment.kt
@@ -155,7 +155,9 @@ class NoPartyFragmentFragment : BaseMainFragment<FragmentNoPartyBinding>() {
                                     userRepository.retrieveUser(false)
                                 }
                                 .subscribe({
-                                    fragmentManager?.popBackStack()
+                                    if (isAdded) {
+                                        parentFragmentManager.popBackStack()
+                                    }
                                     MainNavigationController.navigate(R.id.partyFragment,
                                             bundleOf(Pair("partyID", user?.party?.id)))
                                 }, RxErrorHandler.handleEmptyError())
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt
index 7adf2cc55..a89cdb403 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/RewardsRecyclerviewFragment.kt
@@ -103,8 +103,7 @@ class RewardsRecyclerviewFragment : TaskRecyclerViewFragment() {
             when (requestCode) {
                 11 -> {
                     if (resultCode == Activity.RESULT_OK) {
-                        userRepository.useSkill(null,
-                                selectedCard?.key ?: "",
+                        userRepository.useSkill(selectedCard?.key ?: "",
                                 "member",
                                 data.getStringExtra("member_id") ?: "")
                                 .subscribeWithErrorHandler(Consumer {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt
index 9619c64cc..cb8543b94 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt
@@ -160,7 +160,7 @@ class TasksFragment : BaseMainFragment<FragmentViewpagerBinding>(), SearchView.O
 
     private fun showFilterDialog() {
         context?.let {
-            var disposable: Disposable? = null
+            var disposable: Disposable
             val dialog = TaskFilterDialog(it, HabiticaBaseApplication.userComponent)
             disposable = tagRepository.getTags().subscribe({ tagsList -> dialog.setTags(tagsList)}, RxErrorHandler.handleEmptyError())
             dialog.setActiveTags(taskFilterHelper.tags)
@@ -184,7 +184,7 @@ class TasksFragment : BaseMainFragment<FragmentViewpagerBinding>(), SearchView.O
                 }
             })
             dialog.setOnDismissListener {
-                if (disposable?.isDisposed == false) {
+                if (!disposable.isDisposed) {
                     disposable.dispose()
                 }
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TeamBoardFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TeamBoardFragment.kt
index e06687468..feb7e923d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TeamBoardFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TeamBoardFragment.kt
@@ -173,7 +173,7 @@ class TeamBoardFragment : BaseMainFragment<FragmentViewpagerBinding>(), SearchVi
 
     private fun showFilterDialog() {
         context?.let {
-            var disposable: Disposable? = null
+            val disposable: Disposable
             val dialog = TaskFilterDialog(it, HabiticaBaseApplication.userComponent)
             disposable = tagRepository.getTags().subscribe({ tagsList -> dialog.setTags(tagsList)}, RxErrorHandler.handleEmptyError())
             dialog.setActiveTags(taskFilterHelper.tags)
@@ -197,7 +197,7 @@ class TeamBoardFragment : BaseMainFragment<FragmentViewpagerBinding>(), SearchVi
                 }
             })
             dialog.setOnDismissListener {
-                if (disposable?.isDisposed == false) {
+                if (!disposable.isDisposed) {
                     disposable.dispose()
                 }
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/AutocompleteAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/AutocompleteAdapter.kt
index 5b7916fbc..f7e067b70 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/AutocompleteAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/AutocompleteAdapter.kt
@@ -15,10 +15,7 @@ import com.habitrpg.android.habitica.models.social.ChatMessage
 import com.habitrpg.android.habitica.models.social.FindUsernameResult
 import com.habitrpg.android.habitica.models.user.Authentication
 import com.habitrpg.android.habitica.models.user.Profile
-import com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
 import com.habitrpg.android.habitica.ui.views.social.UsernameLabel
-import com.habitrpg.android.habitica.ui.helpers.EmojiMap
-import com.habitrpg.android.habitica.ui.helpers.EmojiParser
 import java.util.*
 
 class AutocompleteAdapter(val context: Context, val socialRepository: SocialRepository? = null, var autocompleteContext: String? = null, var groupID: String? = null, val remoteAutocomplete: Boolean = false) : BaseAdapter(), Filterable {
@@ -97,8 +94,7 @@ class AutocompleteAdapter(val context: Context, val socialRepository: SocialRepo
         } else {
             val view = parent?.inflate(R.layout.autocomplete_emoji)
             val result = getItem(position) as? String
-            val emojiTextView = view?.findViewById<HabiticaEmojiTextView>(R.id.emoji_textview)
-            //emojiTextView?.setEmojiconSize(24.dpToPx(context))
+            val emojiTextView = view?.findViewById<TextView>(R.id.emoji_textview)
             emojiTextView?.text = EmojiParser.parseEmojis(result)
             view?.findViewById<TextView>(R.id.label)?.text = result
             view
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.kt
index f37c21136..0f0552b5b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.kt
@@ -83,7 +83,7 @@ object DataBindingUtils {
             }
 
             override fun onFailureImpl(dataSource: DataSource<CloseableReference<CloseableImage>>) {
-                dataSource?.close()
+                dataSource.close()
             }
         }, CallerThreadExecutor.getInstance())
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarginDecoration.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarginDecoration.kt
index ea972706a..6e86a2845 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarginDecoration.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarginDecoration.kt
@@ -6,9 +6,8 @@ import android.view.View
 import androidx.recyclerview.widget.RecyclerView
 import com.habitrpg.android.habitica.R
 
-class MarginDecoration(context: Context?, noMarginViewTypes: Set<Int> = setOf()) : RecyclerView.ItemDecoration() {
+class MarginDecoration(context: Context?, private var noMarginViewTypes: Set<Int> = setOf()) : RecyclerView.ItemDecoration() {
     private val margin: Int = context?.resources?.getDimensionPixelSize(R.dimen.grid_item_margin) ?: 0
-    private var noMarginViewTypes = noMarginViewTypes
 
     override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) {
         val position = parent.getChildAdapterPosition(view)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.kt
index 352cc1ba3..fffd5ed39 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.kt
@@ -2,7 +2,6 @@ package com.habitrpg.android.habitica.ui.viewHolders.tasks
 
 import android.content.Context
 import android.graphics.PorterDuff
-import android.graphics.drawable.BitmapDrawable
 import android.view.*
 import android.widget.*
 import androidx.core.content.ContextCompat
@@ -17,8 +16,6 @@ import com.habitrpg.android.habitica.models.tasks.ChecklistItem
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.ui.helpers.MarkdownParser
 import com.habitrpg.android.habitica.ui.helpers.setParsedMarkdown
-import com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
-import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.schedulers.Schedulers
@@ -106,7 +103,7 @@ abstract class ChecklistedViewHolder(itemView: View, scoreTaskFunc: ((Task, Task
                     } else {
                         R.color.checkbox_fill
                     }) ?: R.color.checkbox_fill)
-                    val textView = itemView?.findViewById<HabiticaEmojiTextView>(R.id.checkedTextView)
+                    val textView = itemView?.findViewById<TextView>(R.id.checkedTextView)
                     // Populate the data into the template view using the data object
                     textView?.text = item.text
                     textView?.setTextColor(ContextCompat.getColor(context, if (item.completed) R.color.text_dimmed else R.color.text_secondary))
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/DailyViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/DailyViewHolder.kt
index f9e19956f..fb6160e3b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/DailyViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/DailyViewHolder.kt
@@ -18,33 +18,33 @@ class DailyViewHolder(itemView: View, scoreTaskFunc: ((Task, TaskDirection) -> U
             return isVisible
         }
 
-    override fun bind(newTask: Task, position: Int, displayMode: String) {
-        this.task = newTask
-        setChecklistIndicatorBackgroundActive(newTask.isChecklistDisplayActive)
+    override fun bind(data: Task, position: Int, displayMode: String) {
+        this.task = data
+        setChecklistIndicatorBackgroundActive(data.isChecklistDisplayActive)
 
-        if (newTask.reminders?.size == 0) {
+        if (data.reminders?.size == 0) {
             reminderTextView.visibility = View.GONE
         } else {
             reminderTextView.visibility = View.VISIBLE
             val now = Date()
             val calendar = Calendar.getInstance()
-            val nextReminder = newTask.reminders?.firstOrNull {
+            val nextReminder = data.reminders?.firstOrNull {
                 calendar.time = now
                 calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DATE), it.time?.hours ?: 0, it.time?.minutes ?: 0, 0)
                 now < calendar.time
-            } ?: newTask.reminders?.first()
+            } ?: data.reminders?.first()
 
             var reminderString = ""
             if (nextReminder?.time != null) {
                 reminderString += formatter.format(nextReminder.time)
             }
-            if ((newTask.reminders?.size ?: 0) > 1) {
-                reminderString = "$reminderString (+${(newTask.reminders?.size ?: 0)-1})"
+            if ((data.reminders?.size ?: 0) > 1) {
+                reminderString = "$reminderString (+${(data.reminders?.size ?: 0)-1})"
             }
             reminderTextView.text = reminderString
         }
 
-        super.bind(newTask, position, displayMode)
+        super.bind(data, position, displayMode)
     }
 
     override fun shouldDisplayAsActive(newTask: Task?): Boolean {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/TodoViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/TodoViewHolder.kt
index 8dfbf14d3..c6ba11ca4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/TodoViewHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/TodoViewHolder.kt
@@ -12,12 +12,12 @@ class TodoViewHolder(itemView: View, scoreTaskFunc: ((Task, TaskDirection) -> Un
 
     private val dateFormatter: DateFormat = android.text.format.DateFormat.getDateFormat(context)
 
-    override fun bind(newTask: Task, position: Int, displayMode: String) {
-        this.task = newTask
-        setChecklistIndicatorBackgroundActive(newTask.isChecklistDisplayActive)
+    override fun bind(data: Task, position: Int, displayMode: String) {
+        this.task = data
+        setChecklistIndicatorBackgroundActive(data.isChecklistDisplayActive)
         reminderTextView.visibility = View.GONE
         this.streakTextView.visibility = View.GONE
-        super.bind(newTask, position, displayMode)
+        super.bind(data, position, displayMode)
     }
 
     override fun configureSpecialTaskTextView(task: Task) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/DragLinearLayout.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/DragLinearLayout.kt
index 042f80630..f8f186784 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/DragLinearLayout.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/DragLinearLayout.kt
@@ -200,34 +200,6 @@ open class DragLinearLayout @JvmOverloads constructor(context: Context, attrs: A
         super.setOrientation(orientation)
     }
 
-    /**
-     * Calls [.addView] followed by [.setViewDraggable].
-     */
-    fun addDragView(child: View, dragHandle: View) {
-        addView(child)
-        setViewDraggable(child, dragHandle)
-    }
-
-    /**
-     * Calls [.addView] followed by
-     * [.setViewDraggable] and correctly updates the
-     * drag-ability state of all existing views.
-     */
-    fun addDragView(child: View, dragHandle: View, index: Int) {
-        addView(child, index)
-
-        // update drag-able children mappings
-        val numMappings = draggableChildren.size()
-        for (i in numMappings - 1 downTo 0) {
-            val key = draggableChildren.keyAt(i)
-            if (key >= index) {
-                draggableChildren.put(key + 1, draggableChildren.get(key))
-            }
-        }
-
-        setViewDraggable(child, dragHandle)
-    }
-
     /**
      * Makes the child a candidate for dragging. Must be an existing child of this layout.
      */
@@ -250,44 +222,11 @@ open class DragLinearLayout @JvmOverloads constructor(context: Context, attrs: A
         }
     }
 
-    /**
-     * Calls [.removeView] and correctly updates the drag-ability state of
-     * all remaining views.
-     */
-    fun removeDragView(child: View) {
-        if (this === child.parent) {
-            val index = indexOfChild(child)
-            removeView(child)
-
-            // update drag-able children mappings
-            val mappings = draggableChildren.size()
-            for (i in 0 until mappings) {
-                val key = draggableChildren.keyAt(i)
-                if (key >= index) {
-                    val next = draggableChildren.get(key + 1)
-                    if (null == next) {
-                        draggableChildren.delete(key)
-                    } else {
-                        draggableChildren.put(key, next)
-                    }
-                }
-            }
-        }
-    }
-
     override fun removeAllViews() {
         super.removeAllViews()
         draggableChildren.clear()
     }
 
-    /**
-     * If this layout is within a [android.widget.ScrollView], register it here so that it
-     * can be scrolled during item drags.
-     */
-    fun setContainerScrollView(scrollView: ScrollView) {
-        this.containerScrollView = scrollView
-    }
-
     /**
      * See [com.habitrpg.android.habitica.ui.views.DragLinearLayout.OnViewSwapListener].
      */
@@ -598,7 +537,7 @@ open class DragLinearLayout @JvmOverloads constructor(context: Context, attrs: A
     }
 
     override fun onTouchEvent(event: MotionEvent): Boolean {
-        when (MotionEventCompat.getActionMasked(event)) {
+        when (event.actionMasked) {
             MotionEvent.ACTION_DOWN -> {
                 if (!draggedItem.detecting || draggedItem.settling()) return false
                 startDrag()
@@ -609,7 +548,7 @@ open class DragLinearLayout @JvmOverloads constructor(context: Context, attrs: A
                 if (INVALID_POINTER_ID == activePointerId) return false
 
                 val pointerIndex = event.findPointerIndex(activePointerId)
-                val lastEventY = MotionEventCompat.getY(event, pointerIndex).toInt()
+                val lastEventY = event.getY(pointerIndex).toInt()
                 val deltaY = lastEventY - downY
 
                 onDrag(deltaY)
@@ -617,8 +556,8 @@ open class DragLinearLayout @JvmOverloads constructor(context: Context, attrs: A
             }
             MotionEvent.ACTION_POINTER_UP -> {
                 run {
-                    val pointerIndex = MotionEventCompat.getActionIndex(event)
-                    val pointerId = MotionEventCompat.getPointerId(event, pointerIndex)
+                    val pointerIndex = event.actionIndex
+                    val pointerId = event.getPointerId(pointerIndex)
 
                     if (pointerId != activePointerId)
                         return false // if active pointer, fall through and cancel!
@@ -655,7 +594,8 @@ open class DragLinearLayout @JvmOverloads constructor(context: Context, attrs: A
     private inner class DragHandleOnTouchListener(private val view: View) : OnTouchListener {
 
         override fun onTouch(v: View, event: MotionEvent): Boolean {
-            if (MotionEvent.ACTION_DOWN == MotionEventCompat.getActionMasked(event)) {
+            view.performClick()
+            if (MotionEvent.ACTION_DOWN == event.actionMasked) {
                 startDetectingDrag(view)
             }
             return false
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/EllipsisTextView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/EllipsisTextView.kt
index 2842b3002..2d4caaa49 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/EllipsisTextView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/EllipsisTextView.kt
@@ -16,8 +16,9 @@ package com.habitrpg.android.habitica.ui.views
 
 import android.content.Context
 import android.util.AttributeSet
+import androidx.appcompat.widget.AppCompatTextView
 
-class EllipsisTextView : HabiticaEmojiTextView {
+class EllipsisTextView : AppCompatTextView {
 
     private val ellipsesListeners = ArrayList<EllipsisListener>()
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaEmojiTextView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaEmojiTextView.kt
deleted file mode 100644
index 949c6d712..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaEmojiTextView.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.habitrpg.android.habitica.ui.views
-
-import android.content.Context
-import android.util.AttributeSet
-import androidx.appcompat.widget.AppCompatTextView
-
-open class HabiticaEmojiTextView : AppCompatTextView {
-
-    constructor(context: Context) : super(context)
-
-    constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
-
-    constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super(context, attrs, defStyle)
-}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaProgressBar.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaProgressBar.kt
index 713706086..4e5fb59c8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaProgressBar.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaProgressBar.kt
@@ -9,7 +9,6 @@ import android.view.View
 import android.widget.FrameLayout
 import android.widget.ImageView
 import android.widget.LinearLayout
-import androidx.core.content.ContextCompat
 import androidx.core.widget.ImageViewCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.ProgressBarBinding
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaSnackbar.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaSnackbar.kt
index 1a3333ae8..1f7f14724 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaSnackbar.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaSnackbar.kt
@@ -79,8 +79,9 @@ private constructor(parent: ViewGroup, content: View, callback: ContentViewCallb
         return this
     }
 
-    private class ContentViewCallback(private val content: View) : BaseTransientBottomBar.ContentViewCallback {
+    private class ContentViewCallback(private val content: View) : com.google.android.material.snackbar.ContentViewCallback {
 
+        @Suppress("SameParameterValue")
         override fun animateContentIn(delay: Int, duration: Int) {
             content.scaleY = 0f
             content.scaleX = 0f
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/Typewriter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/Typewriter.kt
index 5b0f453cd..34dce71ce 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/Typewriter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/Typewriter.kt
@@ -2,7 +2,6 @@ package com.habitrpg.android.habitica.ui.views
 
 
 import android.content.Context
-import android.os.Handler
 import androidx.core.content.ContextCompat
 import android.text.Spannable
 import android.text.SpannableStringBuilder
@@ -10,9 +9,11 @@ import android.text.style.ForegroundColorSpan
 import android.util.AttributeSet
 
 import com.habitrpg.android.habitica.R
+import kotlinx.coroutines.*
 
 // http://stackoverflow.com/a/6700718/1315039
 class Typewriter : androidx.appcompat.widget.AppCompatTextView {
+    private var job: Job? = null
 
     private var stringBuilder: SpannableStringBuilder? = null
     private var visibleSpan: Any? = null
@@ -20,17 +21,6 @@ class Typewriter : androidx.appcompat.widget.AppCompatTextView {
     private var index: Int = 0
     private var delay: Long = 30
 
-    private val textHandler = Handler()
-    private val characterAdder = object : Runnable {
-        override fun run() {
-            stringBuilder?.setSpan(visibleSpan, 0, index++, Spannable.SPAN_INCLUSIVE_INCLUSIVE)
-            text = stringBuilder
-            if (index <= stringBuilder?.length ?: 0) {
-                textHandler.postDelayed(this, delay)
-            }
-        }
-    }
-
     val isAnimating: Boolean
         get() = index < stringBuilder?.length ?: 0
 
@@ -43,6 +33,11 @@ class Typewriter : androidx.appcompat.widget.AppCompatTextView {
         setupTextColors(context)
     }
 
+    override fun onDetachedFromWindow() {
+        job?.cancel()
+        super.onDetachedFromWindow()
+    }
+
     private fun setupTextColors(context: Context) {
         visibleSpan = ForegroundColorSpan(ContextCompat.getColor(context, R.color.text_primary))
         hiddenSpan = ForegroundColorSpan(ContextCompat.getColor(context, R.color.transparent))
@@ -54,12 +49,14 @@ class Typewriter : androidx.appcompat.widget.AppCompatTextView {
         index = 0
 
         setText(stringBuilder)
-        textHandler.removeCallbacks(characterAdder)
-        textHandler.postDelayed(characterAdder, delay)
-    }
-
-    fun setCharacterDelay(millis: Long) {
-        delay = millis
+        job?.cancel()
+        job = GlobalScope.launch(Dispatchers.Main) {
+            while (index <= stringBuilder?.length ?: 0) {
+                stringBuilder?.setSpan(visibleSpan, 0, index++, Spannable.SPAN_INCLUSIVE_INCLUSIVE)
+                setText(stringBuilder)
+                delay(delay)
+            }
+        }
     }
 
     fun stopTextAnimation() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/WrapContentDraweeView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/WrapContentDraweeView.kt
index 25bb4e5c0..09d5a6513 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/WrapContentDraweeView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/WrapContentDraweeView.kt
@@ -15,11 +15,9 @@ class WrapContentDraweeView : SimpleDraweeView {
     // we set a listener and update the view's aspect ratio depending on the loaded image
     private val listener = object : BaseControllerListener<ImageInfo>() {
         override fun onIntermediateImageSet(id: String?, imageInfo: ImageInfo?) {
-            updateViewSize(imageInfo)
         }
 
         override fun onFinalImageSet(id: String?, imageInfo: ImageInfo?, animatable: Animatable?) {
-            updateViewSize(imageInfo)
         }
     }
 
@@ -40,8 +38,4 @@ class WrapContentDraweeView : SimpleDraweeView {
                 .build()
         setController(controller)
     }
-
-    internal fun updateViewSize(imageInfo: ImageInfo?) {
-
-    }
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/HabiticaProgressDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/HabiticaProgressDialog.kt
new file mode 100644
index 000000000..781083c84
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/HabiticaProgressDialog.kt
@@ -0,0 +1,22 @@
+package com.habitrpg.android.habitica.ui.views.dialogs
+
+import android.content.Context
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.extensions.dpToPx
+
+class HabiticaProgressDialog(context: Context) : HabiticaAlertDialog(context) {
+    companion object {
+        fun show(context: Context?, titleID: Int): HabiticaProgressDialog? {
+            return show(context, context?.getString(titleID))
+        }
+
+        fun show(context: Context?, title: String?): HabiticaProgressDialog? {
+            val dialog = context?.let { HabiticaProgressDialog(it) }
+            context?.let { dialog?.setAdditionalContentView(R.layout.circular_progress) }
+            dialog?.dialogWidth = 150.dpToPx(context)
+            dialog?.setTitle(title)
+            dialog?.enqueue()
+            return dialog
+        }
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/QuestCompletedDialogContent.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/QuestCompletedDialogContent.kt
index 2ece0fe4c..d1f4023ed 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/QuestCompletedDialogContent.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/QuestCompletedDialogContent.kt
@@ -48,12 +48,12 @@ class QuestCompletedDialogContent : LinearLayout {
 
         if (questContent.drop != null && questContent.drop?.items != null) {
             questContent.drop?.items
-                    ?.filterNot { it.isOnlyOwner }
+                    ?.filterNot { it.onlyOwner }
                     ?.forEach { addRewardsRow(inflater, it, binding.rewardsList) }
 
             var hasOwnerRewards = false
             for (item in questContent.drop?.items ?: emptyList<QuestDropItem>()) {
-                if (item.isOnlyOwner) {
+                if (item.onlyOwner) {
                     addRewardsRow(inflater, item, binding.ownerRewardsList)
                     hasOwnerRewards = true
                 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/HabiticaBottomNavigationView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/HabiticaBottomNavigationView.kt
index b25498494..b19922156 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/HabiticaBottomNavigationView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/HabiticaBottomNavigationView.kt
@@ -95,7 +95,7 @@ class HabiticaBottomNavigationView @JvmOverloads constructor(
             animateButtonTap()
             true
         }
-        binding.addButton.setOnTouchListener { view, event ->
+        binding.addButton.setOnTouchListener { _, event ->
             if (event.action == MotionEvent.ACTION_DOWN) {
                 val animX = ObjectAnimator.ofFloat(binding.addButton, "scaleX", 1f, 1.1f)
                 animX.duration = 100
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
index 2519494df..bfd3b804b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
@@ -310,7 +310,7 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
         } else if (shopItem.purchaseType == "quests" && shopItem.currency == "gold") {
             observable = inventoryRepository.purchaseQuest(shopItem.key).cast(Any::class.java)
         } else if (shopItem.purchaseType == "debuffPotion") {
-            observable = userRepository.useSkill(user, shopItem.key, null).cast(Any::class.java)
+            observable = userRepository.useSkill(shopItem.key, null).cast(Any::class.java)
         } else if (shopItem.purchaseType == "card") {
             purchaseCardAction?.invoke(shopItem)
             dismiss()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogQuestContent.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogQuestContent.kt
index 7ff929403..612be8a1c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogQuestContent.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialogQuestContent.kt
@@ -49,12 +49,12 @@ class PurchaseDialogQuestContent(context: Context) : PurchaseDialogContent(conte
 
         if (questContent.drop != null && questContent.drop?.items != null) {
             questContent.drop?.items
-                    ?.filterNot { it.isOnlyOwner }
+                    ?.filterNot { it.onlyOwner }
                     ?.forEach { addRewardsRow(inflater, it, binding.rewardsList) }
 
             var hasOwnerRewards = false
             for (item in questContent.drop?.items ?: emptyList<QuestDropItem>()) {
-                if (item.isOnlyOwner) {
+                if (item.onlyOwner) {
                     addRewardsRow(inflater, item, binding.ownerRewardsList)
                     hasOwnerRewards = true
                 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/InvitationsView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/InvitationsView.kt
index 22baf82af..8f3b4fc48 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/InvitationsView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/InvitationsView.kt
@@ -16,7 +16,6 @@ class InvitationsView @JvmOverloads constructor(
     var setLeader: ((String) -> Unit)? = null
     var leaderID: String? = null
     var groupName: String? = null
-    var leaderName: String? = null
 
     init {
         orientation = VERTICAL
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/BulkAllocateStatsDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/BulkAllocateStatsDialog.kt
index 735d79982..1f10be678 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/BulkAllocateStatsDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/BulkAllocateStatsDialog.kt
@@ -1,6 +1,6 @@
 package com.habitrpg.android.habitica.ui.views.stats
 
-import android.app.ProgressDialog
+import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Bundle
 import androidx.appcompat.app.AlertDialog
@@ -12,7 +12,6 @@ import com.habitrpg.android.habitica.databinding.DialogBulkAllocateBinding
 import com.habitrpg.android.habitica.extensions.getThemeColor
 import com.habitrpg.android.habitica.extensions.layoutInflater
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
-import com.habitrpg.android.habitica.models.user.User
 import io.reactivex.rxjava3.disposables.Disposable
 import javax.inject.Inject
 
@@ -43,16 +42,6 @@ class BulkAllocateStatsDialog(context: Context, component: UserComponent?) : Ale
         binding.perceptionSliderView.maxValue = pointsToAllocate
     }
 
-    private var user: User? = null
-    set(value) {
-        field = value
-        pointsToAllocate = user?.stats?.points ?: 0
-        binding.strengthSliderView.previousValue = user?.stats?.strength ?: 0
-        binding.intelligenceSliderView.previousValue = user?.stats?.intelligence ?: 0
-        binding.constitutionSliderView.previousValue = user?.stats?.constitution ?: 0
-        binding.perceptionSliderView.previousValue = user?.stats?.per ?: 0
-    }
-
     init {
         component?.inject(this)
 
@@ -66,18 +55,15 @@ class BulkAllocateStatsDialog(context: Context, component: UserComponent?) : Ale
     }
 
     private fun saveChanges() {
-        @Suppress("DEPRECATION")
-        val progressDialog = ProgressDialog.show(context, context.getString(R.string.allocating_points), null, true)
-        userRepository.bulkAllocatePoints(user, binding.strengthSliderView.currentValue,
+        getButton(BUTTON_POSITIVE).isEnabled = false
+        userRepository.bulkAllocatePoints(binding.strengthSliderView.currentValue,
                 binding.intelligenceSliderView.currentValue,
                 binding.constitutionSliderView.currentValue,
                 binding.perceptionSliderView.currentValue)
                 .subscribe({
-                    progressDialog.dismiss()
                     this.dismiss()
                 }, {
                     RxErrorHandler.reportError(it)
-                    progressDialog.dismiss()
                     this.dismiss()
                 })
     }
@@ -85,7 +71,11 @@ class BulkAllocateStatsDialog(context: Context, component: UserComponent?) : Ale
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         subscription = userRepository.getUser().subscribe({
-            user = it
+            pointsToAllocate = it.stats?.points ?: 0
+            binding.strengthSliderView.previousValue = it.stats?.strength ?: 0
+            binding.intelligenceSliderView.previousValue = it.stats?.intelligence ?: 0
+            binding.constitutionSliderView.previousValue = it.stats?.constitution ?: 0
+            binding.perceptionSliderView.previousValue = it.stats?.per ?: 0
         }, RxErrorHandler.handleEmptyError())
 
         binding.strengthSliderView.allocateAction = {
@@ -141,6 +131,7 @@ class BulkAllocateStatsDialog(context: Context, component: UserComponent?) : Ale
         super.dismiss()
     }
 
+    @SuppressLint("SetTextI18n")
     private fun updateTitle() {
         binding.allocatedTitle.text = "$allocatedPoints/$pointsToAllocate"
         if (allocatedPoints > 0) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.kt
index 81d9777d0..1e9b05e47 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/yesterdailies/YesterdailyDialog.kt
@@ -2,7 +2,6 @@ package com.habitrpg.android.habitica.ui.views.yesterdailies
 
 import android.app.Activity
 import android.content.Context
-import android.graphics.PorterDuff
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -19,11 +18,9 @@ import com.habitrpg.android.habitica.helpers.AmplitudeManager
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.tasks.ChecklistItem
 import com.habitrpg.android.habitica.models.tasks.Task
-import com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
 import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
 import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
-import io.reactivex.rxjava3.functions.Consumer
 import java.util.*
 import java.util.concurrent.TimeUnit
 import kotlin.math.abs
@@ -156,7 +153,7 @@ class YesterdailyDialog private constructor(context: Context, private val userRe
             checkboxBackground.setBackgroundResource(R.drawable.daily_unchecked)
         }
 
-        val emojiView = taskView.findViewById<View>(R.id.text_view) as? HabiticaEmojiTextView
+        val emojiView = taskView.findViewById<TextView>(R.id.text_view)
         emojiView?.text = task.markdownText { emojiView?.text = it }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/BaseWidgetProvider.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/BaseWidgetProvider.kt
index 9194e713a..6084cdef4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/BaseWidgetProvider.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/BaseWidgetProvider.kt
@@ -66,7 +66,7 @@ abstract class BaseWidgetProvider : AppWidgetProvider() {
 
     protected fun showToastForTaskDirection(context: Context, data: TaskScoringResult?) {
         if (data != null) {
-            val pair = NotifyUserUseCase.getNotificationAndAddStatsToUserAsText(context, data.experienceDelta!!, data.healthDelta!!, data.goldDelta!!, data.manaDelta!!)
+            val pair = NotifyUserUseCase.getNotificationAndAddStatsToUserAsText(data.experienceDelta!!, data.healthDelta!!, data.goldDelta!!, data.manaDelta!!)
             val toast = Toast.makeText(context, pair.first, Toast.LENGTH_LONG)
             toast.show()
         }
diff --git a/Habitica/staff/release/output-metadata.json b/Habitica/staff/release/output-metadata.json
index 55c3bd572..515469728 100644
--- a/Habitica/staff/release/output-metadata.json
+++ b/Habitica/staff/release/output-metadata.json
@@ -10,8 +10,8 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 2828,
-      "versionName": "3.2",
+      "versionCode": 2835,
+      "versionName": "3.2.1",
       "outputFile": "Habitica-staff-release.apk"
     }
   ]