diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index af0505627..5d92c5312 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -149,7 +149,7 @@ android {
         buildConfigField "String", "TESTING_LEVEL", "\"production\""
         multiDexEnabled true
 
-        versionCode 2190
+        versionCode 2194
         versionName "2.1"
     }
 
diff --git a/Habitica/ic_launcher-web.png b/Habitica/ic_launcher-web.png
deleted file mode 100644
index 9a1451d65..000000000
Binary files a/Habitica/ic_launcher-web.png and /dev/null differ
diff --git a/Habitica/ic_launcher-web.webp b/Habitica/ic_launcher-web.webp
new file mode 100644
index 000000000..c1d05bb39
Binary files /dev/null and b/Habitica/ic_launcher-web.webp differ
diff --git a/Habitica/res/drawable-hdpi/avatar_border.png b/Habitica/res/drawable-hdpi/avatar_border.png
deleted file mode 100644
index ec93c25a1..000000000
Binary files a/Habitica/res/drawable-hdpi/avatar_border.png and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/avatar_border.webp b/Habitica/res/drawable-hdpi/avatar_border.webp
new file mode 100644
index 000000000..19eed25f6
Binary files /dev/null and b/Habitica/res/drawable-hdpi/avatar_border.webp differ
diff --git a/Habitica/res/drawable-hdpi/back_arrow_disabled.png b/Habitica/res/drawable-hdpi/back_arrow_disabled.png
deleted file mode 100644
index 6c91d2bbb..000000000
Binary files a/Habitica/res/drawable-hdpi/back_arrow_disabled.png and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/back_arrow_disabled.webp b/Habitica/res/drawable-hdpi/back_arrow_disabled.webp
new file mode 100644
index 000000000..e2797bce7
Binary files /dev/null and b/Habitica/res/drawable-hdpi/back_arrow_disabled.webp differ
diff --git a/Habitica/res/drawable-hdpi/back_arrow_enabled.png b/Habitica/res/drawable-hdpi/back_arrow_enabled.png
deleted file mode 100644
index 2566cd2e6..000000000
Binary files a/Habitica/res/drawable-hdpi/back_arrow_enabled.png and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/back_arrow_enabled.webp b/Habitica/res/drawable-hdpi/back_arrow_enabled.webp
new file mode 100644
index 000000000..8683cdb94
Binary files /dev/null and b/Habitica/res/drawable-hdpi/back_arrow_enabled.webp differ
diff --git a/Habitica/res/drawable-hdpi/bottom_navigation_inset.png b/Habitica/res/drawable-hdpi/bottom_navigation_inset.png
deleted file mode 100644
index 40ed16502..000000000
Binary files a/Habitica/res/drawable-hdpi/bottom_navigation_inset.png and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/bottom_navigation_inset.webp b/Habitica/res/drawable-hdpi/bottom_navigation_inset.webp
new file mode 100644
index 000000000..06c441fe5
Binary files /dev/null and b/Habitica/res/drawable-hdpi/bottom_navigation_inset.webp differ
diff --git a/Habitica/res/drawable-hdpi/cloud_1.png b/Habitica/res/drawable-hdpi/cloud_1.png
deleted file mode 100644
index a096e3496..000000000
Binary files a/Habitica/res/drawable-hdpi/cloud_1.png and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/cloud_1.webp b/Habitica/res/drawable-hdpi/cloud_1.webp
new file mode 100644
index 000000000..bc72361bb
Binary files /dev/null and b/Habitica/res/drawable-hdpi/cloud_1.webp differ
diff --git a/Habitica/res/drawable-hdpi/cloud_2.png b/Habitica/res/drawable-hdpi/cloud_2.png
deleted file mode 100644
index 33521c0bd..000000000
Binary files a/Habitica/res/drawable-hdpi/cloud_2.png and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/cloud_2.webp b/Habitica/res/drawable-hdpi/cloud_2.webp
new file mode 100644
index 000000000..3c43b8feb
Binary files /dev/null and b/Habitica/res/drawable-hdpi/cloud_2.webp differ
diff --git a/Habitica/res/drawable-hdpi/drag_grip.png b/Habitica/res/drawable-hdpi/drag_grip.png
deleted file mode 100644
index 11d0b490b..000000000
Binary files a/Habitica/res/drawable-hdpi/drag_grip.png and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/drag_grip.webp b/Habitica/res/drawable-hdpi/drag_grip.webp
new file mode 100644
index 000000000..1fdeb9d81
Binary files /dev/null and b/Habitica/res/drawable-hdpi/drag_grip.webp differ
diff --git a/Habitica/res/drawable-hdpi/fab_background.png b/Habitica/res/drawable-hdpi/fab_background.png
deleted file mode 100644
index 964c73697..000000000
Binary files a/Habitica/res/drawable-hdpi/fab_background.png and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/fab_background.webp b/Habitica/res/drawable-hdpi/fab_background.webp
new file mode 100644
index 000000000..fdcf4bbb0
Binary files /dev/null and b/Habitica/res/drawable-hdpi/fab_background.webp differ
diff --git a/Habitica/res/drawable-hdpi/fab_plus.png b/Habitica/res/drawable-hdpi/fab_plus.png
deleted file mode 100644
index 994b31f3a..000000000
Binary files a/Habitica/res/drawable-hdpi/fab_plus.png and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/fab_plus.webp b/Habitica/res/drawable-hdpi/fab_plus.webp
new file mode 100644
index 000000000..b2978d858
Binary files /dev/null and b/Habitica/res/drawable-hdpi/fab_plus.webp differ
diff --git a/Habitica/res/drawable-hdpi/fab_submenu_background.png b/Habitica/res/drawable-hdpi/fab_submenu_background.png
deleted file mode 100644
index 2dca2398a..000000000
Binary files a/Habitica/res/drawable-hdpi/fab_submenu_background.png and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/fab_submenu_background.webp b/Habitica/res/drawable-hdpi/fab_submenu_background.webp
new file mode 100644
index 000000000..f85fd1fa3
Binary files /dev/null and b/Habitica/res/drawable-hdpi/fab_submenu_background.webp differ
diff --git a/Habitica/res/drawable-hdpi/forward_arrow_enabled.png b/Habitica/res/drawable-hdpi/forward_arrow_enabled.png
deleted file mode 100644
index b8c758525..000000000
Binary files a/Habitica/res/drawable-hdpi/forward_arrow_enabled.png and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/forward_arrow_enabled.webp b/Habitica/res/drawable-hdpi/forward_arrow_enabled.webp
new file mode 100644
index 000000000..e2b047749
Binary files /dev/null and b/Habitica/res/drawable-hdpi/forward_arrow_enabled.webp differ
diff --git a/Habitica/res/drawable-hdpi/gold_multiple.png b/Habitica/res/drawable-hdpi/gold_multiple.png
deleted file mode 100644
index 783b313f4..000000000
Binary files a/Habitica/res/drawable-hdpi/gold_multiple.png and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/gold_multiple.webp b/Habitica/res/drawable-hdpi/gold_multiple.webp
new file mode 100644
index 000000000..fd3ac70c3
Binary files /dev/null and b/Habitica/res/drawable-hdpi/gold_multiple.webp differ
diff --git a/Habitica/res/drawable-hdpi/ic_filters_active.png b/Habitica/res/drawable-hdpi/ic_filters_active.png
deleted file mode 100644
index cda14097a..000000000
Binary files a/Habitica/res/drawable-hdpi/ic_filters_active.png and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/ic_filters_active.webp b/Habitica/res/drawable-hdpi/ic_filters_active.webp
new file mode 100644
index 000000000..60a7dbc82
Binary files /dev/null and b/Habitica/res/drawable-hdpi/ic_filters_active.webp differ
diff --git a/Habitica/res/drawable-hdpi/presents1.png b/Habitica/res/drawable-hdpi/presents1.png
deleted file mode 100644
index 45c5c1987..000000000
Binary files a/Habitica/res/drawable-hdpi/presents1.png and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/presents1.webp b/Habitica/res/drawable-hdpi/presents1.webp
new file mode 100644
index 000000000..bfcd09963
Binary files /dev/null and b/Habitica/res/drawable-hdpi/presents1.webp differ
diff --git a/Habitica/res/drawable-hdpi/presents2.png b/Habitica/res/drawable-hdpi/presents2.png
deleted file mode 100644
index 4b1da394c..000000000
Binary files a/Habitica/res/drawable-hdpi/presents2.png and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/presents2.webp b/Habitica/res/drawable-hdpi/presents2.webp
new file mode 100644
index 000000000..e0190737e
Binary files /dev/null and b/Habitica/res/drawable-hdpi/presents2.webp differ
diff --git a/Habitica/res/drawable-hdpi/subscriber_gem_cap.png b/Habitica/res/drawable-hdpi/subscriber_gem_cap.png
deleted file mode 100644
index 6dc845457..000000000
Binary files a/Habitica/res/drawable-hdpi/subscriber_gem_cap.png and /dev/null differ
diff --git a/Habitica/res/drawable-hdpi/subscriber_gem_cap.webp b/Habitica/res/drawable-hdpi/subscriber_gem_cap.webp
new file mode 100644
index 000000000..b76c15beb
Binary files /dev/null and b/Habitica/res/drawable-hdpi/subscriber_gem_cap.webp differ
diff --git a/Habitica/res/drawable-mdpi/avatar_border.png b/Habitica/res/drawable-mdpi/avatar_border.png
deleted file mode 100644
index a93bb2302..000000000
Binary files a/Habitica/res/drawable-mdpi/avatar_border.png and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/avatar_border.webp b/Habitica/res/drawable-mdpi/avatar_border.webp
new file mode 100644
index 000000000..5cc3f7c90
Binary files /dev/null and b/Habitica/res/drawable-mdpi/avatar_border.webp differ
diff --git a/Habitica/res/drawable-mdpi/back_arrow_disabled.png b/Habitica/res/drawable-mdpi/back_arrow_disabled.png
deleted file mode 100644
index 20dba418b..000000000
Binary files a/Habitica/res/drawable-mdpi/back_arrow_disabled.png and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/back_arrow_disabled.webp b/Habitica/res/drawable-mdpi/back_arrow_disabled.webp
new file mode 100644
index 000000000..1d8699204
Binary files /dev/null and b/Habitica/res/drawable-mdpi/back_arrow_disabled.webp differ
diff --git a/Habitica/res/drawable-mdpi/back_arrow_enabled.png b/Habitica/res/drawable-mdpi/back_arrow_enabled.png
deleted file mode 100644
index 9155c3aa4..000000000
Binary files a/Habitica/res/drawable-mdpi/back_arrow_enabled.png and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/back_arrow_enabled.webp b/Habitica/res/drawable-mdpi/back_arrow_enabled.webp
new file mode 100644
index 000000000..339e69ab9
Binary files /dev/null and b/Habitica/res/drawable-mdpi/back_arrow_enabled.webp differ
diff --git a/Habitica/res/drawable-mdpi/bottom_navigation_inset.png b/Habitica/res/drawable-mdpi/bottom_navigation_inset.png
deleted file mode 100644
index a197240c4..000000000
Binary files a/Habitica/res/drawable-mdpi/bottom_navigation_inset.png and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/bottom_navigation_inset.webp b/Habitica/res/drawable-mdpi/bottom_navigation_inset.webp
new file mode 100644
index 000000000..11ec94df9
Binary files /dev/null and b/Habitica/res/drawable-mdpi/bottom_navigation_inset.webp differ
diff --git a/Habitica/res/drawable-mdpi/drag_grip.png b/Habitica/res/drawable-mdpi/drag_grip.png
deleted file mode 100644
index 277066847..000000000
Binary files a/Habitica/res/drawable-mdpi/drag_grip.png and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/drag_grip.webp b/Habitica/res/drawable-mdpi/drag_grip.webp
new file mode 100644
index 000000000..a88fa43d7
Binary files /dev/null and b/Habitica/res/drawable-mdpi/drag_grip.webp differ
diff --git a/Habitica/res/drawable-mdpi/fab_background.png b/Habitica/res/drawable-mdpi/fab_background.png
deleted file mode 100644
index c481beb8f..000000000
Binary files a/Habitica/res/drawable-mdpi/fab_background.png and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/fab_background.webp b/Habitica/res/drawable-mdpi/fab_background.webp
new file mode 100644
index 000000000..097960343
Binary files /dev/null and b/Habitica/res/drawable-mdpi/fab_background.webp differ
diff --git a/Habitica/res/drawable-mdpi/fab_plus.png b/Habitica/res/drawable-mdpi/fab_plus.png
deleted file mode 100644
index 69965cefe..000000000
Binary files a/Habitica/res/drawable-mdpi/fab_plus.png and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/fab_plus.webp b/Habitica/res/drawable-mdpi/fab_plus.webp
new file mode 100644
index 000000000..2f36033c1
Binary files /dev/null and b/Habitica/res/drawable-mdpi/fab_plus.webp differ
diff --git a/Habitica/res/drawable-mdpi/fab_submenu_background.png b/Habitica/res/drawable-mdpi/fab_submenu_background.png
deleted file mode 100644
index a751eaa30..000000000
Binary files a/Habitica/res/drawable-mdpi/fab_submenu_background.png and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/fab_submenu_background.webp b/Habitica/res/drawable-mdpi/fab_submenu_background.webp
new file mode 100644
index 000000000..8a3ac3817
Binary files /dev/null and b/Habitica/res/drawable-mdpi/fab_submenu_background.webp differ
diff --git a/Habitica/res/drawable-mdpi/forward_arrow_enabled.png b/Habitica/res/drawable-mdpi/forward_arrow_enabled.png
deleted file mode 100644
index 587d25c99..000000000
Binary files a/Habitica/res/drawable-mdpi/forward_arrow_enabled.png and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/forward_arrow_enabled.webp b/Habitica/res/drawable-mdpi/forward_arrow_enabled.webp
new file mode 100644
index 000000000..1c1a26fbe
Binary files /dev/null and b/Habitica/res/drawable-mdpi/forward_arrow_enabled.webp differ
diff --git a/Habitica/res/drawable-mdpi/gold_multiple.png b/Habitica/res/drawable-mdpi/gold_multiple.png
deleted file mode 100644
index aef3e16cd..000000000
Binary files a/Habitica/res/drawable-mdpi/gold_multiple.png and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/gold_multiple.webp b/Habitica/res/drawable-mdpi/gold_multiple.webp
new file mode 100644
index 000000000..fe8f4d4e2
Binary files /dev/null and b/Habitica/res/drawable-mdpi/gold_multiple.webp differ
diff --git a/Habitica/res/drawable-mdpi/ic_filters_active.png b/Habitica/res/drawable-mdpi/ic_filters_active.png
deleted file mode 100644
index 12b7bc722..000000000
Binary files a/Habitica/res/drawable-mdpi/ic_filters_active.png and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/ic_filters_active.webp b/Habitica/res/drawable-mdpi/ic_filters_active.webp
new file mode 100644
index 000000000..35ab117a2
Binary files /dev/null and b/Habitica/res/drawable-mdpi/ic_filters_active.webp differ
diff --git a/Habitica/res/drawable-mdpi/presents1.png b/Habitica/res/drawable-mdpi/presents1.png
deleted file mode 100644
index 5842e946e..000000000
Binary files a/Habitica/res/drawable-mdpi/presents1.png and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/presents1.webp b/Habitica/res/drawable-mdpi/presents1.webp
new file mode 100644
index 000000000..05ff45bd9
Binary files /dev/null and b/Habitica/res/drawable-mdpi/presents1.webp differ
diff --git a/Habitica/res/drawable-mdpi/presents2.png b/Habitica/res/drawable-mdpi/presents2.png
deleted file mode 100644
index b6adc46c8..000000000
Binary files a/Habitica/res/drawable-mdpi/presents2.png and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/presents2.webp b/Habitica/res/drawable-mdpi/presents2.webp
new file mode 100644
index 000000000..6ee21edbc
Binary files /dev/null and b/Habitica/res/drawable-mdpi/presents2.webp differ
diff --git a/Habitica/res/drawable-mdpi/subscriber_gem_cap.png b/Habitica/res/drawable-mdpi/subscriber_gem_cap.png
deleted file mode 100644
index f371535d2..000000000
Binary files a/Habitica/res/drawable-mdpi/subscriber_gem_cap.png and /dev/null differ
diff --git a/Habitica/res/drawable-mdpi/subscriber_gem_cap.webp b/Habitica/res/drawable-mdpi/subscriber_gem_cap.webp
new file mode 100644
index 000000000..d4a354072
Binary files /dev/null and b/Habitica/res/drawable-mdpi/subscriber_gem_cap.webp differ
diff --git a/Habitica/res/drawable-xhdpi/avatar_border.png b/Habitica/res/drawable-xhdpi/avatar_border.png
deleted file mode 100644
index 6859d0aef..000000000
Binary files a/Habitica/res/drawable-xhdpi/avatar_border.png and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/avatar_border.webp b/Habitica/res/drawable-xhdpi/avatar_border.webp
new file mode 100644
index 000000000..1ff981575
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/avatar_border.webp differ
diff --git a/Habitica/res/drawable-xhdpi/back_arrow_disabled.png b/Habitica/res/drawable-xhdpi/back_arrow_disabled.png
deleted file mode 100644
index d58cfb160..000000000
Binary files a/Habitica/res/drawable-xhdpi/back_arrow_disabled.png and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/back_arrow_disabled.webp b/Habitica/res/drawable-xhdpi/back_arrow_disabled.webp
new file mode 100644
index 000000000..f6e6b7fad
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/back_arrow_disabled.webp differ
diff --git a/Habitica/res/drawable-xhdpi/back_arrow_enabled.png b/Habitica/res/drawable-xhdpi/back_arrow_enabled.png
deleted file mode 100644
index 9648c24b7..000000000
Binary files a/Habitica/res/drawable-xhdpi/back_arrow_enabled.png and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/back_arrow_enabled.webp b/Habitica/res/drawable-xhdpi/back_arrow_enabled.webp
new file mode 100644
index 000000000..bce256195
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/back_arrow_enabled.webp differ
diff --git a/Habitica/res/drawable-xhdpi/bottom_navigation_inset.png b/Habitica/res/drawable-xhdpi/bottom_navigation_inset.png
deleted file mode 100644
index fb975edf0..000000000
Binary files a/Habitica/res/drawable-xhdpi/bottom_navigation_inset.png and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/bottom_navigation_inset.webp b/Habitica/res/drawable-xhdpi/bottom_navigation_inset.webp
new file mode 100644
index 000000000..ceea923c9
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/bottom_navigation_inset.webp differ
diff --git a/Habitica/res/drawable-xhdpi/cloud_1.png b/Habitica/res/drawable-xhdpi/cloud_1.png
deleted file mode 100644
index 8f34b7d26..000000000
Binary files a/Habitica/res/drawable-xhdpi/cloud_1.png and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/cloud_1.webp b/Habitica/res/drawable-xhdpi/cloud_1.webp
new file mode 100644
index 000000000..0ef6f6384
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/cloud_1.webp differ
diff --git a/Habitica/res/drawable-xhdpi/cloud_2.png b/Habitica/res/drawable-xhdpi/cloud_2.png
deleted file mode 100644
index 10a197c37..000000000
Binary files a/Habitica/res/drawable-xhdpi/cloud_2.png and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/cloud_2.webp b/Habitica/res/drawable-xhdpi/cloud_2.webp
new file mode 100644
index 000000000..68f68a874
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/cloud_2.webp differ
diff --git a/Habitica/res/drawable-xhdpi/drag_grip.png b/Habitica/res/drawable-xhdpi/drag_grip.png
deleted file mode 100644
index 0f676f410..000000000
Binary files a/Habitica/res/drawable-xhdpi/drag_grip.png and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/drag_grip.webp b/Habitica/res/drawable-xhdpi/drag_grip.webp
new file mode 100644
index 000000000..b62c1b243
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/drag_grip.webp differ
diff --git a/Habitica/res/drawable-xhdpi/fab_background.png b/Habitica/res/drawable-xhdpi/fab_background.png
deleted file mode 100644
index 52e62daa4..000000000
Binary files a/Habitica/res/drawable-xhdpi/fab_background.png and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/fab_background.webp b/Habitica/res/drawable-xhdpi/fab_background.webp
new file mode 100644
index 000000000..9e1fc3eea
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/fab_background.webp differ
diff --git a/Habitica/res/drawable-xhdpi/fab_plus.png b/Habitica/res/drawable-xhdpi/fab_plus.png
deleted file mode 100644
index 37645eed0..000000000
Binary files a/Habitica/res/drawable-xhdpi/fab_plus.png and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/fab_plus.webp b/Habitica/res/drawable-xhdpi/fab_plus.webp
new file mode 100644
index 000000000..703293855
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/fab_plus.webp differ
diff --git a/Habitica/res/drawable-xhdpi/fab_submenu_background.png b/Habitica/res/drawable-xhdpi/fab_submenu_background.png
deleted file mode 100644
index 0215b96bb..000000000
Binary files a/Habitica/res/drawable-xhdpi/fab_submenu_background.png and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/fab_submenu_background.webp b/Habitica/res/drawable-xhdpi/fab_submenu_background.webp
new file mode 100644
index 000000000..5620a5c07
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/fab_submenu_background.webp differ
diff --git a/Habitica/res/drawable-xhdpi/forward_arrow_enabled.png b/Habitica/res/drawable-xhdpi/forward_arrow_enabled.png
deleted file mode 100644
index bb333b164..000000000
Binary files a/Habitica/res/drawable-xhdpi/forward_arrow_enabled.png and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/forward_arrow_enabled.webp b/Habitica/res/drawable-xhdpi/forward_arrow_enabled.webp
new file mode 100644
index 000000000..b1c6f1c45
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/forward_arrow_enabled.webp differ
diff --git a/Habitica/res/drawable-xhdpi/gold_multiple.png b/Habitica/res/drawable-xhdpi/gold_multiple.png
deleted file mode 100644
index 51b423a7c..000000000
Binary files a/Habitica/res/drawable-xhdpi/gold_multiple.png and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/gold_multiple.webp b/Habitica/res/drawable-xhdpi/gold_multiple.webp
new file mode 100644
index 000000000..f662a4389
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/gold_multiple.webp differ
diff --git a/Habitica/res/drawable-xhdpi/ic_filters_active.png b/Habitica/res/drawable-xhdpi/ic_filters_active.png
deleted file mode 100644
index ef97e6075..000000000
Binary files a/Habitica/res/drawable-xhdpi/ic_filters_active.png and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/ic_filters_active.webp b/Habitica/res/drawable-xhdpi/ic_filters_active.webp
new file mode 100644
index 000000000..9f27c18ad
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/ic_filters_active.webp differ
diff --git a/Habitica/res/drawable-xhdpi/presents1.png b/Habitica/res/drawable-xhdpi/presents1.png
deleted file mode 100644
index dccdef92c..000000000
Binary files a/Habitica/res/drawable-xhdpi/presents1.png and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/presents1.webp b/Habitica/res/drawable-xhdpi/presents1.webp
new file mode 100644
index 000000000..547541544
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/presents1.webp differ
diff --git a/Habitica/res/drawable-xhdpi/presents2.png b/Habitica/res/drawable-xhdpi/presents2.png
deleted file mode 100644
index 5f0ea3b81..000000000
Binary files a/Habitica/res/drawable-xhdpi/presents2.png and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/presents2.webp b/Habitica/res/drawable-xhdpi/presents2.webp
new file mode 100644
index 000000000..e7d87f7f8
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/presents2.webp differ
diff --git a/Habitica/res/drawable-xhdpi/subscriber_gem_cap.png b/Habitica/res/drawable-xhdpi/subscriber_gem_cap.png
deleted file mode 100644
index 46001072a..000000000
Binary files a/Habitica/res/drawable-xhdpi/subscriber_gem_cap.png and /dev/null differ
diff --git a/Habitica/res/drawable-xhdpi/subscriber_gem_cap.webp b/Habitica/res/drawable-xhdpi/subscriber_gem_cap.webp
new file mode 100644
index 000000000..9e492e563
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/subscriber_gem_cap.webp differ
diff --git a/Habitica/res/drawable-xxhdpi/avatar_border.png b/Habitica/res/drawable-xxhdpi/avatar_border.png
deleted file mode 100644
index 7c87ea264..000000000
Binary files a/Habitica/res/drawable-xxhdpi/avatar_border.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/avatar_border.webp b/Habitica/res/drawable-xxhdpi/avatar_border.webp
new file mode 100644
index 000000000..c264700ce
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/avatar_border.webp differ
diff --git a/Habitica/res/drawable-xxhdpi/back_arrow_disabled.png b/Habitica/res/drawable-xxhdpi/back_arrow_disabled.png
deleted file mode 100644
index 6639e24ed..000000000
Binary files a/Habitica/res/drawable-xxhdpi/back_arrow_disabled.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/back_arrow_disabled.webp b/Habitica/res/drawable-xxhdpi/back_arrow_disabled.webp
new file mode 100644
index 000000000..472415e8d
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/back_arrow_disabled.webp differ
diff --git a/Habitica/res/drawable-xxhdpi/back_arrow_enabled.png b/Habitica/res/drawable-xxhdpi/back_arrow_enabled.png
deleted file mode 100644
index 1ea24a005..000000000
Binary files a/Habitica/res/drawable-xxhdpi/back_arrow_enabled.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/back_arrow_enabled.webp b/Habitica/res/drawable-xxhdpi/back_arrow_enabled.webp
new file mode 100644
index 000000000..4af814d23
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/back_arrow_enabled.webp differ
diff --git a/Habitica/res/drawable-xxhdpi/bottom_navigation_inset.png b/Habitica/res/drawable-xxhdpi/bottom_navigation_inset.png
deleted file mode 100644
index a812bb243..000000000
Binary files a/Habitica/res/drawable-xxhdpi/bottom_navigation_inset.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/bottom_navigation_inset.webp b/Habitica/res/drawable-xxhdpi/bottom_navigation_inset.webp
new file mode 100644
index 000000000..ba92f790d
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/bottom_navigation_inset.webp differ
diff --git a/Habitica/res/drawable-xxhdpi/drag_grip.png b/Habitica/res/drawable-xxhdpi/drag_grip.png
deleted file mode 100644
index 22538fa68..000000000
Binary files a/Habitica/res/drawable-xxhdpi/drag_grip.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/drag_grip.webp b/Habitica/res/drawable-xxhdpi/drag_grip.webp
new file mode 100644
index 000000000..ad593b1c9
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/drag_grip.webp differ
diff --git a/Habitica/res/drawable-xxhdpi/fab_background.png b/Habitica/res/drawable-xxhdpi/fab_background.png
deleted file mode 100644
index 06b3a327f..000000000
Binary files a/Habitica/res/drawable-xxhdpi/fab_background.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/fab_background.webp b/Habitica/res/drawable-xxhdpi/fab_background.webp
new file mode 100644
index 000000000..7dcdc3b4a
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/fab_background.webp differ
diff --git a/Habitica/res/drawable-xxhdpi/fab_plus.png b/Habitica/res/drawable-xxhdpi/fab_plus.png
deleted file mode 100644
index 402a7f2d5..000000000
Binary files a/Habitica/res/drawable-xxhdpi/fab_plus.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/fab_plus.webp b/Habitica/res/drawable-xxhdpi/fab_plus.webp
new file mode 100644
index 000000000..5f5a6a66d
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/fab_plus.webp differ
diff --git a/Habitica/res/drawable-xxhdpi/fab_submenu_background.png b/Habitica/res/drawable-xxhdpi/fab_submenu_background.png
deleted file mode 100644
index e77a6846c..000000000
Binary files a/Habitica/res/drawable-xxhdpi/fab_submenu_background.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/fab_submenu_background.webp b/Habitica/res/drawable-xxhdpi/fab_submenu_background.webp
new file mode 100644
index 000000000..48c216ce4
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/fab_submenu_background.webp differ
diff --git a/Habitica/res/drawable-xxhdpi/forward_arrow_enabled.png b/Habitica/res/drawable-xxhdpi/forward_arrow_enabled.png
deleted file mode 100644
index fb48245b3..000000000
Binary files a/Habitica/res/drawable-xxhdpi/forward_arrow_enabled.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/forward_arrow_enabled.webp b/Habitica/res/drawable-xxhdpi/forward_arrow_enabled.webp
new file mode 100644
index 000000000..13cc8ab9d
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/forward_arrow_enabled.webp differ
diff --git a/Habitica/res/drawable-xxhdpi/gold_multiple.png b/Habitica/res/drawable-xxhdpi/gold_multiple.png
deleted file mode 100644
index 391bf301d..000000000
Binary files a/Habitica/res/drawable-xxhdpi/gold_multiple.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/gold_multiple.webp b/Habitica/res/drawable-xxhdpi/gold_multiple.webp
new file mode 100644
index 000000000..dfe678881
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/gold_multiple.webp differ
diff --git a/Habitica/res/drawable-xxhdpi/ic_filters_active.png b/Habitica/res/drawable-xxhdpi/ic_filters_active.png
deleted file mode 100644
index 16f38de00..000000000
Binary files a/Habitica/res/drawable-xxhdpi/ic_filters_active.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/ic_filters_active.webp b/Habitica/res/drawable-xxhdpi/ic_filters_active.webp
new file mode 100644
index 000000000..34994560b
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/ic_filters_active.webp differ
diff --git a/Habitica/res/drawable-xxhdpi/presents1.png b/Habitica/res/drawable-xxhdpi/presents1.png
deleted file mode 100644
index 7fd7cbddb..000000000
Binary files a/Habitica/res/drawable-xxhdpi/presents1.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/presents1.webp b/Habitica/res/drawable-xxhdpi/presents1.webp
new file mode 100644
index 000000000..1c7fe9c92
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/presents1.webp differ
diff --git a/Habitica/res/drawable-xxhdpi/presents2.png b/Habitica/res/drawable-xxhdpi/presents2.png
deleted file mode 100644
index 59afbf5a7..000000000
Binary files a/Habitica/res/drawable-xxhdpi/presents2.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/presents2.webp b/Habitica/res/drawable-xxhdpi/presents2.webp
new file mode 100644
index 000000000..395d996df
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/presents2.webp differ
diff --git a/Habitica/res/drawable-xxhdpi/subscriber_gem_cap.png b/Habitica/res/drawable-xxhdpi/subscriber_gem_cap.png
deleted file mode 100644
index db1ad8110..000000000
Binary files a/Habitica/res/drawable-xxhdpi/subscriber_gem_cap.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxhdpi/subscriber_gem_cap.webp b/Habitica/res/drawable-xxhdpi/subscriber_gem_cap.webp
new file mode 100644
index 000000000..b402124df
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/subscriber_gem_cap.webp differ
diff --git a/Habitica/res/drawable-xxxhdpi/avatar_border.png b/Habitica/res/drawable-xxxhdpi/avatar_border.png
deleted file mode 100644
index 5879226a5..000000000
Binary files a/Habitica/res/drawable-xxxhdpi/avatar_border.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxxhdpi/avatar_border.webp b/Habitica/res/drawable-xxxhdpi/avatar_border.webp
new file mode 100644
index 000000000..9dfe00da2
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/avatar_border.webp differ
diff --git a/Habitica/res/drawable-xxxhdpi/bottom_navigation_inset.png b/Habitica/res/drawable-xxxhdpi/bottom_navigation_inset.png
deleted file mode 100644
index fbcfe8429..000000000
Binary files a/Habitica/res/drawable-xxxhdpi/bottom_navigation_inset.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxxhdpi/bottom_navigation_inset.webp b/Habitica/res/drawable-xxxhdpi/bottom_navigation_inset.webp
new file mode 100644
index 000000000..f5a8dfb8b
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/bottom_navigation_inset.webp differ
diff --git a/Habitica/res/drawable-xxxhdpi/drag_grip.png b/Habitica/res/drawable-xxxhdpi/drag_grip.png
deleted file mode 100644
index c3137d973..000000000
Binary files a/Habitica/res/drawable-xxxhdpi/drag_grip.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxxhdpi/drag_grip.webp b/Habitica/res/drawable-xxxhdpi/drag_grip.webp
new file mode 100644
index 000000000..c672b5869
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/drag_grip.webp differ
diff --git a/Habitica/res/drawable-xxxhdpi/fab_background.png b/Habitica/res/drawable-xxxhdpi/fab_background.png
deleted file mode 100644
index 18cf2b0f2..000000000
Binary files a/Habitica/res/drawable-xxxhdpi/fab_background.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxxhdpi/fab_background.webp b/Habitica/res/drawable-xxxhdpi/fab_background.webp
new file mode 100644
index 000000000..8e95ef20f
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/fab_background.webp differ
diff --git a/Habitica/res/drawable-xxxhdpi/fab_plus.png b/Habitica/res/drawable-xxxhdpi/fab_plus.png
deleted file mode 100644
index 0dc5a9224..000000000
Binary files a/Habitica/res/drawable-xxxhdpi/fab_plus.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxxhdpi/fab_plus.webp b/Habitica/res/drawable-xxxhdpi/fab_plus.webp
new file mode 100644
index 000000000..b05654e61
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/fab_plus.webp differ
diff --git a/Habitica/res/drawable-xxxhdpi/fab_submenu_background.png b/Habitica/res/drawable-xxxhdpi/fab_submenu_background.png
deleted file mode 100644
index 3eb560ac5..000000000
Binary files a/Habitica/res/drawable-xxxhdpi/fab_submenu_background.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxxhdpi/fab_submenu_background.webp b/Habitica/res/drawable-xxxhdpi/fab_submenu_background.webp
new file mode 100644
index 000000000..7cfebd638
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/fab_submenu_background.webp differ
diff --git a/Habitica/res/drawable-xxxhdpi/gold_multiple.png b/Habitica/res/drawable-xxxhdpi/gold_multiple.png
deleted file mode 100644
index cd274bdf4..000000000
Binary files a/Habitica/res/drawable-xxxhdpi/gold_multiple.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxxhdpi/gold_multiple.webp b/Habitica/res/drawable-xxxhdpi/gold_multiple.webp
new file mode 100644
index 000000000..ac48fa1ae
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/gold_multiple.webp differ
diff --git a/Habitica/res/drawable-xxxhdpi/ic_add_white_18dp.png b/Habitica/res/drawable-xxxhdpi/ic_add_white_18dp.png
deleted file mode 100644
index 3a15191cc..000000000
Binary files a/Habitica/res/drawable-xxxhdpi/ic_add_white_18dp.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxxhdpi/ic_add_white_18dp.webp b/Habitica/res/drawable-xxxhdpi/ic_add_white_18dp.webp
new file mode 100644
index 000000000..0c0720ae9
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/ic_add_white_18dp.webp differ
diff --git a/Habitica/res/drawable-xxxhdpi/ic_filters_active.png b/Habitica/res/drawable-xxxhdpi/ic_filters_active.png
deleted file mode 100644
index caa6c3a8b..000000000
Binary files a/Habitica/res/drawable-xxxhdpi/ic_filters_active.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxxhdpi/ic_filters_active.webp b/Habitica/res/drawable-xxxhdpi/ic_filters_active.webp
new file mode 100644
index 000000000..f147bbc7d
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/ic_filters_active.webp differ
diff --git a/Habitica/res/drawable-xxxhdpi/subscriber_gem_cap.png b/Habitica/res/drawable-xxxhdpi/subscriber_gem_cap.png
deleted file mode 100644
index 9f5338f03..000000000
Binary files a/Habitica/res/drawable-xxxhdpi/subscriber_gem_cap.png and /dev/null differ
diff --git a/Habitica/res/drawable-xxxhdpi/subscriber_gem_cap.webp b/Habitica/res/drawable-xxxhdpi/subscriber_gem_cap.webp
new file mode 100644
index 000000000..aa3574cc2
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/subscriber_gem_cap.webp differ
diff --git a/Habitica/res/fab_background.png b/Habitica/res/fab_background.png
deleted file mode 100644
index 939ff7e20..000000000
Binary files a/Habitica/res/fab_background.png and /dev/null differ
diff --git a/Habitica/res/fab_background.webp b/Habitica/res/fab_background.webp
new file mode 100644
index 000000000..df84eecec
Binary files /dev/null and b/Habitica/res/fab_background.webp differ
diff --git a/Habitica/res/layout/activity_about.xml b/Habitica/res/layout/activity_about.xml
index 42a3d25ee..c07bcb736 100644
--- a/Habitica/res/layout/activity_about.xml
+++ b/Habitica/res/layout/activity_about.xml
@@ -1,25 +1,48 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/main_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.activities.AboutActivity">
-
-    <com.google.android.material.tabs.TabLayout
-        android:id="@+id/tab_layout"
+    android:orientation="vertical"
+    tools:context="com.habitrpg.android.habitica.ui.activities.FixCharacterValuesActivity"
+    android:background="@color/white">
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?attr/colorPrimary"
-        android:elevation="6dp"
-        android:minHeight="?attr/actionBarSize"
-        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
+        android:layout_height="wrap_content">
 
-    <androidx.viewpager.widget.ViewPager
-        android:id="@+id/pager"
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="?attr/actionBarSize"
+            android:theme="@style/Toolbar"
+            android:background="@color/brand_300"
+            app:layout_scrollFlags="scroll|enterAlways"
+            app:popupTheme="@style/ThemeOverlay.AppCompat.Dark"/>
+
+    </com.google.android.material.appbar.AppBarLayout>
+    <RelativeLayout
+        android:id="@+id/main_layout"
         android:layout_width="match_parent"
-        android:layout_height="fill_parent"
-        android:layout_below="@id/tab_layout"
-        android:background="@color/white"
-        />
+        android:layout_height="match_parent"
+        tools:context=".ui.activities.AboutActivity">
 
-</RelativeLayout>
\ No newline at end of file
+        <com.google.android.material.tabs.TabLayout
+            android:id="@+id/tab_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?attr/colorPrimary"
+            android:elevation="6dp"
+            android:minHeight="?attr/actionBarSize"
+            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
+
+        <androidx.viewpager.widget.ViewPager
+            android:id="@+id/pager"
+            android:layout_width="match_parent"
+            android:layout_height="fill_parent"
+            android:layout_below="@id/tab_layout"
+            android:background="@color/white"
+            />
+
+    </RelativeLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/activity_full_profile.xml b/Habitica/res/layout/activity_full_profile.xml
index 01fb72434..c028605bd 100644
--- a/Habitica/res/layout/activity_full_profile.xml
+++ b/Habitica/res/layout/activity_full_profile.xml
@@ -1,449 +1,471 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:fresco="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/fullprofile_scrollview"
+    xmlns:fresco="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context="com.habitrpg.android.habitica.ui.activities.FixCharacterValuesActivity"
+    android:background="@color/white">
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:layout_height="wrap_content">
 
-        <androidx.cardview.widget.CardView
-            style="@style/CardView.Default"
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:minHeight="?attr/actionBarSize"
+            android:theme="@style/Toolbar"
+            android:background="@color/brand_300"
+            app:layout_scrollFlags="scroll|enterAlways"
+            app:popupTheme="@style/ThemeOverlay.AppCompat.Dark"/>
 
-            <LinearLayout
-                style="@style/CardContent"
+    </com.google.android.material.appbar.AppBarLayout>
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/fullprofile_scrollview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <androidx.cardview.widget.CardView
+                style="@style/CardView.Default"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
+                android:layout_height="wrap_content">
 
                 <LinearLayout
-                    android:id="@+id/avatar_with_bars"
+                    style="@style/CardContent"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    android:adjustViewBounds="true"
-                    android:background="@color/transparent"
-                    android:focusable="true"
-                    android:focusableInTouchMode="true"
                     android:orientation="vertical">
 
                     <LinearLayout
+                        android:id="@+id/avatar_with_bars"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-
-                        <com.habitrpg.android.habitica.ui.AvatarView
-                            android:id="@+id/avatarView"
-                            android:layout_width="@dimen/avatar_header_width"
-                            android:layout_height="@dimen/avatar_header_height"
-                            android:layout_gravity="center_vertical"
-                            android:layout_marginEnd="16dp"
-                            android:layout_marginRight="16dp"
-                            app:showBackground="true"
-                            app:showMount="true"
-                            app:showPet="true" />
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="5dp"
+                        android:adjustViewBounds="true"
+                        android:background="@color/transparent"
+                        android:focusable="true"
+                        android:focusableInTouchMode="true"
+                        android:orientation="vertical">
 
                         <LinearLayout
-                            android:id="@+id/LL_header"
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="vertical">
+                            android:layout_height="wrap_content">
 
-                            <com.habitrpg.android.habitica.ui.views.ValueBar
-                                android:id="@+id/hpBar"
-                                layout="@layout/value_bar"
+                            <com.habitrpg.android.habitica.ui.AvatarView
+                                android:id="@+id/avatarView"
+                                android:layout_width="@dimen/avatar_header_width"
+                                android:layout_height="@dimen/avatar_header_height"
+                                android:layout_gravity="center_vertical"
+                                android:layout_marginEnd="16dp"
+                                android:layout_marginRight="16dp"
+                                app:showBackground="true"
+                                app:showMount="true"
+                                app:showPet="true" />
+
+                            <LinearLayout
+                                android:id="@+id/LL_header"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:layout_marginBottom="@dimen/header_bar_spacing"
-                                app:barForegroundColor="@color/hpColor"
-                                app:lightBackground="true"
-                                app:description="@string/HP_default" />
+                                android:orientation="vertical">
 
-                            <com.habitrpg.android.habitica.ui.views.ValueBar
-                                android:id="@+id/xpBar"
-                                layout="@layout/value_bar"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginBottom="@dimen/header_bar_spacing"
-                                app:barForegroundColor="@color/xpColor"
-                                app:lightBackground="true"
-                                app:description="@string/XP_default"  />
+                                <com.habitrpg.android.habitica.ui.views.ValueBar
+                                    android:id="@+id/hpBar"
+                                    layout="@layout/value_bar"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginBottom="@dimen/header_bar_spacing"
+                                    app:barForegroundColor="@color/hpColor"
+                                    app:lightBackground="true"
+                                    app:description="@string/HP_default" />
 
-                            <com.habitrpg.android.habitica.ui.views.ValueBar
-                                android:id="@+id/mpBar"
-                                layout="@layout/value_bar"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                app:barForegroundColor="@color/mpColor"
-                                app:lightBackground="true"
-                                app:description="@string/MP_default" />
+                                <com.habitrpg.android.habitica.ui.views.ValueBar
+                                    android:id="@+id/xpBar"
+                                    layout="@layout/value_bar"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginBottom="@dimen/header_bar_spacing"
+                                    app:barForegroundColor="@color/xpColor"
+                                    app:lightBackground="true"
+                                    app:description="@string/XP_default"  />
 
+                                <com.habitrpg.android.habitica.ui.views.ValueBar
+                                    android:id="@+id/mpBar"
+                                    layout="@layout/value_bar"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    app:barForegroundColor="@color/mpColor"
+                                    app:lightBackground="true"
+                                    app:description="@string/MP_default" />
+
+                            </LinearLayout>
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
+
+                            <TextView
+                                android:id="@+id/lvl_tv"
+                                android:layout_width="wrap_content"
+                                android:layout_height="36dp"
+                                android:drawablePadding="6dp"
+                                android:gravity="center"
+                                android:textSize="14sp" />
+
+                            <View
+                                android:layout_width="0dp"
+                                android:layout_height="0dp"
+                                android:layout_weight="1" />
+
+                            <com.habitrpg.android.habitica.ui.views.CurrencyViews
+                                android:id="@+id/currencyView"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content" />
                         </LinearLayout>
                     </LinearLayout>
 
+
+                    <TextView
+                        android:id="@+id/profile_blurb"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textIsSelectable="true"
+                        android:text="Blurb" />
+
+                    <com.facebook.drawee.view.SimpleDraweeView
+                        android:id="@+id/profile_image"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_margin="5dp"
+                        android:minHeight="200dp"
+                        fresco:actualImageScaleType="fitCenter" />
                     <LinearLayout
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:layout_marginTop="@dimen/spacing_medium"
+                        android:layout_marginBottom="@dimen/spacing_medium">
                         <TextView
-                            android:id="@+id/lvl_tv"
-                            android:layout_width="wrap_content"
-                            android:layout_height="36dp"
-                            android:drawablePadding="6dp"
-                            android:gravity="center"
-                            android:textSize="14sp" />
-
-                        <View
                             android:layout_width="0dp"
-                            android:layout_height="0dp"
-                            android:layout_weight="1" />
-
-                        <com.habitrpg.android.habitica.ui.views.CurrencyViews
-                            android:id="@+id/currencyView"
+                            android:layout_weight="1"
+                            android:layout_height="wrap_content"
+                            android:text="@string/joined"
+                            style="@style/Subheader1"/>
+                        <TextView
+                            android:id="@+id/joined_view"
                             android:layout_width="wrap_content"
-                            android:layout_height="wrap_content" />
+                            android:layout_height="wrap_content"
+                            tools:text="today"/>
+                    </LinearLayout>
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:layout_marginBottom="@dimen/spacing_medium">
+                        <TextView
+                            android:layout_width="0dp"
+                            android:layout_weight="1"
+                            android:layout_height="wrap_content"
+                            android:text="@string/last_login"
+                            style="@style/Subheader1"/>
+                        <TextView
+                            android:id="@+id/last_login_view"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            tools:text="today"/>
+                    </LinearLayout>
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+                        <TextView
+                            android:layout_width="0dp"
+                            android:layout_weight="1"
+                            android:layout_height="wrap_content"
+                            android:text="@string/total_checkins"
+                            style="@style/Subheader1"/>
+                        <TextView
+                            android:id="@+id/total_checkins_view"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            tools:text="100"/>
                     </LinearLayout>
                 </LinearLayout>
+            </androidx.cardview.widget.CardView>
 
-
-                <TextView
-                    android:id="@+id/profile_blurb"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textIsSelectable="true"
-                    android:text="Blurb" />
-
-                <com.facebook.drawee.view.SimpleDraweeView
-                    android:id="@+id/profile_image"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_margin="5dp"
-                    android:minHeight="200dp"
-                    fresco:actualImageScaleType="fitCenter" />
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:layout_marginTop="@dimen/spacing_medium"
-                    android:layout_marginBottom="@dimen/spacing_medium">
-                    <TextView
-                        android:layout_width="0dp"
-                        android:layout_weight="1"
-                        android:layout_height="wrap_content"
-                        android:text="@string/joined"
-                        style="@style/Subheader1"/>
-                    <TextView
-                        android:id="@+id/joined_view"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        tools:text="today"/>
-                </LinearLayout>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:layout_marginBottom="@dimen/spacing_medium">
-                    <TextView
-                        android:layout_width="0dp"
-                        android:layout_weight="1"
-                        android:layout_height="wrap_content"
-                        android:text="@string/last_login"
-                        style="@style/Subheader1"/>
-                    <TextView
-                        android:id="@+id/last_login_view"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        tools:text="today"/>
-                </LinearLayout>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-                    <TextView
-                        android:layout_width="0dp"
-                        android:layout_weight="1"
-                        android:layout_height="wrap_content"
-                        android:text="@string/total_checkins"
-                        style="@style/Subheader1"/>
-                    <TextView
-                        android:id="@+id/total_checkins_view"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        tools:text="100"/>
-                </LinearLayout>
-            </LinearLayout>
-        </androidx.cardview.widget.CardView>
-
-        <androidx.cardview.widget.CardView
-            style="@style/CardView.Default"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-            <LinearLayout
-                style="@style/CardContent"
+            <androidx.cardview.widget.CardView
+                style="@style/CardView.Default"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
+                android:layout_height="wrap_content">
                 <LinearLayout
+                    style="@style/CardContent"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-
-                <TextView
-                    style="@style/CardTitle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/username"
-                    android:textStyle="bold" />
-                    <TextView
-                        android:layout_width="wrap_content"
+                    android:orientation="vertical">
+                    <LinearLayout
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:text=""
-                        android:id="@+id/username"
-                        android:layout_gravity="right"/>
-                </LinearLayout>
+                        android:orientation="horizontal">
 
-                <Button
+                        <TextView
+                            style="@style/CardTitle"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/username"
+                            android:textStyle="bold" />
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text=""
+                            android:id="@+id/username"
+                            android:layout_gravity="right"/>
+                    </LinearLayout>
+
+                    <Button
                         android:text="@string/copy"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:visibility="gone"
                         android:id="@+id/copy_username" />
-            </LinearLayout>
-        </androidx.cardview.widget.CardView>
+                </LinearLayout>
+            </androidx.cardview.widget.CardView>
 
 
-        <androidx.cardview.widget.CardView
-            style="@style/CardView.Default"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <LinearLayout
-                style="@style/CardContent"
+            <androidx.cardview.widget.CardView
+                style="@style/CardView.Default"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
+                android:layout_height="wrap_content">
 
-                <TextView
-                    style="@style/CardTitle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/battle_gear"
-                    android:textStyle="bold" />
-                <TableLayout
-                    android:id="@+id/equipment_table"
+                <LinearLayout
+                    style="@style/CardContent"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:shrinkColumns="1"
-                    android:stretchColumns="0" />
-            </LinearLayout>
-        </androidx.cardview.widget.CardView>
+                    android:orientation="vertical">
 
-        <androidx.cardview.widget.CardView
-            android:id="@+id/profile_costume_card"
-            style="@style/CardView.Default"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+                    <TextView
+                        style="@style/CardTitle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/battle_gear"
+                        android:textStyle="bold" />
+                    <TableLayout
+                        android:id="@+id/equipment_table"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:shrinkColumns="1"
+                        android:stretchColumns="0" />
+                </LinearLayout>
+            </androidx.cardview.widget.CardView>
 
-            <LinearLayout
-                style="@style/CardContent"
+            <androidx.cardview.widget.CardView
+                android:id="@+id/profile_costume_card"
+                style="@style/CardView.Default"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
+                android:layout_height="wrap_content">
 
-                <TextView
-                    style="@style/CardTitle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/costume"
-                    android:textStyle="bold" />
-                <TableLayout
-                    android:id="@+id/costume_table"
+                <LinearLayout
+                    style="@style/CardContent"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:shrinkColumns="1"
-                    android:stretchColumns="0" />
-            </LinearLayout>
-        </androidx.cardview.widget.CardView>
+                    android:orientation="vertical">
 
-        <androidx.cardview.widget.CardView
-            android:id="@+id/profile_attributes_card"
-            style="@style/CardView.Default"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:clickable="true"
-            android:foreground="?android:attr/selectableItemBackground">
+                    <TextView
+                        style="@style/CardTitle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/costume"
+                        android:textStyle="bold" />
+                    <TableLayout
+                        android:id="@+id/costume_table"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:shrinkColumns="1"
+                        android:stretchColumns="0" />
+                </LinearLayout>
+            </androidx.cardview.widget.CardView>
 
-            <LinearLayout
-                style="@style/CardContent"
+            <androidx.cardview.widget.CardView
+                android:id="@+id/profile_attributes_card"
+                style="@style/CardView.Default"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:weightSum="1">
+                android:clickable="true"
+                android:foreground="?android:attr/selectableItemBackground">
 
-                <TableLayout
-                    android:id="@+id/attributes_table"
+                <LinearLayout
+                    style="@style/CardContent"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:stretchColumns="0,1,2,3,4">
+                    android:orientation="vertical"
+                    android:weightSum="1">
 
-                    <TableRow android:layout_height="wrap_content">
-                        <!-- Headers -->
+                    <TableLayout
+                        android:id="@+id/attributes_table"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:stretchColumns="0,1,2,3,4">
 
-                        <LinearLayout
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content">
+                        <TableRow android:layout_height="wrap_content">
+                            <!-- Headers -->
 
-                            <TextView
-                                style="@style/CardTitle"
+                            <LinearLayout
                                 android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@string/attributes"
-                                android:textStyle="bold" />
+                                android:layout_height="wrap_content">
 
-                            <androidx.appcompat.widget.AppCompatImageView
+                                <TextView
+                                    style="@style/CardTitle"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="@string/attributes"
+                                    android:textStyle="bold" />
+
+                                <androidx.appcompat.widget.AppCompatImageView
                                     android:id="@+id/attributes_collapse_icon"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     app:srcCompat="@drawable/ic_keyboard_arrow_right_black_24dp"
                                     android:layout_gravity="bottom" />
 
-                        </LinearLayout>
+                            </LinearLayout>
 
-                        <TextView
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:text="STR" />
+                            <TextView
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:text="STR" />
 
-                        <TextView
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:text="INT" />
+                            <TextView
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:text="INT" />
 
-                        <TextView
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:text="CON" />
+                            <TextView
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:text="CON" />
 
-                        <TextView
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:text="PER" />
-                    </TableRow>
+                            <TextView
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:text="PER" />
+                        </TableRow>
 
-                </TableLayout>
-            </LinearLayout>
-        </androidx.cardview.widget.CardView>
+                    </TableLayout>
+                </LinearLayout>
+            </androidx.cardview.widget.CardView>
 
 
-        <androidx.cardview.widget.CardView
-            style="@style/CardView.Default"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <LinearLayout
-                style="@style/CardContent"
+            <androidx.cardview.widget.CardView
+                style="@style/CardView.Default"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:weightSum="1">
+                android:layout_height="wrap_content">
 
-                <TextView
-                    style="@style/CardTitle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/profile_pets_and_mounts"
-                    android:textStyle="bold" />
-
-                <TableLayout
+                <LinearLayout
+                    style="@style/CardContent"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:stretchColumns="0,1">
+                    android:orientation="vertical"
+                    android:weightSum="1">
 
-                    <TableRow
+                    <TextView
+                        style="@style/CardTitle"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:gravity="center_vertical">
+                        android:text="@string/profile_pets_and_mounts"
+                        android:textStyle="bold" />
 
-                        <TextView
-                            android:layout_width="match_parent"
+                    <TableLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:stretchColumns="0,1">
+
+                        <TableRow
                             android:layout_height="wrap_content"
-                            android:text="@string/profile_pets_found" />
+                            android:gravity="center_vertical">
 
-                        <TextView
-                            android:id="@+id/profile_pets_found_count"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            tools:text="#" />
-                        <com.facebook.drawee.view.SimpleDraweeView
-                            android:id="@+id/current_pet_drawee"
-                            android:layout_width="40dp"
-                            android:layout_height="40dp"
-                            fresco:actualImageScaleType="centerCrop"/>>
-                    </TableRow>
+                            <TextView
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:text="@string/profile_pets_found" />
 
-                    <TableRow android:layout_height="wrap_content"
-                        android:gravity="center_vertical">
+                            <TextView
+                                android:id="@+id/profile_pets_found_count"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                tools:text="#" />
+                            <com.facebook.drawee.view.SimpleDraweeView
+                                android:id="@+id/current_pet_drawee"
+                                android:layout_width="40dp"
+                                android:layout_height="40dp"
+                                fresco:actualImageScaleType="centerCrop"/>>
+                        </TableRow>
 
-                        <TextView
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:text="@string/profile_mounts_tamed" />
+                        <TableRow android:layout_height="wrap_content"
+                            android:gravity="center_vertical">
 
-                        <TextView
-                            android:id="@+id/profile_mounts_tamed_count"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            tools:text="#" />
-                        <com.facebook.drawee.view.SimpleDraweeView
-                            android:id="@+id/current_mount_drawee"
-                            android:layout_width="40dp"
-                            android:layout_height="40dp"
-                            fresco:actualImageScaleType="centerCrop"/>
-                    </TableRow>
-                </TableLayout>
-            </LinearLayout>
-        </androidx.cardview.widget.CardView>
+                            <TextView
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:text="@string/profile_mounts_tamed" />
+
+                            <TextView
+                                android:id="@+id/profile_mounts_tamed_count"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                tools:text="#" />
+                            <com.facebook.drawee.view.SimpleDraweeView
+                                android:id="@+id/current_mount_drawee"
+                                android:layout_width="40dp"
+                                android:layout_height="40dp"
+                                fresco:actualImageScaleType="centerCrop"/>
+                        </TableRow>
+                    </TableLayout>
+                </LinearLayout>
+            </androidx.cardview.widget.CardView>
 
 
-        <androidx.cardview.widget.CardView
-            android:id="@+id/profile_achievements_card"
-            style="@style/CardView.Default"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <LinearLayout
-                style="@style/CardContent"
+            <androidx.cardview.widget.CardView
+                android:id="@+id/profile_achievements_card"
+                style="@style/CardView.Default"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
+                android:layout_height="wrap_content">
 
-                <TextView
-                    style="@style/CardTitle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/profile_achievements"
-                    android:textStyle="bold" />
-
-                <ProgressBar
-                    android:id="@+id/avatar_achievements_progress"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:indeterminate="true" />
-
-                <com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport
-                    android:id="@+id/recyclerView"
+                <LinearLayout
+                    style="@style/CardContent"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:scrollbarSize="3dp"
-                    android:scrollbarThumbVertical="@color/scrollbarThumb"
-                    android:scrollbars="vertical" />
-            </LinearLayout>
-        </androidx.cardview.widget.CardView>
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
 
-    </LinearLayout>
-</ScrollView>
+                    <TextView
+                        style="@style/CardTitle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/profile_achievements"
+                        android:textStyle="bold" />
+
+                    <ProgressBar
+                        android:id="@+id/avatar_achievements_progress"
+                        android:layout_width="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:indeterminate="true" />
+
+                    <com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport
+                        android:id="@+id/recyclerView"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:scrollbarSize="3dp"
+                        android:scrollbarThumbVertical="@color/scrollbarThumb"
+                        android:scrollbars="vertical" />
+                </LinearLayout>
+            </androidx.cardview.widget.CardView>
+
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/mipmap-hdpi/ic_launcher.png b/Habitica/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index ffe53ef51..000000000
Binary files a/Habitica/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/Habitica/res/mipmap-hdpi/ic_launcher.webp b/Habitica/res/mipmap-hdpi/ic_launcher.webp
new file mode 100644
index 000000000..4f052bb67
Binary files /dev/null and b/Habitica/res/mipmap-hdpi/ic_launcher.webp differ
diff --git a/Habitica/res/mipmap-hdpi/ic_launcher_round.png b/Habitica/res/mipmap-hdpi/ic_launcher_round.png
deleted file mode 100644
index 01d6c3e7a..000000000
Binary files a/Habitica/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ
diff --git a/Habitica/res/mipmap-hdpi/ic_launcher_round.webp b/Habitica/res/mipmap-hdpi/ic_launcher_round.webp
new file mode 100644
index 000000000..066112991
Binary files /dev/null and b/Habitica/res/mipmap-hdpi/ic_launcher_round.webp differ
diff --git a/Habitica/res/mipmap-mdpi/ic_launcher.png b/Habitica/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index 8ed1da691..000000000
Binary files a/Habitica/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/Habitica/res/mipmap-mdpi/ic_launcher.webp b/Habitica/res/mipmap-mdpi/ic_launcher.webp
new file mode 100644
index 000000000..b87d05363
Binary files /dev/null and b/Habitica/res/mipmap-mdpi/ic_launcher.webp differ
diff --git a/Habitica/res/mipmap-mdpi/ic_launcher_round.png b/Habitica/res/mipmap-mdpi/ic_launcher_round.png
deleted file mode 100644
index 2725e734f..000000000
Binary files a/Habitica/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ
diff --git a/Habitica/res/mipmap-mdpi/ic_launcher_round.webp b/Habitica/res/mipmap-mdpi/ic_launcher_round.webp
new file mode 100644
index 000000000..ea8d0062b
Binary files /dev/null and b/Habitica/res/mipmap-mdpi/ic_launcher_round.webp differ
diff --git a/Habitica/res/mipmap-xhdpi/ic_launcher.png b/Habitica/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index d5167e001..000000000
Binary files a/Habitica/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/Habitica/res/mipmap-xhdpi/ic_launcher.webp b/Habitica/res/mipmap-xhdpi/ic_launcher.webp
new file mode 100644
index 000000000..7dddfeb13
Binary files /dev/null and b/Habitica/res/mipmap-xhdpi/ic_launcher.webp differ
diff --git a/Habitica/res/mipmap-xhdpi/ic_launcher_round.png b/Habitica/res/mipmap-xhdpi/ic_launcher_round.png
deleted file mode 100644
index 250b0d2cd..000000000
Binary files a/Habitica/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/Habitica/res/mipmap-xhdpi/ic_launcher_round.webp b/Habitica/res/mipmap-xhdpi/ic_launcher_round.webp
new file mode 100644
index 000000000..618438ce0
Binary files /dev/null and b/Habitica/res/mipmap-xhdpi/ic_launcher_round.webp differ
diff --git a/Habitica/res/mipmap-xxhdpi/ic_launcher.png b/Habitica/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 97568e957..000000000
Binary files a/Habitica/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/Habitica/res/mipmap-xxhdpi/ic_launcher.webp b/Habitica/res/mipmap-xxhdpi/ic_launcher.webp
new file mode 100644
index 000000000..0debd86b5
Binary files /dev/null and b/Habitica/res/mipmap-xxhdpi/ic_launcher.webp differ
diff --git a/Habitica/res/mipmap-xxhdpi/ic_launcher_round.png b/Habitica/res/mipmap-xxhdpi/ic_launcher_round.png
deleted file mode 100644
index 086b4bbde..000000000
Binary files a/Habitica/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/Habitica/res/mipmap-xxhdpi/ic_launcher_round.webp b/Habitica/res/mipmap-xxhdpi/ic_launcher_round.webp
new file mode 100644
index 000000000..c56f1c90f
Binary files /dev/null and b/Habitica/res/mipmap-xxhdpi/ic_launcher_round.webp differ
diff --git a/Habitica/res/mipmap-xxxhdpi/ic_launcher.png b/Habitica/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index 094734b7e..000000000
Binary files a/Habitica/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/Habitica/res/mipmap-xxxhdpi/ic_launcher.webp b/Habitica/res/mipmap-xxxhdpi/ic_launcher.webp
new file mode 100644
index 000000000..afcc16580
Binary files /dev/null and b/Habitica/res/mipmap-xxxhdpi/ic_launcher.webp differ
diff --git a/Habitica/res/mipmap-xxxhdpi/ic_launcher_round.png b/Habitica/res/mipmap-xxxhdpi/ic_launcher_round.png
deleted file mode 100644
index 86c9c0360..000000000
Binary files a/Habitica/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/Habitica/res/mipmap-xxxhdpi/ic_launcher_round.webp b/Habitica/res/mipmap-xxxhdpi/ic_launcher_round.webp
new file mode 100644
index 000000000..0f31f5c50
Binary files /dev/null and b/Habitica/res/mipmap-xxxhdpi/ic_launcher_round.webp differ
diff --git a/Habitica/res/xml/network_security_config.xml b/Habitica/res/xml/network_security_config.xml
index a11c6d527..f808081d4 100644
--- a/Habitica/res/xml/network_security_config.xml
+++ b/Habitica/res/xml/network_security_config.xml
@@ -6,6 +6,6 @@
         </trust-anchors>
     </debug-overrides>
     <domain-config cleartextTrafficPermitted="true">
-        <domain includeSubdomains="true">192.168.178.51</domain>
+        <domain includeSubdomains="true">192.168.178.52</domain>
     </domain-config>
 </network-security-config>
\ No newline at end of file
diff --git a/Habitica/src/main/assets/HelveticaNeue.ttc b/Habitica/src/main/assets/HelveticaNeue.ttc
deleted file mode 100644
index 5f7306b5f..000000000
Binary files a/Habitica/src/main/assets/HelveticaNeue.ttc and /dev/null differ
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIcons.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIcons.java
index 030303e6b..0221edf7a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIcons.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIcons.java
@@ -1,27 +1,27 @@
 package com.habitrpg.android.habitica.ui.views;
 
 import android.content.Context;
-import android.graphics.Paint;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffXfermode;
-import android.graphics.Matrix;
-import android.graphics.PointF;
-import android.graphics.RectF;
-import android.graphics.Shader;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.BitmapShader;
 import android.graphics.BlurMaskFilter;
 import android.graphics.Canvas;
 import android.graphics.Color;
-import android.graphics.Path;
 import android.graphics.DashPathEffect;
-import android.graphics.Typeface;
+import android.graphics.Matrix;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.PointF;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffXfermode;
+import android.graphics.RectF;
+import android.graphics.Shader;
 import android.text.Layout;
 import android.text.StaticLayout;
 import android.text.TextPaint;
-import java.util.Stack;
+
 import java.lang.ref.WeakReference;
+import java.util.Stack;
 
 
 
@@ -10324,7 +10324,6 @@ public class HabiticaIcons {
         labelTextPaint.reset();
         labelTextPaint.setFlags(Paint.ANTI_ALIAS_FLAG);
         labelTextPaint.setColor(crestColor5);
-        labelTextPaint.setTypeface(Typeface.createFromAsset(context.getAssets(), "HelveticaNeue.ttc"));
         labelTextPaint.setTextSize(12f);
         StaticLayout labelStaticLayout = CacheForGuildCrest.labelStaticLayout.get((int) labelRect.width(), Layout.Alignment.ALIGN_CENTER, memberCountLabel, labelTextPaint);
         canvas.save();