diff --git a/Habitica/res/drawable-hdpi/support_faq.png b/Habitica/res/drawable-hdpi/support_faq.png
new file mode 100644
index 000000000..13c292aec
Binary files /dev/null and b/Habitica/res/drawable-hdpi/support_faq.png differ
diff --git a/Habitica/res/drawable-mdpi/support_faq.png b/Habitica/res/drawable-mdpi/support_faq.png
new file mode 100644
index 000000000..6d5649a22
Binary files /dev/null and b/Habitica/res/drawable-mdpi/support_faq.png differ
diff --git a/Habitica/res/drawable-xhdpi/support_faq.png b/Habitica/res/drawable-xhdpi/support_faq.png
new file mode 100644
index 000000000..100c4469c
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/support_faq.png differ
diff --git a/Habitica/res/drawable-xxhdpi/support_faq.png b/Habitica/res/drawable-xxhdpi/support_faq.png
new file mode 100644
index 000000000..60fa78af8
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/support_faq.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/support_faq.png b/Habitica/res/drawable-xxxhdpi/support_faq.png
new file mode 100644
index 000000000..31081bede
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/support_faq.png differ
diff --git a/Habitica/res/drawable/rounded_purple_dark_square.xml b/Habitica/res/drawable/rounded_purple_dark_square.xml
new file mode 100644
index 000000000..eebd55800
--- /dev/null
+++ b/Habitica/res/drawable/rounded_purple_dark_square.xml
@@ -0,0 +1,16 @@
+<?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/brand_300" >
+    </solid>
+
+    <!-- Here is the corner radius -->
+    <corners
+        android:radius="5dp"   >
+    </corners>
+
+</shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/support_info_lower_bg.xml b/Habitica/res/drawable/support_info_lower_bg.xml
new file mode 100644
index 000000000..709e8e69d
--- /dev/null
+++ b/Habitica/res/drawable/support_info_lower_bg.xml
@@ -0,0 +1,15 @@
+<?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/brand_300" >
+    </solid>
+
+    <!-- Here is the corner radius -->
+    <corners android:bottomLeftRadius="4dp" android:bottomRightRadius="4dp">
+    </corners>
+
+</shape>
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_faq_detail.xml b/Habitica/res/layout/fragment_faq_detail.xml
deleted file mode 100644
index a322c7e9c..000000000
--- a/Habitica/res/layout/fragment_faq_detail.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:scrollbarSize="3dp"
-    android:scrollbarThumbVertical="@color/scrollbarThumb"
-    android:scrollbars="vertical">
-
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        >
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:id="@+id/questionTextView"
-            android:layout_gravity="center_horizontal"
-            android:padding="@dimen/card_padding"/>
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:id="@+id/answerTextView"
-            android:layout_gravity="center_horizontal"
-            android:paddingLeft="@dimen/card_padding"
-            android:paddingStart="@dimen/card_padding"
-            android:paddingEnd="@dimen/card_padding"
-            android:paddingRight="@dimen/card_padding"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            />
-    </LinearLayout>
-</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_faq_overview.xml b/Habitica/res/layout/fragment_faq_overview.xml
new file mode 100644
index 000000000..025f232fe
--- /dev/null
+++ b/Habitica/res/layout/fragment_faq_overview.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+<LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:background="@color/white">
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/game_mechanics"
+        style="@style/SectionHeaderCaps"
+        android:layout_marginTop="@dimen/spacing_large"/>
+
+    <com.habitrpg.android.habitica.ui.views.SupportCollapsibleSection
+        android:id="@+id/health_section"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:subtitle="HP"
+        app:title="@string/health_points"
+        app:titleColor="@color/red_10"
+        android:layout_marginStart="@dimen/spacing_medium"
+        android:layout_marginEnd="@dimen/spacing_medium"
+        android:layout_marginBottom="@dimen/spacing_medium"
+        android:layout_marginTop="@dimen/spacing_medium"
+        app:description="@string/health_description"/>
+    <com.habitrpg.android.habitica.ui.views.SupportCollapsibleSection
+        android:id="@+id/experience_section"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:subtitle="EXP"
+        app:title="@string/experience_points"
+        app:titleColor="@color/yellow_50"
+        android:layout_marginStart="@dimen/spacing_medium"
+        android:layout_marginEnd="@dimen/spacing_medium"
+        android:layout_marginBottom="@dimen/spacing_medium"
+        app:description="@string/experience_description"/>
+    <com.habitrpg.android.habitica.ui.views.SupportCollapsibleSection
+        android:id="@+id/mana_section"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:subtitle="MP"
+        app:title="@string/mana_points"
+        app:titleColor="@color/blue_10"
+        android:layout_marginStart="@dimen/spacing_medium"
+        android:layout_marginEnd="@dimen/spacing_medium"
+        android:layout_marginBottom="@dimen/spacing_medium"
+        app:description="@string/mana_description"/>
+    <com.habitrpg.android.habitica.ui.views.SupportCollapsibleSection
+        android:id="@+id/gold_section"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:subtitle="@string/currency"
+        app:title="@string/gold_capitalilzed"
+        app:titleColor="@color/orange_10"
+        android:layout_marginStart="@dimen/spacing_medium"
+        android:layout_marginEnd="@dimen/spacing_medium"
+        android:layout_marginBottom="@dimen/spacing_medium"
+        app:description="@string/gold_description"/>
+    <com.habitrpg.android.habitica.ui.views.SupportCollapsibleSection
+        android:id="@+id/gems_section"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:subtitle="@string/premium_currency"
+        app:title="@string/gems"
+        app:titleColor="@color/teal_100"
+        android:layout_marginStart="@dimen/spacing_medium"
+        android:layout_marginEnd="@dimen/spacing_medium"
+        android:layout_marginBottom="@dimen/spacing_medium"
+        app:description="@string/gems_description"/>
+    <com.habitrpg.android.habitica.ui.views.SupportCollapsibleSection
+        android:id="@+id/hourglasses_section"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:subtitle="@string/subscriber_currency"
+        app:title="@string/mystic_hourglasses"
+        app:titleColor="@color/brand_300"
+        android:layout_marginStart="@dimen/spacing_medium"
+        android:layout_marginEnd="@dimen/spacing_medium"
+        android:layout_marginBottom="@dimen/spacing_medium"
+        app:description="@string/hourglasses_description"/>
+    <com.habitrpg.android.habitica.ui.views.SupportCollapsibleSection
+        android:id="@+id/stats_section"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:subtitle="STR, CON, INT, PER"
+        app:title="@string/stat_allocation"
+        app:titleColor="#7f3300"
+        android:layout_marginStart="@dimen/spacing_medium"
+        android:layout_marginEnd="@dimen/spacing_medium"
+        android:layout_marginBottom="@dimen/spacing_medium"
+        app:description="@string/stat_description"/>
+
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/common_questions"
+        style="@style/SectionHeaderCaps"
+        android:layout_marginTop="@dimen/spacing_large"/>
+    <LinearLayout
+        android:id="@+id/faq_linear_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" />
+    <TextView
+        android:id="@+id/more_help_text_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/spacing_large"
+        android:paddingTop="@dimen/spacing_large"
+        android:paddingStart="@dimen/spacing_large"
+        android:paddingEnd="@dimen/spacing_large"
+        android:paddingBottom="@dimen/spacing_large"
+        android:background="@color/gray_700"/>
+</LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_support_bug_fix.xml b/Habitica/res/layout/fragment_support_bug_fix.xml
new file mode 100644
index 000000000..8fe130ffc
--- /dev/null
+++ b/Habitica/res/layout/fragment_support_bug_fix.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white">
+<TextView
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:text="@string/support_bug_title"
+    android:textSize="13sp"
+    android:textColor="@color/gray_200"
+    android:paddingTop="13dp"
+    android:paddingBottom="13dp"
+    android:paddingStart="24dp"
+    android:paddingEnd="24dp"
+    android:layout_margin="@dimen/spacing_medium"
+    android:gravity="center"
+    android:background="@color/gray_700"/>
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/common_fixes"
+        android:layout_marginStart="@dimen/spacing_large"
+        style="@style/SectionHeaderCaps"
+        />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="12dp"
+        android:orientation="vertical"
+        android:background="@drawable/layout_rounded_bg_gray_700"
+        android:layout_margin="@dimen/spacing_medium">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/clear_cache"
+            android:textColor="@color/black"
+            style="@style/Body1"
+            android:layout_marginBottom="4dp"/>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/clear_cache_description"
+            style="@style/Body2"/>
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="12dp"
+        android:orientation="vertical"
+        android:background="@drawable/layout_rounded_bg_gray_700"
+        android:layout_margin="@dimen/spacing_medium">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/manual_sync_restart"
+            android:textColor="@color/black"
+            style="@style/Body1"
+            android:layout_marginBottom="4dp"/>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/manual_sync_restart_description"
+            style="@style/Body2"/>
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="12dp"
+        android:orientation="vertical"
+        android:background="@drawable/layout_rounded_bg_gray_700"
+        android:layout_margin="@dimen/spacing_medium">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/update_app"
+            android:textColor="@color/black"
+            style="@style/Body1"
+            android:layout_marginBottom="4dp"/>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/update_app_description"
+            style="@style/Body2"/>
+    </LinearLayout>
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/need_more_help"
+        android:gravity="center"
+        android:textStyle="bold"
+        android:textColor="@color/brand_300"
+        android:textSize="16sp"
+        android:layout_marginTop="@dimen/spacing_large"
+        />
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/send_bug_prompt"
+        android:textColor="@color/gray_300"
+        android:gravity="center"
+        android:textSize="14sp"
+        android:layout_marginTop="@dimen/spacing_small"
+        android:layout_marginBottom="@dimen/spacing_large"/>
+    <Button
+        android:id="@+id/report_bug_button"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        style="@style/HabiticaButton.Purple"
+        android:text="@string/report_bug"
+        android:elevation="0dp"
+        android:layout_marginStart="@dimen/spacing_large"
+        android:layout_marginEnd="@dimen/spacing_large" />
+</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_support_main.xml b/Habitica/res/layout/fragment_support_main.xml
new file mode 100644
index 000000000..dcce5be30
--- /dev/null
+++ b/Habitica/res/layout/fragment_support_main.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/layout_rounded_bg_gray_700">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:background="@color/white"
+        android:paddingTop="@dimen/spacing_large"
+        android:paddingBottom="@dimen/spacing_large">
+        <LinearLayout
+            android:id="@+id/using_habitica_wrapper"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/spacing_large"
+            android:layout_marginEnd="@dimen/spacing_large"
+            android:gravity="center_horizontal"
+            android:paddingTop="@dimen/spacing_large"
+            android:background="@drawable/layout_rounded_bg_gray_700"
+            android:orientation="vertical">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/using_habitica"
+                android:layout_marginStart="@dimen/spacing_large"
+                android:layout_marginEnd="@dimen/spacing_large"
+                android:textSize="16sp"
+                android:textStyle="bold"
+                android:textColor="@color/brand_300"
+                />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/using_habitica_description"
+                android:textSize="12sp"
+                android:textColor="@color/gray_300"
+                android:layout_marginStart="40dp"
+                android:layout_marginEnd="40dp"
+                android:gravity="center"
+                android:layout_marginTop="4dp"
+                android:layout_marginBottom="10dp"
+                />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:text="@string/lets_go"
+                android:gravity="center"
+                android:layout_marginStart="@dimen/spacing_large"
+                android:layout_marginEnd="@dimen/spacing_large"
+                android:background="@drawable/support_info_lower_bg"
+                android:textColor="@color/white"
+                android:textAllCaps="true"
+                android:textStyle="bold"
+                android:textSize="12sp"
+                />
+        </LinearLayout>
+        <LinearLayout
+            android:id="@+id/bugs_fixes_wrapper"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/spacing_large"
+            android:layout_marginEnd="@dimen/spacing_large"
+            android:gravity="center_horizontal"
+            android:paddingTop="@dimen/spacing_large"
+            android:layout_marginTop="@dimen/spacing_medium"
+            android:background="@drawable/layout_rounded_bg_gray_700"
+            android:orientation="vertical">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/bugs_fixes"
+                android:layout_marginStart="@dimen/spacing_large"
+                android:layout_marginEnd="@dimen/spacing_large"
+                android:textSize="16sp"
+                android:textStyle="bold"
+                android:textColor="@color/brand_300"
+                />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/bugs_fixes_description"
+                android:textSize="12sp"
+                android:textColor="@color/gray_300"
+                android:layout_marginStart="40dp"
+                android:layout_marginEnd="40dp"
+                android:gravity="center"
+                android:layout_marginTop="4dp"
+                android:layout_marginBottom="10dp"
+                />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:text="@string/get_help"
+                android:gravity="center"
+                android:layout_marginStart="@dimen/spacing_large"
+                android:layout_marginEnd="@dimen/spacing_large"
+                android:background="@drawable/support_info_lower_bg"
+                android:textColor="@color/white"
+                android:textAllCaps="true"
+                android:textStyle="bold"
+                android:textSize="12sp"
+                />
+        </LinearLayout>
+        <LinearLayout
+            android:id="@+id/suggestions_feedback_wrapper"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/spacing_medium"
+            android:layout_marginStart="@dimen/spacing_large"
+            android:layout_marginEnd="@dimen/spacing_large"
+            android:background="@drawable/layout_rounded_bg_gray_700"
+            android:gravity="center_horizontal"
+            android:paddingTop="@dimen/spacing_large"
+            android:orientation="vertical">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/suggestions_feedback"
+                android:layout_marginStart="@dimen/spacing_large"
+                android:layout_marginEnd="@dimen/spacing_large"
+                android:textSize="16sp"
+                android:textStyle="bold"
+                android:textColor="@color/brand_300"
+                />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/suggestions_feedback_description"
+                android:textSize="12sp"
+                android:textColor="@color/gray_300"
+                android:layout_marginStart="40dp"
+                android:layout_marginEnd="40dp"
+                android:gravity="center"
+                android:layout_marginTop="4dp"
+                android:layout_marginBottom="10dp"
+                />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:text="@string/contact_us"
+                android:gravity="center"
+                android:layout_marginStart="@dimen/spacing_large"
+                android:layout_marginEnd="@dimen/spacing_large"
+                android:background="@drawable/support_info_lower_bg"
+                android:textColor="@color/white"
+                android:textStyle="bold"
+                android:textAllCaps="true"
+                android:textSize="12sp"
+                />
+        </LinearLayout>
+    </LinearLayout>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/gray_500"/>
+    <Button
+        android:id="@+id/reset_tutorial_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        style="@style/HabiticaButton.Blue"
+        android:text="@string/reset_walkthrough"
+        android:layout_margin="@dimen/spacing_large"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/support_collapsible_section.xml b/Habitica/res/layout/support_collapsible_section.xml
new file mode 100644
index 000000000..d2a0216aa
--- /dev/null
+++ b/Habitica/res/layout/support_collapsible_section.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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"
+    android:layout_height="wrap_content"
+    tools:parentTag="android.widget.LinearLayout">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/spacing_medium"
+        android:layout_marginBottom="@dimen/spacing_medium"
+        android:gravity="center_vertical">
+        <ImageView
+            android:id="@+id/icon_view"
+            android:layout_width="28dp"
+            android:layout_height="28dp"
+            android:layout_marginStart="@dimen/spacing_large"
+            android:layout_marginEnd="@dimen/spacing_large"
+            />
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+            <TextView
+                android:id="@+id/title_view"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="14sp"
+                android:textStyle="bold"
+                tools:text="Title"/>
+            <TextView
+                android:id="@+id/subtitle_view"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/gray_200"
+                android:textSize="14sp"
+                tools:text="Subtitle" />
+        </LinearLayout>
+        <Space
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content" />
+        <ImageView
+            android:id="@+id/caret_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_keyboard_arrow_down_black_24dp"
+            android:layout_marginEnd="@dimen/spacing_large"/>
+    </LinearLayout>
+    <TextView android:id="@+id/description_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/spacing_large"
+        android:layout_marginEnd="@dimen/spacing_large"
+        android:layout_marginTop="@dimen/spacing_medium"
+        android:layout_marginBottom="12dp"
+        android:visibility="gone"
+        />
+</merge>
\ No newline at end of file
diff --git a/Habitica/res/layout/support_faq_item.xml b/Habitica/res/layout/support_faq_item.xml
new file mode 100644
index 000000000..8d78e746b
--- /dev/null
+++ b/Habitica/res/layout/support_faq_item.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical"
+    android:minHeight="40dp">
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/support_faq"
+        android:layout_marginLeft="26dp"
+        android:layout_marginRight="29dp"/>
+    <TextView
+        android:id="@+id/text_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="14sp"
+        android:textColor="@color/gray_100"
+        tools:text="Title"
+        android:layout_marginRight="@dimen/spacing_large"
+        android:layout_marginTop="@dimen/spacing_medium"
+        android:layout_marginBottom="@dimen/spacing_medium"
+        />
+</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/navigation/navigation.xml b/Habitica/res/navigation/navigation.xml
index ea8c338c2..09414ef2d 100644
--- a/Habitica/res/navigation/navigation.xml
+++ b/Habitica/res/navigation/navigation.xml
@@ -202,12 +202,9 @@
         android:label="@string/sidebar_news" />
     <fragment
         android:id="@+id/FAQOverviewFragment"
-        android:name="com.habitrpg.android.habitica.ui.fragments.faq.FAQOverviewFragment"
+        android:name="com.habitrpg.android.habitica.ui.fragments.support.FAQOverviewFragment"
         android:label="@string/sidebar_help" >
         <deepLink app:uri="habitica.com/static/faq" />
-        <action
-            android:id="@+id/openFAQDetail"
-            app:destination="@id/FAQDetailFragment" />
     </fragment>
     <fragment
         android:id="@+id/aboutFragment"
@@ -246,14 +243,6 @@
             android:id="@+id/openGuildDetail"
             app:destination="@id/guildFragment" />
     </fragment>
-    <fragment
-        android:id="@+id/FAQDetailFragment"
-        android:name="com.habitrpg.android.habitica.ui.fragments.faq.FAQDetailFragment"
-        android:label="@string/sidebar_help" >
-        <argument
-            android:name="position"
-            app:argType="integer" />
-    </fragment>
     <fragment
         android:id="@+id/avatarCustomizationFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.inventory.customization.AvatarCustomizationFragment"
@@ -403,4 +392,16 @@
         android:id="@+id/timeTravelersShopFragment"
         android:name="com.habitrpg.android.habitica.ui.fragments.inventory.shops.TimeTravelersShopFragment"
         android:label="@string/timeTravelers" />
+    <fragment
+        android:id="@+id/supportMainFragment"
+        android:name="com.habitrpg.android.habitica.ui.fragments.support.SupportMainFragment"
+        android:label="SupportMainFragment" >
+        <action
+            android:id="@+id/showFAQFragment"
+            app:destination="@id/FAQOverviewFragment" />
+    </fragment>
+    <fragment
+        android:id="@+id/bugFixFragment"
+        android:name="com.habitrpg.android.habitica.ui.fragments.support.BugFixFragment"
+        android:label="BugFixFragment" />
 </navigation>
\ No newline at end of file
diff --git a/Habitica/res/values/attrs.xml b/Habitica/res/values/attrs.xml
index 4dd467210..3893f1ae4 100644
--- a/Habitica/res/values/attrs.xml
+++ b/Habitica/res/values/attrs.xml
@@ -14,6 +14,7 @@
     <attr name="statsColor" format="color" />
     <attr name="statsTitle" format="string" />
     <attr name="title" format="string" />
+    <attr name="description" format="string" />
     <attr name="iconDrawable" format="integer" />
     <attr name="identifier" format="string" />
     <attr name="hasLightBackground" format="boolean" />
@@ -61,7 +62,7 @@
         <attr name="barIconDrawable" format="integer" />
         <attr name="barHeight" format="dimension" />
         <attr name="lightBackground" format="boolean" />
-        <attr name="description" format="string" />
+        <attr name="description" />
         <attr name="labelSpacing" format="dimension" />
     </declare-styleable>
     <declare-styleable name="HabiticaProgressBar">
@@ -129,4 +130,11 @@
     <declare-styleable name="EquipmentOverviewItem">
         <attr name="title" />
     </declare-styleable>
+    <declare-styleable name="SupportCollapsibleSection">
+        <attr name="title" />
+        <attr name="titleColor" format="color" />
+        <attr name="subtitle" format="string" />
+        <attr name="description" />
+        <attr name="iconDrawable" />
+    </declare-styleable>
 </resources>
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 600388fc8..61d8df76b 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -344,6 +344,7 @@
     <string name="create_account_short">create an account</string>
     <string name="successful_purchase">Purchased %1$s</string>
     <string name="gold_plural">gold</string>
+    <string name="gold_capitalilzed">Gold</string>
     <string name="chat_message_copied">Message copied to Clipboard</string>
     <string name="edit_tag_btn_edit">Edit</string>
     <string name="confirm_delete_tag_title">Are you sure?</string>
@@ -954,7 +955,45 @@
     <string name="unlock_level_short">Level %d</string>
     <string name="not_participating">You are not participating</string>
     <string name="quest_completed">Quest completed!</string>
+    <string name="using_habitica">Using Habitica</string>
+    <string name="using_habitica_description">Confused? We’ll go over the basics to get you up to speed.</string>
+    <string name="suggestions_feedback_description">Have input on how features could work better or an idea for something new? Tell us!</string>
+    <string name="contact_us">Contact Us</string>
+    <string name="get_help">Get Help</string>
+    <string name="suggestions_feedback"><![CDATA[Suggestions & Feedback]]></string>
+    <string name="bugs_fixes"><![CDATA[Bugs & Fixes]]></string>
+    <string name="bugs_fixes_description">Did something go wrong? Check for answers here or reach out to us for help.</string>
+    <string name="lets_go">Let\'s Go</string>
+    <string name="support_bug_title">We’re constantly trying to make our apps better based on player feedback but sometimes a few bugs pop up…</string>
+    <string name="common_fixes">Common Fixes</string>
+    <string name="send_bug_prompt">Send a bug report to us and we’ll get back to you!</string>
+    <string name="overview">Overview</string>
+    <string name="how_best_habitica">Not sure how to best use Habitica?</string>
+    <string name="stats_currency"><![CDATA[Stats & Currency]]></string>
+    <string name="health_points">Health Points</string>
+    <string name="health_description">This represents your avatars life. Missing a Daily or doing a negative Habit **reduces your HP**.\n\n**Regain HP** by completing tasks, using a Health Potion, or a healing ability.\n\nIf your **HP reaches 0** your avatar will pass out (lose a level, all Gold, and one piece of equipment). Lost equipment can be re-purchased.</string>
+    <string name="experience_points">Experience Points</string>
+    <string name="experience_description">Experience points represent your progress and allows you to level up. You’ll mainly **gain EXP** from completing tasks or quests.\n\nHigher difficulty or red colored tasks will give you **more EXP**. The **Intelligence** stat also raises your EXP gain.</string>
+    <string name="mana_points">Mana Points</string>
+    <string name="gold_description">Gold is the **main form of currency** within Habitica and allows you to buy certain gear, quests, items, or even custom rewards you make for yourself.\n\n**Earn Gold** through completing tasks or quests. **Perception** raises the amount of Gold you earn. Rogue’s can also use an ability to get more Gold.\n\nIf you subscribe to Habitica, you can even use Gold to purchase Gems.</string>
+    <string name="mana_description">Mana points are unlocked with the class system at level 10 and allow you to **use Skills**.\n\nSome **MP is restored** naturally every day, but you can regain more by completing tasks or using a Mage ability.</string>
+    <string name="stat_allocation">Stat Allocation</string>
+    <string name="stat_description">All Habitica characters have four stats that affect the gameplay aspects of Habitica.\n\n**Strength (STR)** affects critical hits and raises damage done to a Quest Boss. Mainly for Warriors and Rogues.\n\n**Constitution (CON)** raises your HP and makes you take less damage. Mainly for Healers and Warriors.\n\n**Intelligence (INT)** raises the amount of EXP you earn and gives you more Mana. Mainly for Mages and Healers.\n\n**Perception (PER)** increases the gold you earn and the rate of finding items. Mainly for Rogues and Mages.\nnAfter level 10, you earn 1 Stat Point every level you gain that you can put into any stat you’d like. You can also equip gear that has different combinations of stat boosts.</string>
 
     <string name="standard"> Standard </string>
+    <string name="premium_currency">Premium Currency</string>
+    <string name="currency">Currency</string>
+    <string name="gems_description">Gems are a currency purchased with real money that allow you to buy extra content within Habitica and are one of the main source of financial support for the Habitica team alongside subscriptions.\n\nAll content purchased through Gems is purely cosmetic or can be obtained for free with time.\n\nYou can also receive Gems through gifts, Challenge prizes, contributing work to Habitica, or subscribing.</string>
+    <string name="common_questions">Common Questions</string>
+    <string name="game_mechanics">Game Mechanics</string>
+    <string name="subscriber_currency">Subscriber Currency</string>
+    <string name="mystic_hourglasses">Mystic Hourglasses</string>
+    <string name="hourglasses_description">Mystic Hourglasses are an extremely rare form of currency you can only receive for subscribing to Habitica. They are used in the Time Traveler’s shop to buy past gear sets, pets, mounts, animated backgrounds, or even special quests.\n\nYou can receive up to four Mystic Hourglasses a year. The time they are rewarded is based on your subscription renewal schedule. They are sent out on the first day of a new month after your last subscription payment that qualified you for an hourglass. See the [Subscription] page for more details.</string>
+    <string name="clear_cache">Clear your Cache</string>
+    <string name="clear_cache_description"><![CDATA[To clear your cache, open your phone’s Settings app. Go to Storage > Apps >  Habitica, then tap Clear Cache.]]></string>
+    <string name="manual_sync_restart">Manual Sync or Restart</string>
+    <string name="manual_sync_restart_description">Sometimes the app won’t automatically update content. Try pulling to refresh or force closing the app and reopening it.</string>
+    <string name="update_app">Update the App</string>
+    <string name="update_app_description">We’re constantly pushing out new fixes, so be sure to check the Play Store to see if there are any updates available.</string>
     <string name="wacky"> Wacky </string>
 </resources>
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index b6b545f14..08a53f02a 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -293,6 +293,13 @@
         <item name="android:paddingTop">@dimen/section_top_padding</item>
     </style>
 
+    <style name="SectionHeaderCaps">
+        <item name="android:textSize">10sp</item>
+        <item name="android:textColor">@color/gray_200</item>
+        <item name="android:textAllCaps">true</item>
+        <item name="android:layout_marginStart">@dimen/spacing_large</item>
+    </style>
+
     <style name="BottomMenu">
         <item name="android:divider">?android:listDivider</item>
         <item name="android:showDividers">middle</item>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java
index 9188749dc..cba5512de 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java
@@ -42,16 +42,9 @@ import com.habitrpg.android.habitica.ui.adapter.tasks.RewardsRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.adapter.tasks.TodosRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.fragments.AboutFragment;
 import com.habitrpg.android.habitica.ui.fragments.AchievementsFragment;
-import com.habitrpg.android.habitica.ui.fragments.preferences.EmailNotificationsPreferencesFragment;
-import com.habitrpg.android.habitica.ui.fragments.purchases.GemsPurchaseFragment;
 import com.habitrpg.android.habitica.ui.fragments.NavigationDrawerFragment;
 import com.habitrpg.android.habitica.ui.fragments.NewsFragment;
 import com.habitrpg.android.habitica.ui.fragments.StatsFragment;
-import com.habitrpg.android.habitica.ui.fragments.purchases.GiftBalanceGemsFragment;
-import com.habitrpg.android.habitica.ui.fragments.purchases.GiftPurchaseGemsFragment;
-import com.habitrpg.android.habitica.ui.fragments.purchases.SubscriptionFragment;
-import com.habitrpg.android.habitica.ui.fragments.faq.FAQDetailFragment;
-import com.habitrpg.android.habitica.ui.fragments.faq.FAQOverviewFragment;
 import com.habitrpg.android.habitica.ui.fragments.inventory.customization.AvatarCustomizationFragment;
 import com.habitrpg.android.habitica.ui.fragments.inventory.customization.AvatarOverviewFragment;
 import com.habitrpg.android.habitica.ui.fragments.inventory.equipment.EquipmentDetailFragment;
@@ -66,9 +59,14 @@ import com.habitrpg.android.habitica.ui.fragments.inventory.stable.StableFragmen
 import com.habitrpg.android.habitica.ui.fragments.inventory.stable.StableRecyclerFragment;
 import com.habitrpg.android.habitica.ui.fragments.preferences.APIPreferenceFragment;
 import com.habitrpg.android.habitica.ui.fragments.preferences.AuthenticationPreferenceFragment;
+import com.habitrpg.android.habitica.ui.fragments.preferences.EmailNotificationsPreferencesFragment;
 import com.habitrpg.android.habitica.ui.fragments.preferences.PreferencesFragment;
 import com.habitrpg.android.habitica.ui.fragments.preferences.ProfilePreferencesFragment;
 import com.habitrpg.android.habitica.ui.fragments.preferences.PushNotificationsPreferencesFragment;
+import com.habitrpg.android.habitica.ui.fragments.purchases.GemsPurchaseFragment;
+import com.habitrpg.android.habitica.ui.fragments.purchases.GiftBalanceGemsFragment;
+import com.habitrpg.android.habitica.ui.fragments.purchases.GiftPurchaseGemsFragment;
+import com.habitrpg.android.habitica.ui.fragments.purchases.SubscriptionFragment;
 import com.habitrpg.android.habitica.ui.fragments.setup.AvatarSetupFragment;
 import com.habitrpg.android.habitica.ui.fragments.setup.IntroFragment;
 import com.habitrpg.android.habitica.ui.fragments.setup.TaskSetupFragment;
@@ -77,12 +75,12 @@ import com.habitrpg.android.habitica.ui.fragments.skills.SkillTasksRecyclerViewF
 import com.habitrpg.android.habitica.ui.fragments.skills.SkillsFragment;
 import com.habitrpg.android.habitica.ui.fragments.social.ChatFragment;
 import com.habitrpg.android.habitica.ui.fragments.social.ChatListFragment;
-import com.habitrpg.android.habitica.ui.fragments.social.NoPartyFragmentFragment;
 import com.habitrpg.android.habitica.ui.fragments.social.GuildDetailFragment;
 import com.habitrpg.android.habitica.ui.fragments.social.GuildFragment;
 import com.habitrpg.android.habitica.ui.fragments.social.GuildsOverviewFragment;
-import com.habitrpg.android.habitica.ui.fragments.social.InboxOverviewFragment;
 import com.habitrpg.android.habitica.ui.fragments.social.InboxMessageListFragment;
+import com.habitrpg.android.habitica.ui.fragments.social.InboxOverviewFragment;
+import com.habitrpg.android.habitica.ui.fragments.social.NoPartyFragmentFragment;
 import com.habitrpg.android.habitica.ui.fragments.social.PublicGuildsFragment;
 import com.habitrpg.android.habitica.ui.fragments.social.QuestDetailFragment;
 import com.habitrpg.android.habitica.ui.fragments.social.TavernDetailFragment;
@@ -93,6 +91,9 @@ import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengesOv
 import com.habitrpg.android.habitica.ui.fragments.social.party.PartyDetailFragment;
 import com.habitrpg.android.habitica.ui.fragments.social.party.PartyFragment;
 import com.habitrpg.android.habitica.ui.fragments.social.party.PartyInviteFragment;
+import com.habitrpg.android.habitica.ui.fragments.support.BugFixFragment;
+import com.habitrpg.android.habitica.ui.fragments.support.FAQOverviewFragment;
+import com.habitrpg.android.habitica.ui.fragments.support.SupportMainFragment;
 import com.habitrpg.android.habitica.ui.fragments.tasks.TaskRecyclerViewFragment;
 import com.habitrpg.android.habitica.ui.fragments.tasks.TasksFragment;
 import com.habitrpg.android.habitica.ui.viewmodels.GroupViewModel;
@@ -146,8 +147,6 @@ public interface UserComponent {
 
     void inject(TasksFragment tasksFragment);
 
-    void inject(FAQDetailFragment faqDetailFragment);
-
     void inject(FAQOverviewFragment faqOverviewFragment);
 
     void inject(AvatarCustomizationFragment avatarCustomizationFragment);
@@ -331,4 +330,8 @@ public interface UserComponent {
     void inject(@NotNull GiftBalanceGemsFragment giftBalanceGemsFragment);
 
     void inject(@NotNull EmailNotificationsPreferencesFragment emailNotificationsPreferencesFragment);
+
+    void inject(@NotNull SupportMainFragment supportMainFragment);
+
+    void inject(@NotNull BugFixFragment bugFixFragment);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/FAQOverviewRecyclerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/FAQOverviewRecyclerAdapter.kt
deleted file mode 100644
index c09cc09b6..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/FAQOverviewRecyclerAdapter.kt
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.habitrpg.android.habitica.ui.adapter
-
-import android.text.method.LinkMovementMethod
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Button
-import android.widget.TextView
-import androidx.core.os.bundleOf
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.helpers.MainNavigationController
-import com.habitrpg.android.habitica.models.FAQArticle
-import com.habitrpg.android.habitica.ui.activities.MainActivity
-import com.habitrpg.android.habitica.ui.fragments.faq.FAQOverviewFragmentDirections
-import com.habitrpg.android.habitica.ui.helpers.bindView
-import com.habitrpg.android.habitica.ui.helpers.setMarkdown
-import io.reactivex.BackpressureStrategy
-import io.reactivex.Flowable
-import io.reactivex.subjects.PublishSubject
-
-class FAQOverviewRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<androidx.recyclerview.widget.RecyclerView.ViewHolder>() {
-
-    var activity: MainActivity? = null
-    private var articles: List<FAQArticle> = emptyList()
-
-    private val resetWalkthroughEvents = PublishSubject.create<String>()
-
-    fun setArticles(articles: List<FAQArticle>) {
-        this.articles = articles
-        this.notifyDataSetChanged()
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): androidx.recyclerview.widget.RecyclerView.ViewHolder {
-        return when (viewType) {
-            VIEW_TYPE_JUSTIN -> {
-                val view = LayoutInflater.from(parent.context).inflate(R.layout.button_list_item, parent, false)
-                ResetWalkthroughViewHolder(view)
-            }
-            VIEW_TYPE_HEADER -> {
-                val view = LayoutInflater.from(parent.context).inflate(R.layout.help_header, parent, false)
-                HeaderViewHolder(view)
-            }
-            else -> {
-                val view = LayoutInflater.from(parent.context)
-                        .inflate(R.layout.plain_list_item, parent, false)
-                FAQArticleViewHolder(view)
-            }
-        }
-    }
-
-    override fun onBindViewHolder(holder: androidx.recyclerview.widget.RecyclerView.ViewHolder, position: Int) {
-        if (getItemViewType(position) == VIEW_TYPE_FAQ) {
-            (holder as? FAQArticleViewHolder)?.bind(articles[position - 1])
-        }
-    }
-
-    override fun getItemViewType(position: Int): Int {
-        return when (position) {
-            0 -> VIEW_TYPE_HEADER
-            articles.size+1 -> VIEW_TYPE_JUSTIN
-            else -> VIEW_TYPE_FAQ
-        }
-    }
-
-    override fun getItemCount(): Int {
-        return this.articles.size + 2
-    }
-
-    fun getResetWalkthroughEvents(): Flowable<String> {
-        return resetWalkthroughEvents.toFlowable(BackpressureStrategy.DROP)
-    }
-
-    internal inner class FAQArticleViewHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView), View.OnClickListener {
-
-        private val textView: TextView by bindView(itemView, R.id.textView)
-
-        private var article: FAQArticle? = null
-
-        init {
-            textView.setOnClickListener(this)
-        }
-
-        fun bind(article: FAQArticle) {
-            this.article = article
-            this.textView.text = this.article?.question
-        }
-
-        override fun onClick(v: View) {
-            article?.position?.let {
-                MainNavigationController.navigate(FAQOverviewFragmentDirections.openFAQDetail(it))
-            }
-        }
-    }
-
-    private inner class ResetWalkthroughViewHolder internal constructor(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) {
-
-        init {
-            val button = itemView as? Button
-            button?.text = itemView.context.getString(R.string.reset_walkthrough)
-            button?.setOnClickListener { resetWalkthroughEvents.onNext("") }
-        }
-    }
-
-    private inner class HeaderViewHolder internal constructor(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) {
-
-        init {
-            val textView = itemView.findViewById<TextView>(R.id.text_view)
-            textView.setMarkdown(itemView.context.getString(R.string.need_help_header_description, "[Habitica Help Guild](https://habitica.com/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a)"))
-            textView.setOnClickListener { MainNavigationController.navigate(R.id.guildFragment, bundleOf("groupID" to "5481ccf3-5d2d-48a9-a871-70a7380cee5a")) }
-            textView.movementMethod = LinkMovementMethod.getInstance()
-        }
-    }
-
-    companion object {
-
-        private const val VIEW_TYPE_JUSTIN = 0
-        private const val VIEW_TYPE_HEADER = 1
-        private const val VIEW_TYPE_FAQ = 2
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt
index c30887aa8..b2039953a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt
@@ -323,7 +323,7 @@ class NavigationDrawerFragment : DialogFragment() {
             items.add(HabiticaDrawerItem(R.id.subscriptionPurchaseActivity, SIDEBAR_SUBSCRIPTION, context.getString(R.string.sidebar_subscription), isHeader = false))
             items.add(HabiticaDrawerItem(0, SIDEBAR_ABOUT_HEADER, context.getString(R.string.sidebar_about), true))
             items.add(HabiticaDrawerItem(R.id.newsFragment, SIDEBAR_NEWS, context.getString(R.string.sidebar_news)))
-            items.add(HabiticaDrawerItem(R.id.FAQOverviewFragment, SIDEBAR_HELP, context.getString(R.string.sidebar_help)))
+            items.add(HabiticaDrawerItem(R.id.supportMainFragment, SIDEBAR_HELP, context.getString(R.string.sidebar_help)))
             items.add(HabiticaDrawerItem(R.id.aboutFragment, SIDEBAR_ABOUT, context.getString(R.string.sidebar_about)))
         }
         if (configManager.enableGiftOneGetOne()) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQDetailFragment.kt
deleted file mode 100644
index c5add4974..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQDetailFragment.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.habitrpg.android.habitica.ui.fragments.faq
-
-import android.os.Bundle
-import android.text.method.LinkMovementMethod
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.TextView
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.components.UserComponent
-import com.habitrpg.android.habitica.data.FAQRepository
-import com.habitrpg.android.habitica.extensions.inflate
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
-import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
-import com.habitrpg.android.habitica.ui.helpers.MarkdownParser
-import com.habitrpg.android.habitica.ui.helpers.bindOptionalView
-import com.habitrpg.android.habitica.ui.helpers.resetViews
-import io.reactivex.functions.Consumer
-import javax.inject.Inject
-
-class FAQDetailFragment : BaseMainFragment() {
-    @Inject
-    lateinit var faqRepository: FAQRepository
-
-    private val questionTextView: TextView? by bindOptionalView(R.id.questionTextView)
-    private val answerTextView: TextView? by bindOptionalView(R.id.answerTextView)
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        super.onCreateView(inflater, container, savedInstanceState)
-        return container?.inflate(R.layout.fragment_faq_detail)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        resetViews()
-
-        arguments?.let {
-            val args = FAQDetailFragmentArgs.fromBundle(it)
-            compositeSubscription.add(faqRepository.getArticle(args.position).subscribe(Consumer { faq ->
-                this.questionTextView?.text = faq.question
-                this.answerTextView?.text = MarkdownParser.parseMarkdown(faq.answer)
-            }, RxErrorHandler.handleEmptyError()))
-        }
-
-        this.answerTextView?.movementMethod = LinkMovementMethod.getInstance()
-    }
-
-    override fun injectFragment(component: UserComponent) {
-        component.inject(this)
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.kt
deleted file mode 100644
index d33515826..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.habitrpg.android.habitica.ui.fragments.faq
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.components.UserComponent
-import com.habitrpg.android.habitica.data.FAQRepository
-import com.habitrpg.android.habitica.extensions.inflate
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
-import com.habitrpg.android.habitica.ui.adapter.FAQOverviewRecyclerAdapter
-import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
-import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator
-import com.habitrpg.android.habitica.ui.helpers.bindView
-import com.habitrpg.android.habitica.ui.helpers.resetViews
-import io.reactivex.functions.Consumer
-import javax.inject.Inject
-
-class FAQOverviewFragment : BaseMainFragment() {
-    @Inject
-    lateinit var faqRepository: FAQRepository
-
-    private val recyclerView: androidx.recyclerview.widget.RecyclerView? by bindView(R.id.recyclerView)
-
-    internal var adapter: FAQOverviewRecyclerAdapter? = null
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
-                              savedInstanceState: Bundle?): View? {
-        super.onCreateView(inflater, container, savedInstanceState)
-        return container?.inflate(R.layout.fragment_recyclerview)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        resetViews()
-
-        adapter = FAQOverviewRecyclerAdapter()
-        adapter?.getResetWalkthroughEvents()?.subscribe(Consumer { this.userRepository.resetTutorial(user) }, RxErrorHandler.handleEmptyError())?.let { compositeSubscription.add(it) }
-        adapter?.activity = activity
-        recyclerView?.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(activity)
-        activity?.let { recyclerView?.addItemDecoration(androidx.recyclerview.widget.DividerItemDecoration(it, androidx.recyclerview.widget.DividerItemDecoration.VERTICAL)) }
-        recyclerView?.adapter = adapter
-        recyclerView?.itemAnimator = SafeDefaultItemAnimator()
-        this.loadArticles()
-    }
-
-    override fun onDestroy() {
-        faqRepository.close()
-        super.onDestroy()
-    }
-
-    override fun injectFragment(component: UserComponent) {
-        component.inject(this)
-    }
-
-    private fun loadArticles() {
-        if (adapter == null) {
-            return
-        }
-        compositeSubscription.add(faqRepository.getArticles().subscribe(Consumer { adapter?.setArticles(it) }, RxErrorHandler.handleEmptyError()))
-    }
-
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/BugFixFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/BugFixFragment.kt
new file mode 100644
index 000000000..38b437def
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/BugFixFragment.kt
@@ -0,0 +1,109 @@
+package com.habitrpg.android.habitica.ui.fragments.support
+
+import android.content.pm.PackageManager
+import android.os.Build
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.app.ShareCompat
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.components.UserComponent
+import com.habitrpg.android.habitica.databinding.FragmentSupportBugFixBinding
+import com.habitrpg.android.habitica.helpers.AppConfigManager
+import com.habitrpg.android.habitica.helpers.AppTestingLevel
+import com.habitrpg.android.habitica.helpers.DeviceName
+import com.habitrpg.android.habitica.modules.AppModule
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
+import io.reactivex.Completable
+import javax.inject.Inject
+import javax.inject.Named
+
+class BugFixFragment: BaseMainFragment() {
+    private var deviceInfo: DeviceName.DeviceInfo? = null
+
+    private lateinit var binding: FragmentSupportBugFixBinding
+
+    @field:[Inject Named(AppModule.NAMED_USER_ID)]
+    lateinit var userId: String
+    @Inject
+    lateinit var appConfigManager: AppConfigManager
+
+    override fun injectFragment(component: UserComponent) {
+        component.inject(this)
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        hidesToolbar = true
+        super.onCreateView(inflater, container, savedInstanceState)
+        binding = FragmentSupportBugFixBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        compositeSubscription.add(Completable.fromAction {
+            deviceInfo = DeviceName.getDeviceInfo(context)
+        }.subscribe())
+
+        binding.reportBugButton.setOnClickListener {
+            sendEmail("[Android] Bugreport")
+        }
+    }
+
+    private val versionName: String by lazy {
+        try {
+            @Suppress("DEPRECATION")
+            activity?.packageManager?.getPackageInfo(activity?.packageName, 0)?.versionName ?: ""
+        } catch (e: PackageManager.NameNotFoundException) {
+            ""
+        }
+    }
+
+    private val versionCode: Int by lazy {
+        try {
+            @Suppress("DEPRECATION")
+            activity?.packageManager?.getPackageInfo(activity?.packageName, 0)?.versionCode ?: 0
+        } catch (e: PackageManager.NameNotFoundException) {
+            0
+        }
+    }
+
+    private fun sendEmail(subject: String) {
+        val version = Build.VERSION.SDK_INT
+        val deviceName = deviceInfo?.name ?: DeviceName.getDeviceName()
+        val manufacturer = deviceInfo?.manufacturer ?: Build.MANUFACTURER
+        var bodyOfEmail = "Device: $manufacturer $deviceName" +
+                " \nAndroid Version: $version"+
+                " \nAppVersion: " + getString(R.string.version_info, versionName, versionCode)
+
+        if (appConfigManager.testingLevel().name != AppTestingLevel.PRODUCTION.name) {
+            bodyOfEmail += " ${appConfigManager.testingLevel().name}"
+        }
+        bodyOfEmail += " \nUser ID: $userId"
+
+        val user = this.user
+        if (user != null) {
+            bodyOfEmail += " \nLevel: " + (user.stats?.lvl ?: 0) +
+                    " \nClass: " + (if (user.preferences?.disableClasses == true) "Disabled" else (user.stats?.habitClass ?: "None")) +
+                    " \nIs in Inn: " + (user.preferences?.sleep ?: false) +
+                    " \nUses Costume: " + (user.preferences?.costume ?: false) +
+                    " \nCustom Day Start: " + (user.preferences?.dayStart ?: 0) +
+                    " \nTimezone Offset: " + (user.preferences?.timezoneOffset ?: 0)
+        }
+
+        bodyOfEmail += " \nDetails:\n"
+
+        activity?.let {
+            ShareCompat.IntentBuilder.from(it)
+                    .setType("message/rfc822")
+                    .addEmailTo(appConfigManager.supportEmail())
+                    .setSubject(subject)
+                    .setText(bodyOfEmail)
+                    .setChooserTitle("Send email...")
+                    .startChooser()
+        }
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQOverviewFragment.kt
new file mode 100644
index 000000000..d2e9171e1
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQOverviewFragment.kt
@@ -0,0 +1,84 @@
+package com.habitrpg.android.habitica.ui.fragments.support
+
+import android.os.Bundle
+import android.text.method.LinkMovementMethod
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import androidx.core.os.bundleOf
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.components.UserComponent
+import com.habitrpg.android.habitica.data.FAQRepository
+import com.habitrpg.android.habitica.databinding.FragmentFaqOverviewBinding
+import com.habitrpg.android.habitica.databinding.SupportFaqItemBinding
+import com.habitrpg.android.habitica.extensions.addCloseButton
+import com.habitrpg.android.habitica.extensions.layoutInflater
+import com.habitrpg.android.habitica.helpers.MainNavigationController
+import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
+import com.habitrpg.android.habitica.ui.helpers.setMarkdown
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.dialogs.HabiticaAlertDialog
+import io.reactivex.functions.Consumer
+import javax.inject.Inject
+
+class FAQOverviewFragment : BaseMainFragment() {
+
+    private lateinit var binding: FragmentFaqOverviewBinding
+
+    @Inject
+    lateinit var faqRepository: FAQRepository
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        hidesToolbar = true
+        super.onCreateView(inflater, container, savedInstanceState)
+        binding = FragmentFaqOverviewBinding.inflate(inflater, container, false)
+        binding.healthSection.findViewById<ImageView>(R.id.icon_view).setImageBitmap(HabiticaIconsHelper.imageOfHeartLarge())
+        binding.experienceSection.findViewById<ImageView>(R.id.icon_view).setImageBitmap(HabiticaIconsHelper.imageOfExperienceReward())
+        binding.manaSection.findViewById<ImageView>(R.id.icon_view).setImageBitmap(HabiticaIconsHelper.imageOfMagicLarge())
+        binding.goldSection.findViewById<ImageView>(R.id.icon_view).setImageBitmap(HabiticaIconsHelper.imageOfGoldReward())
+        binding.gemsSection.findViewById<ImageView>(R.id.icon_view).setImageBitmap(HabiticaIconsHelper.imageOfGem())
+        binding.hourglassesSection.findViewById<ImageView>(R.id.icon_view).setImageBitmap(HabiticaIconsHelper.imageOfHourglassLarge())
+        binding.statsSection.findViewById<ImageView>(R.id.icon_view).setImageBitmap(HabiticaIconsHelper.imageOfStats())
+
+        binding.moreHelpTextView.setMarkdown(context?.getString(R.string.need_help_header_description, "[Habitica Help Guild](https://habitica.com/groups/guild/5481ccf3-5d2d-48a9-a871-70a7380cee5a)"))
+        binding.moreHelpTextView.setOnClickListener { MainNavigationController.navigate(R.id.guildFragment, bundleOf("groupID" to "5481ccf3-5d2d-48a9-a871-70a7380cee5a")) }
+        binding.moreHelpTextView.movementMethod = LinkMovementMethod.getInstance()
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        this.loadArticles()
+    }
+
+    override fun onDestroy() {
+        faqRepository.close()
+        super.onDestroy()
+    }
+
+    override fun injectFragment(component: UserComponent) {
+        component.inject(this)
+    }
+
+    private fun loadArticles() {
+        compositeSubscription.add(faqRepository.getArticles().subscribe(Consumer {
+            val context = context ?: return@Consumer
+            for (article in it) {
+                val binding = SupportFaqItemBinding.inflate(context.layoutInflater, binding.faqLinearLayout, true)
+                binding.textView.text = article.question
+                binding.root.setOnClickListener {
+                    val dialog = HabiticaAlertDialog(binding.root.context)
+                    dialog.setTitle(article.question)
+                    dialog.setMessage(article.answer)
+                    dialog.addCloseButton()
+                    dialog.show()
+                }
+            }
+        }, RxErrorHandler.handleEmptyError()))
+    }
+
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/SupportMainFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/SupportMainFragment.kt
new file mode 100644
index 000000000..28be1802e
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/SupportMainFragment.kt
@@ -0,0 +1,126 @@
+package com.habitrpg.android.habitica.ui.fragments.support
+
+import android.content.pm.PackageManager
+import android.os.Build
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.app.ShareCompat
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.components.UserComponent
+import com.habitrpg.android.habitica.data.FAQRepository
+import com.habitrpg.android.habitica.databinding.FragmentSupportMainBinding
+import com.habitrpg.android.habitica.helpers.AppConfigManager
+import com.habitrpg.android.habitica.helpers.AppTestingLevel
+import com.habitrpg.android.habitica.helpers.DeviceName
+import com.habitrpg.android.habitica.helpers.MainNavigationController
+import com.habitrpg.android.habitica.modules.AppModule
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
+import io.reactivex.Completable
+import javax.inject.Inject
+import javax.inject.Named
+
+class SupportMainFragment : BaseMainFragment() {
+    private var deviceInfo: DeviceName.DeviceInfo? = null
+
+    private lateinit var binding: FragmentSupportMainBinding
+    @field:[Inject Named(AppModule.NAMED_USER_ID)]
+    lateinit var userId: String
+    @Inject
+    lateinit var faqRepository: FAQRepository
+    @Inject
+    lateinit var appConfigManager: AppConfigManager
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        hidesToolbar = true
+        super.onCreateView(inflater, container, savedInstanceState)
+        binding = FragmentSupportMainBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding.usingHabiticaWrapper.setOnClickListener {
+            MainNavigationController.navigate(R.id.FAQOverviewFragment)
+        }
+        binding.bugsFixesWrapper.setOnClickListener {
+            MainNavigationController.navigate(R.id.bugFixFragment)
+        }
+        binding.suggestionsFeedbackWrapper.setOnClickListener {
+            sendEmail("[Android] Feedback")
+        }
+
+        compositeSubscription.add(Completable.fromAction {
+            deviceInfo = DeviceName.getDeviceInfo(context)
+        }.subscribe())
+
+        binding.resetTutorialButton.setOnClickListener {
+            userRepository.resetTutorial(user)
+        }
+    }
+
+    override fun onDestroy() {
+        faqRepository.close()
+        super.onDestroy()
+    }
+
+    override fun injectFragment(component: UserComponent) {
+        component.inject(this)
+    }
+
+    private val versionName: String by lazy {
+        try {
+            @Suppress("DEPRECATION")
+            activity?.packageManager?.getPackageInfo(activity?.packageName, 0)?.versionName ?: ""
+        } catch (e: PackageManager.NameNotFoundException) {
+            ""
+        }
+    }
+
+    private val versionCode: Int by lazy {
+        try {
+            @Suppress("DEPRECATION")
+            activity?.packageManager?.getPackageInfo(activity?.packageName, 0)?.versionCode ?: 0
+        } catch (e: PackageManager.NameNotFoundException) {
+            0
+        }
+    }
+
+    private fun sendEmail(subject: String) {
+        val version = Build.VERSION.SDK_INT
+        val deviceName = deviceInfo?.name ?: DeviceName.getDeviceName()
+        val manufacturer = deviceInfo?.manufacturer ?: Build.MANUFACTURER
+        var bodyOfEmail = "Device: $manufacturer $deviceName" +
+                " \nAndroid Version: $version"+
+                " \nAppVersion: " + getString(R.string.version_info, versionName, versionCode)
+
+        if (appConfigManager.testingLevel().name != AppTestingLevel.PRODUCTION.name) {
+            bodyOfEmail += " ${appConfigManager.testingLevel().name}"
+        }
+        bodyOfEmail += " \nUser ID: $userId"
+
+        val user = this.user
+        if (user != null) {
+            bodyOfEmail += " \nLevel: " + (user.stats?.lvl ?: 0) +
+                    " \nClass: " + (if (user.preferences?.disableClasses == true) "Disabled" else (user.stats?.habitClass ?: "None")) +
+                    " \nIs in Inn: " + (user.preferences?.sleep ?: false) +
+                    " \nUses Costume: " + (user.preferences?.costume ?: false) +
+                    " \nCustom Day Start: " + (user.preferences?.dayStart ?: 0) +
+                    " \nTimezone Offset: " + (user.preferences?.timezoneOffset ?: 0)
+        }
+
+        bodyOfEmail += " \nDetails:\n"
+
+        activity?.let {
+            ShareCompat.IntentBuilder.from(it)
+                    .setType("message/rfc822")
+                    .addEmailTo(appConfigManager.supportEmail())
+                    .setSubject(subject)
+                    .setText(bodyOfEmail)
+                    .setChooserTitle("Send email...")
+                    .startChooser()
+        }
+    }
+}
\ No newline at end of file
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 664ed1fec..7907c31ab 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,6 +1,7 @@
 package com.habitrpg.android.habitica.ui.views;
 
 import android.content.Context;
+import android.content.res.AssetManager;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.BitmapShader;
@@ -16,6 +17,7 @@ import android.graphics.PorterDuff;
 import android.graphics.PorterDuffXfermode;
 import android.graphics.RectF;
 import android.graphics.Shader;
+import android.graphics.Typeface;
 import android.text.Layout;
 import android.text.StaticLayout;
 import android.text.TextPaint;
@@ -26,8 +28,8 @@ import java.util.Stack;
 
 
 /**
- * Created by Phillip Thelen on 12. Oct 2018.
- * Copyright © 2018 HabitRPG Inc.. All rights reserved.
+ * Created by Phillip Thelen on 18. Mar 2020.
+ * Copyright © 2020 HabitRPG Inc.. All rights reserved.
  *
  * Generated by PaintCode
  * http://www.paintcodeapp.com
@@ -38,6 +40,13 @@ public class HabiticaIcons {
     private static class GlobalCache {
         static PaintCodeBitmap rageStrikeNPC = new PaintCodeBitmap();
         static PorterDuffXfermode blendModeSourceIn = new PorterDuffXfermode(PorterDuff.Mode.SRC_IN);
+        static Typeface.Builder helveticaNeue = null;
+        
+        private static void initializeTypefaceBuilders(AssetManager assetManager) {
+            if (GlobalCache.helveticaNeue == null) {
+                GlobalCache.helveticaNeue = new Typeface.Builder(assetManager, "HelveticaNeue.ttc");
+            }
+        }
     }
     
     // Resizing Behavior
@@ -88,13 +97,13 @@ public class HabiticaIcons {
         Paint paint = CacheForHeart.paint;
         
         // Local Colors
-        int fillColor6 = Color.argb(128, 181, 36, 40);
-        int heartDarkBackground = Color.argb(178, 255, 255, 255);
-        int fillColor3 = Color.argb(128, 255, 255, 255);
-        int fillColor5 = Color.argb(64, 255, 255, 255);
-        int heartLightBackground = Color.argb(255, 247, 78, 82);
-        int fillColor4 = Color.argb(89, 181, 36, 40);
         int fillColor2 = Color.argb(255, 255, 97, 101);
+        int fillColor5 = Color.argb(64, 255, 255, 255);
+        int fillColor3 = Color.argb(128, 255, 255, 255);
+        int fillColor4 = Color.argb(89, 181, 36, 40);
+        int fillColor6 = Color.argb(128, 181, 36, 40);
+        int heartLightBackground = Color.argb(255, 247, 78, 82);
+        int heartDarkBackground = Color.argb(178, 255, 255, 255);
         
         // Local Variables
         int expression = darkBackground ? heartDarkBackground : heartLightBackground;
@@ -368,11 +377,11 @@ public class HabiticaIcons {
         Paint paint = CacheForExperience.paint;
         
         // Local Colors
-        int fillColor3 = Color.argb(128, 255, 255, 255);
         int fillColor12 = Color.argb(128, 191, 125, 26);
         int fillColor11 = Color.argb(64, 191, 125, 26);
         int fillColor5 = Color.argb(64, 255, 255, 255);
         int fillColor10 = Color.argb(255, 255, 166, 35);
+        int fillColor3 = Color.argb(128, 255, 255, 255);
         
         // Resize to Target Frame
         canvas.save();
@@ -599,11 +608,11 @@ public class HabiticaIcons {
         Paint paint = CacheForMagic.paint;
         
         // Local Colors
-        int fillColor3 = Color.argb(128, 255, 255, 255);
         int fillColor5 = Color.argb(64, 255, 255, 255);
         int fillColor9 = Color.argb(64, 31, 112, 154);
         int fillColor8 = Color.argb(255, 80, 181, 233);
         int fillColor7 = Color.argb(255, 41, 149, 205);
+        int fillColor3 = Color.argb(128, 255, 255, 255);
         
         // Resize to Target Frame
         canvas.save();
@@ -750,11 +759,11 @@ public class HabiticaIcons {
         Paint paint = CacheForGold.paint;
         
         // Local Colors
-        int fillColor13 = Color.argb(191, 191, 125, 26);
         int fillColor12 = Color.argb(128, 191, 125, 26);
         int fillColor5 = Color.argb(64, 255, 255, 255);
         int fillColor3 = Color.argb(128, 255, 255, 255);
         int fillColor10 = Color.argb(255, 255, 166, 35);
+        int fillColor13 = Color.argb(191, 191, 125, 26);
         
         // Resize to Target Frame
         canvas.save();
@@ -905,9 +914,9 @@ public class HabiticaIcons {
         
         // Local Colors
         int fillColor3 = Color.argb(128, 255, 255, 255);
-        int fillColor5 = Color.argb(64, 255, 255, 255);
         int fillColor15 = Color.argb(89, 27, 153, 107);
         int fillColor14 = Color.argb(255, 36, 204, 143);
+        int fillColor5 = Color.argb(64, 255, 255, 255);
         
         // Resize to Target Frame
         canvas.save();
@@ -1531,14 +1540,14 @@ public class HabiticaIcons {
         Paint paint = CacheForWarrior.paint;
         
         // Local Colors
-        int fillColor41 = Color.argb(255, 255, 149, 152);
-        int fillColor43 = Color.argb(255, 200, 43, 43);
-        int fillColor22 = Color.argb(255, 242, 123, 134);
-        int fillColor20 = Color.argb(255, 255, 181, 183);
-        int fillColor21 = Color.argb(255, 255, 182, 184);
         int fillColor42 = Color.argb(255, 255, 149, 152);
-        int fillColor23 = Color.argb(255, 229, 65, 77);
         int fillColor = Color.argb(255, 240, 97, 102);
+        int fillColor43 = Color.argb(255, 200, 43, 43);
+        int fillColor21 = Color.argb(255, 255, 182, 184);
+        int fillColor20 = Color.argb(255, 255, 181, 183);
+        int fillColor23 = Color.argb(255, 229, 65, 77);
+        int fillColor41 = Color.argb(255, 255, 149, 152);
+        int fillColor22 = Color.argb(255, 242, 123, 134);
         
         // Local Variables
         boolean lightBackground = !darkBackground;
@@ -2705,9 +2714,9 @@ public class HabiticaIcons {
     
     public static void drawDifficultyStars(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, float difficulty) {
         // Local Variables
+        float _2StarDifficulty = difficulty >= 2f ? 1f : (difficulty >= 1.5f ? 0.5f : 0f);
         float _3StarDifficulty = difficulty >= 3f ? 1f : (difficulty >= 2.5f ? 0.5f : 0f);
         float _4StarDifficulty = difficulty >= 4f ? 1f : (difficulty >= 3.5f ? 0.5f : 0f);
-        float _2StarDifficulty = difficulty >= 2f ? 1f : (difficulty >= 1.5f ? 0.5f : 0f);
         float _1StarDifficulty = difficulty >= 1f ? 1f : (difficulty >= 0.5f ? 0.5f : 0f);
         
         // Resize to Target Frame
@@ -2785,12 +2794,12 @@ public class HabiticaIcons {
         Paint paint = CacheForDifficultyStar.paint;
         
         // Local Colors
-        int fillColor24 = Color.argb(255, 255, 166, 36);
         int fillColor25 = Color.argb(255, 225, 224, 227);
+        int fillColor24 = Color.argb(255, 255, 166, 36);
         
         // Local Variables
-        boolean isHalf = singleDifficulty == 0.5f;
         boolean isFull = singleDifficulty == 1f;
+        boolean isHalf = singleDifficulty == 0.5f;
         
         // Resize to Target Frame
         canvas.save();
@@ -3038,11 +3047,11 @@ public class HabiticaIcons {
         Paint paint = CacheForStarLarge.paint;
         
         // Local Colors
-        int fillColor28 = Color.argb(64, 229, 220, 255);
-        int fillColor31 = Color.argb(191, 229, 220, 255);
         int fillColor30 = Color.argb(166, 229, 220, 255);
+        int fillColor31 = Color.argb(191, 229, 220, 255);
         int fillColor29 = Color.argb(128, 229, 220, 255);
         int fillColor27 = Color.argb(255, 229, 220, 255);
+        int fillColor28 = Color.argb(64, 229, 220, 255);
         
         // Resize to Target Frame
         canvas.save();
@@ -3442,10 +3451,10 @@ public class HabiticaIcons {
         Paint paint = CacheForStarMedium.paint;
         
         // Local Colors
-        int fillColor27 = Color.argb(255, 229, 220, 255);
         int fillColor34 = Color.argb(38, 229, 220, 255);
         int fillColor33 = Color.argb(77, 229, 220, 255);
         int fillColor32 = Color.argb(153, 229, 220, 255);
+        int fillColor27 = Color.argb(255, 229, 220, 255);
         
         // Resize to Target Frame
         canvas.save();
@@ -3772,8 +3781,8 @@ public class HabiticaIcons {
         Paint paint = CacheForAddRemovePin.paint;
         
         // Local Colors
-        int fillColor36 = Color.argb(255, 97, 51, 180);
         int fillColor2 = Color.argb(255, 255, 97, 101);
+        int fillColor36 = Color.argb(255, 97, 51, 180);
         
         // Local Variables
         int pinColor = addPin ? fillColor36 : fillColor2;
@@ -3963,27 +3972,28 @@ public class HabiticaIcons {
         private static RectF symbolTargetRect = new RectF();
     }
     
-    public static void drawItemIndicator(Canvas canvas, int lockColor, boolean isLocked, boolean isLimited) {
-        HabiticaIcons.drawItemIndicator(canvas, new RectF(0f, 0f, 28f, 28f), ResizingBehavior.AspectFit, lockColor, isLocked, isLimited);
+    public static void drawItemIndicator(Canvas canvas, int lockColor, boolean isLocked, boolean isLimited, boolean isDark) {
+        HabiticaIcons.drawItemIndicator(canvas, new RectF(0f, 0f, 28f, 28f), ResizingBehavior.AspectFit, lockColor, isLocked, isLimited, isDark);
     }
     
-    public static void drawItemIndicator(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, int lockColor, boolean isLocked, boolean isLimited) {
+    public static void drawItemIndicator(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, int lockColor, boolean isLocked, boolean isLimited, boolean isDark) {
         // General Declarations
         Paint paint = CacheForItemIndicator.paint;
         
         // Local Colors
         int fillColor38 = Color.argb(255, 165, 161, 172);
+        int fillColor39 = Color.argb(255, 189, 168, 255);
         int strokeColor2 = Color.argb(255, 189, 168, 255);
+        int strokeColor = Color.argb(255, 97, 51, 180);
+        int indicatorLockedDark = Color.argb(255, 82, 82, 82);
         int shadowTint = Color.argb(255, 26, 24, 29);
         int indicatorLocked = Color.argb(255, 237, 236, 238);
-        int strokeColor = Color.argb(255, 97, 51, 180);
-        int fillColor39 = Color.argb(255, 189, 168, 255);
         
         // Local Shadows
         PaintCodeShadow shadow = CacheForItemIndicator.shadow.get(PaintCodeColor.colorByChangingAlpha(shadowTint, (int) (Color.alpha(shadowTint) * 0.12f * 255f)), 0f, 1f, 1f);
         
         // Local Variables
-        int itemIndicatorColor = isLocked ? indicatorLocked : (isLimited ? strokeColor : fillColor38);
+        int itemIndicatorColor = isLocked ? (isDark ? indicatorLockedDark : indicatorLocked) : (isLimited ? strokeColor : fillColor38);
         
         // Resize to Target Frame
         canvas.save();
@@ -4112,7 +4122,7 @@ public class HabiticaIcons {
         canvas.translate(symbolRect.left, symbolRect.top);
         RectF symbolTargetRect = CacheForItemIndicatorNumber.symbolTargetRect;
         symbolTargetRect.set(0f, 0f, symbolRect.width(), symbolRect.height());
-        HabiticaIcons.drawItemIndicator(canvas, symbolTargetRect, ResizingBehavior.Stretch, lockColor, false, false);
+        HabiticaIcons.drawItemIndicator(canvas, symbolTargetRect, ResizingBehavior.Stretch, lockColor, false, false, true);
         canvas.restore();
         
         canvas.restore();
@@ -4145,7 +4155,7 @@ public class HabiticaIcons {
         canvas.translate(symbolRect.left, symbolRect.top);
         RectF symbolTargetRect = CacheForItemIndicatorLocked.symbolTargetRect;
         symbolTargetRect.set(0f, 0f, symbolRect.width(), symbolRect.height());
-        HabiticaIcons.drawItemIndicator(canvas, symbolTargetRect, ResizingBehavior.Stretch, lockColor, true, false);
+        HabiticaIcons.drawItemIndicator(canvas, symbolTargetRect, ResizingBehavior.Stretch, lockColor, true, false, false);
         canvas.restore();
         
         canvas.restore();
@@ -4178,7 +4188,7 @@ public class HabiticaIcons {
         canvas.translate(symbolRect.left, symbolRect.top);
         RectF symbolTargetRect = CacheForItemIndicatorLimited.symbolTargetRect;
         symbolTargetRect.set(0f, 0f, symbolRect.width(), symbolRect.height());
-        HabiticaIcons.drawItemIndicator(canvas, symbolTargetRect, ResizingBehavior.Stretch, lockColor, false, true);
+        HabiticaIcons.drawItemIndicator(canvas, symbolTargetRect, ResizingBehavior.Stretch, lockColor, false, true, false);
         canvas.restore();
         
         canvas.restore();
@@ -4360,13 +4370,13 @@ public class HabiticaIcons {
         Paint paint = CacheForRogue.paint;
         
         // Local Colors
-        int fillColor46 = Color.argb(255, 122, 84, 192);
         int fillColor48 = Color.argb(255, 137, 102, 199);
-        int fillColor45 = Color.argb(255, 155, 129, 226);
         int fillColor36 = Color.argb(255, 97, 51, 180);
+        int fillColor45 = Color.argb(255, 155, 129, 226);
         int fillColor47 = Color.argb(255, 198, 182, 228);
         int fillColor19 = Color.argb(255, 79, 42, 147);
         int fillColor44 = Color.argb(255, 204, 190, 237);
+        int fillColor46 = Color.argb(255, 122, 84, 192);
         
         // Local Variables
         boolean lightBackground = !darkBackground;
@@ -5157,18 +5167,18 @@ public class HabiticaIcons {
         Paint paint = CacheForHealer.paint;
         
         // Local Colors
-        int fillColor58 = Color.argb(255, 229, 144, 37);
-        int fillColor50 = Color.argb(255, 226, 158, 69);
-        int fillColor57 = Color.argb(255, 255, 221, 181);
-        int fillColor49 = Color.argb(255, 255, 215, 168);
-        int fillColor56 = Color.argb(255, 255, 166, 35);
-        int fillColor55 = Color.argb(255, 253, 198, 126);
-        int fillColor54 = Color.argb(255, 207, 130, 41);
         int fillColor53 = Color.argb(255, 206, 129, 41);
-        int fillColor10 = Color.argb(255, 255, 166, 35);
-        int fillColor52 = Color.argb(255, 253, 198, 126);
-        int fillColor59 = Color.argb(255, 255, 228, 201);
+        int fillColor57 = Color.argb(255, 255, 221, 181);
+        int fillColor58 = Color.argb(255, 229, 144, 37);
+        int fillColor54 = Color.argb(255, 207, 130, 41);
         int fillColor51 = Color.argb(255, 229, 144, 37);
+        int fillColor50 = Color.argb(255, 226, 158, 69);
+        int fillColor59 = Color.argb(255, 255, 228, 201);
+        int fillColor55 = Color.argb(255, 253, 198, 126);
+        int fillColor56 = Color.argb(255, 255, 166, 35);
+        int fillColor49 = Color.argb(255, 255, 215, 168);
+        int fillColor52 = Color.argb(255, 253, 198, 126);
+        int fillColor10 = Color.argb(255, 255, 166, 35);
         
         // Local Variables
         boolean lightBackground = !darkBackground;
@@ -5995,16 +6005,16 @@ public class HabiticaIcons {
         
         // Local Colors
         int fillColor60 = Color.argb(255, 182, 225, 247);
-        int fillColor64 = Color.argb(255, 77, 178, 214);
-        int fillColor69 = Color.argb(255, 169, 219, 245);
-        int fillColor61 = Color.argb(255, 39, 138, 191);
-        int fillColor66 = Color.argb(255, 107, 196, 233);
-        int fillColor63 = Color.argb(255, 42, 160, 207);
+        int fillColor62 = Color.argb(255, 83, 180, 229);
         int fillColor68 = Color.argb(255, 31, 110, 162);
         int fillColor65 = Color.argb(255, 107, 196, 233);
         int fillColor70 = Color.argb(255, 132, 207, 242);
-        int fillColor62 = Color.argb(255, 83, 180, 229);
+        int fillColor63 = Color.argb(255, 42, 160, 207);
+        int fillColor64 = Color.argb(255, 77, 178, 214);
         int fillColor67 = Color.argb(255, 83, 180, 229);
+        int fillColor69 = Color.argb(255, 169, 219, 245);
+        int fillColor61 = Color.argb(255, 39, 138, 191);
+        int fillColor66 = Color.argb(255, 107, 196, 233);
         
         // Local Variables
         boolean lightBackground = !darkBackground;
@@ -6815,10 +6825,10 @@ public class HabiticaIcons {
         Paint paint = CacheForAttributeSparklesLeft.paint;
         
         // Local Colors
-        int fillColor73 = Color.argb(255, 255, 180, 69);
         int fillColor72 = Color.argb(255, 255, 97, 101);
         int fillColor18 = Color.argb(255, 154, 98, 255);
         int fillColor71 = Color.argb(255, 80, 181, 233);
+        int fillColor73 = Color.argb(255, 255, 180, 69);
         
         // Resize to Target Frame
         canvas.save();
@@ -6941,10 +6951,10 @@ public class HabiticaIcons {
         Paint paint = CacheForAttributeSparklesRight.paint;
         
         // Local Colors
-        int fillColor18 = Color.argb(255, 154, 98, 255);
-        int fillColor71 = Color.argb(255, 80, 181, 233);
         int fillColor74 = Color.argb(255, 255, 190, 93);
+        int fillColor18 = Color.argb(255, 154, 98, 255);
         int fillColor72 = Color.argb(255, 255, 97, 101);
+        int fillColor71 = Color.argb(255, 80, 181, 233);
         
         // Resize to Target Frame
         canvas.save();
@@ -7182,48 +7192,48 @@ public class HabiticaIcons {
         private static Path bezier4Path = new Path();
     }
     
-    public static void drawContributorBadge(Canvas canvas, float contributorTier, boolean isNPC) {
-        HabiticaIcons.drawContributorBadge(canvas, new RectF(0f, 0f, 16f, 16f), ResizingBehavior.AspectFit, contributorTier, isNPC);
+    public static void drawContributorBadge(Canvas canvas, float _1, boolean isNPC) {
+        HabiticaIcons.drawContributorBadge(canvas, new RectF(0f, 0f, 16f, 16f), ResizingBehavior.AspectFit, _1, isNPC);
     }
     
-    public static void drawContributorBadge(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, float contributorTier, boolean isNPC) {
+    public static void drawContributorBadge(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, float _1, boolean isNPC) {
         // General Declarations
         Stack<Matrix> currentTransformation = new Stack<Matrix>();
         currentTransformation.push(new Matrix());
         Paint paint = CacheForContributorBadge.paint;
         
         // Local Colors
+        int fillColor81 = Color.argb(255, 94, 221, 233);
+        int fillColor79 = Color.argb(255, 255, 190, 93);
         int strokeColor4 = Color.argb(255, 136, 10, 10);
         int fillColor82 = Color.argb(255, 154, 98, 255);
         int strokeColor8 = Color.argb(255, 28, 163, 114);
         int strokeColor6 = Color.argb(255, 236, 109, 23);
         int strokeColor12 = Color.argb(255, 0, 87, 55);
-        int fillColor2 = Color.argb(255, 255, 97, 101);
         int fillColor77 = Color.argb(255, 201, 43, 43);
-        int fillColor7 = Color.argb(255, 41, 149, 205);
         int strokeColor10 = Color.argb(255, 5, 112, 168);
         int fillColor80 = Color.argb(255, 63, 218, 162);
         int fillColor78 = Color.argb(255, 255, 148, 76);
         int fillColor83 = Color.argb(255, 119, 244, 199);
         int strokeColor3 = Color.argb(255, 253, 124, 127);
         int strokeColor9 = Color.argb(255, 52, 181, 193);
+        int fillColor2 = Color.argb(255, 255, 97, 101);
         int strokeColor7 = Color.argb(255, 238, 145, 9);
         int strokeColor5 = Color.argb(255, 225, 22, 27);
+        int fillColor7 = Color.argb(255, 41, 149, 205);
         int strokeColor11 = Color.argb(255, 106, 52, 204);
         int fillColor76 = Color.argb(255, 255, 182, 184);
-        int fillColor81 = Color.argb(255, 94, 221, 233);
-        int fillColor79 = Color.argb(255, 255, 190, 93);
         
         // Local Variables
-        boolean isTier8 = contributorTier == 8f && !isNPC;
-        boolean isTier4 = contributorTier == 4f && !isNPC;
-        boolean isTier6 = contributorTier == 6f && !isNPC;
-        boolean isTier3 = contributorTier == 3f && !isNPC;
-        boolean isTier2 = contributorTier == 2f && !isNPC;
-        boolean isTier7 = contributorTier == 7f && !isNPC;
-        boolean isTier1 = contributorTier == 1f && !isNPC;
-        boolean isTier5 = contributorTier == 5f && !isNPC;
-        boolean isTier9 = contributorTier == 9f && !isNPC;
+        boolean isTier7 = _1 == 7f && !isNPC;
+        boolean isTier1 = _1 == 1f && !isNPC;
+        boolean isTier9 = _1 == 9f && !isNPC;
+        boolean isTier6 = _1 == 6f && !isNPC;
+        boolean isTier5 = _1 == 5f && !isNPC;
+        boolean isTier4 = _1 == 4f && !isNPC;
+        boolean isTier2 = _1 == 2f && !isNPC;
+        boolean isTier8 = _1 == 8f && !isNPC;
+        boolean isTier3 = _1 == 3f && !isNPC;
         
         // Resize to Target Frame
         canvas.save();
@@ -8064,17 +8074,17 @@ public class HabiticaIcons {
         Paint paint = CacheForDamage.paint;
         
         // Local Colors
-        int fillColor25 = Color.argb(255, 225, 224, 227);
         int fillColor90 = Color.argb(179, 78, 74, 87);
         int fillColor89 = Color.argb(255, 227, 143, 61);
-        int fillColor37 = Color.argb(255, 255, 255, 255);
         int fillColor88 = Color.argb(255, 179, 98, 19);
-        int fillColor87 = Color.argb(255, 189, 168, 255);
-        int fillColor86 = Color.argb(255, 213, 200, 255);
-        int fillColor40 = Color.argb(255, 165, 161, 172);
         int fillColor35 = Color.argb(255, 195, 192, 199);
+        int fillColor25 = Color.argb(255, 225, 224, 227);
+        int fillColor40 = Color.argb(255, 165, 161, 172);
+        int fillColor86 = Color.argb(255, 213, 200, 255);
+        int fillColor87 = Color.argb(255, 189, 168, 255);
         int fillColor75 = Color.argb(255, 135, 129, 144);
         int fillColor85 = Color.argb(255, 237, 236, 238);
+        int fillColor37 = Color.argb(255, 255, 255, 255);
         int fillColor84 = Color.argb(255, 240, 97, 102);
         
         // Resize to Target Frame
@@ -8648,8 +8658,8 @@ public class HabiticaIcons {
         Paint paint = CacheForRageStrikeInactive.paint;
         
         // Local Colors
-        int textForeground = Color.argb(255, 183, 90, 28);
         int fillColor91 = Color.argb(255, 255, 200, 167);
+        int textForeground = Color.argb(255, 183, 90, 28);
         int strokeColor14 = Color.argb(255, 255, 148, 76);
         int strokeColor13 = Color.argb(255, 244, 120, 37);
         
@@ -8814,8 +8824,8 @@ public class HabiticaIcons {
         Paint paint = CacheForRageStrikeActive.paint;
         
         // Local Colors
-        int strokeColor13 = Color.argb(255, 244, 120, 37);
         int strokeColor14 = Color.argb(255, 255, 148, 76);
+        int strokeColor13 = Color.argb(255, 244, 120, 37);
         
         // Local Images
         PaintCodeBitmap pc_rageStrikeNPC = GlobalCache.rageStrikeNPC.get(rageStrikeNPC);
@@ -8953,12 +8963,12 @@ public class HabiticaIcons {
         Paint paint = CacheForRage.paint;
         
         // Local Colors
-        int fillColor93 = Color.argb(255, 244, 120, 37);
-        int fillColor14 = Color.argb(255, 36, 204, 143);
-        int fillColor15 = Color.argb(89, 27, 153, 107);
-        int fillColor92 = Color.argb(255, 90, 228, 178);
-        int fillColor3 = Color.argb(128, 255, 255, 255);
         int fillColor5 = Color.argb(64, 255, 255, 255);
+        int fillColor15 = Color.argb(89, 27, 153, 107);
+        int fillColor93 = Color.argb(255, 244, 120, 37);
+        int fillColor3 = Color.argb(128, 255, 255, 255);
+        int fillColor92 = Color.argb(255, 90, 228, 178);
+        int fillColor14 = Color.argb(255, 36, 204, 143);
         int fillColor94 = Color.argb(89, 180, 89, 27);
         
         // Resize to Target Frame
@@ -9268,9 +9278,9 @@ public class HabiticaIcons {
     public static void drawTaskDifficultyStars(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, int taskTintColor, float difficulty, boolean isActive) {
         // Local Variables
         boolean isTrivial = difficulty == 0.1f;
+        boolean isMedium = difficulty == 1.5f;
         boolean isHard = difficulty == 2f;
         boolean isEasy = difficulty == 1f;
-        boolean isMedium = difficulty == 1.5f;
         
         // Resize to Target Frame
         canvas.save();
@@ -9424,8 +9434,8 @@ public class HabiticaIcons {
         int strokeColor15 = Color.argb(255, 195, 192, 199);
         
         // Local Variables
-        int borderColor = isActive ? taskTintColor : strokeColor15;
         int starFillColor = isActive ? taskTintColor : transparent;
+        int borderColor = isActive ? taskTintColor : strokeColor15;
         
         // Resize to Target Frame
         canvas.save();
@@ -9488,8 +9498,8 @@ public class HabiticaIcons {
         Paint paint = CacheForHabitControlPlus.paint;
         
         // Local Colors
-        int strokeColor15 = Color.argb(255, 195, 192, 199);
         int fillColor37 = Color.argb(255, 255, 255, 255);
+        int strokeColor15 = Color.argb(255, 195, 192, 199);
         int transparent = Color.argb(0, 204, 82, 82);
         
         // Local Variables
@@ -9576,8 +9586,8 @@ public class HabiticaIcons {
         Paint paint = CacheForHabitControlMinus.paint;
         
         // Local Colors
-        int strokeColor15 = Color.argb(255, 195, 192, 199);
         int fillColor37 = Color.argb(255, 255, 255, 255);
+        int strokeColor15 = Color.argb(255, 195, 192, 199);
         int transparent = Color.argb(0, 204, 82, 82);
         
         // Local Variables
@@ -9837,35 +9847,36 @@ public class HabiticaIcons {
         Stack<Matrix> currentTransformation = new Stack<Matrix>();
         currentTransformation.push(new Matrix());
         Paint paint = CacheForGuildCrest.paint;
+        GlobalCache.initializeTypefaceBuilders(context.getAssets());
         
         // Local Colors
-        int crestSilver5 = Color.argb(255, 141, 141, 141);
-        int crestBronze3 = Color.argb(255, 179, 98, 19);
-        int crestGold5 = Color.argb(255, 223, 145, 30);
-        int crestSilver6 = Color.argb(255, 141, 141, 141);
-        int crestBronze2 = Color.argb(255, 244, 165, 89);
-        int crestGold6 = Color.argb(255, 223, 145, 30);
-        int crestSilver4 = Color.argb(255, 175, 175, 175);
-        int crestBronze1 = Color.argb(255, 234, 140, 49);
-        int crestGold4 = Color.argb(255, 255, 166, 35);
-        int crestSilver3 = Color.argb(255, 141, 141, 141);
-        int crestGold3 = Color.argb(255, 223, 145, 30);
-        int crestSilver1 = Color.argb(255, 194, 194, 194);
-        int crestGold2 = Color.argb(255, 255, 210, 145);
         int crestBronze6 = Color.argb(255, 179, 98, 19);
         int crestGold1 = Color.argb(255, 255, 188, 90);
-        int crestBronze5 = Color.argb(255, 179, 98, 19);
-        int crestSilver2 = Color.argb(255, 217, 217, 217);
+        int crestSilver6 = Color.argb(255, 141, 141, 141);
+        int crestSilver1 = Color.argb(255, 194, 194, 194);
+        int crestBronze3 = Color.argb(255, 179, 98, 19);
+        int crestSilver5 = Color.argb(255, 141, 141, 141);
         int crestBronze4 = Color.argb(255, 215, 122, 32);
+        int crestGold4 = Color.argb(255, 255, 166, 35);
+        int crestGold2 = Color.argb(255, 255, 210, 145);
+        int crestBronze2 = Color.argb(255, 244, 165, 89);
+        int crestGold6 = Color.argb(255, 223, 145, 30);
+        int crestSilver3 = Color.argb(255, 141, 141, 141);
+        int crestSilver4 = Color.argb(255, 175, 175, 175);
+        int crestSilver2 = Color.argb(255, 217, 217, 217);
+        int crestBronze1 = Color.argb(255, 234, 140, 49);
+        int crestGold3 = Color.argb(255, 223, 145, 30);
+        int crestBronze5 = Color.argb(255, 179, 98, 19);
+        int crestGold5 = Color.argb(255, 223, 145, 30);
         
         // Local Variables
         boolean isPrivate = !isPublic;
-        int crestColor1 = memberCount < 100f ? crestBronze1 : (memberCount < 1000f ? crestSilver1 : crestGold1);
+        int crestColor5 = memberCount < 100f ? crestBronze5 : (memberCount < 1000f ? crestSilver5 : crestGold5);
         int crestColor4 = memberCount < 100f ? crestBronze4 : (memberCount < 1000f ? crestSilver4 : crestGold4);
+        int crestColor3 = memberCount < 100f ? crestBronze3 : (memberCount < 1000f ? crestSilver3 : crestGold3);
+        int crestColor1 = memberCount < 100f ? crestBronze1 : (memberCount < 1000f ? crestSilver1 : crestGold1);
         int crestColor6 = memberCount < 100f ? crestBronze6 : (memberCount < 1000f ? crestSilver6 : crestGold6);
         int crestColor2 = memberCount < 100f ? crestBronze2 : (memberCount < 1000f ? crestSilver2 : crestGold2);
-        int crestColor3 = memberCount < 100f ? crestBronze3 : (memberCount < 1000f ? crestSilver3 : crestGold3);
-        int crestColor5 = memberCount < 100f ? crestBronze5 : (memberCount < 1000f ? crestSilver5 : crestGold5);
         
         // Resize to Target Frame
         canvas.save();
@@ -10324,6 +10335,8 @@ public class HabiticaIcons {
         labelTextPaint.reset();
         labelTextPaint.setFlags(Paint.ANTI_ALIAS_FLAG);
         labelTextPaint.setColor(crestColor5);
+        GlobalCache.helveticaNeue.setTtcIndex(0);
+        labelTextPaint.setTypeface(GlobalCache.helveticaNeue.build());
         labelTextPaint.setTextSize(12f);
         StaticLayout labelStaticLayout = CacheForGuildCrest.labelStaticLayout.get((int) labelRect.width(), Layout.Alignment.ALIGN_CENTER, memberCountLabel, labelTextPaint);
         canvas.save();
@@ -10366,28 +10379,28 @@ public class HabiticaIcons {
         Paint paint = CacheForGuildCrestMedium.paint;
         
         // Local Colors
-        int crestBronze3 = Color.argb(255, 179, 98, 19);
-        int crestSilver6 = Color.argb(255, 141, 141, 141);
-        int crestBronze2 = Color.argb(255, 244, 165, 89);
-        int crestGold6 = Color.argb(255, 223, 145, 30);
-        int crestSilver4 = Color.argb(255, 175, 175, 175);
-        int crestBronze1 = Color.argb(255, 234, 140, 49);
-        int crestGold4 = Color.argb(255, 255, 166, 35);
-        int crestSilver3 = Color.argb(255, 141, 141, 141);
-        int crestGold3 = Color.argb(255, 223, 145, 30);
-        int crestSilver1 = Color.argb(255, 194, 194, 194);
-        int crestGold2 = Color.argb(255, 255, 210, 145);
         int crestBronze6 = Color.argb(255, 179, 98, 19);
         int crestGold1 = Color.argb(255, 255, 188, 90);
-        int crestSilver2 = Color.argb(255, 217, 217, 217);
+        int crestSilver6 = Color.argb(255, 141, 141, 141);
+        int crestSilver1 = Color.argb(255, 194, 194, 194);
+        int crestBronze3 = Color.argb(255, 179, 98, 19);
         int crestBronze4 = Color.argb(255, 215, 122, 32);
+        int crestGold4 = Color.argb(255, 255, 166, 35);
+        int crestGold2 = Color.argb(255, 255, 210, 145);
+        int crestBronze2 = Color.argb(255, 244, 165, 89);
+        int crestGold6 = Color.argb(255, 223, 145, 30);
+        int crestSilver3 = Color.argb(255, 141, 141, 141);
+        int crestSilver4 = Color.argb(255, 175, 175, 175);
+        int crestSilver2 = Color.argb(255, 217, 217, 217);
+        int crestBronze1 = Color.argb(255, 234, 140, 49);
+        int crestGold3 = Color.argb(255, 223, 145, 30);
         
         // Local Variables
-        int crestColor6 = memberCount < 100f ? crestBronze6 : (memberCount < 1000f ? crestSilver6 : crestGold6);
-        int crestColor3 = memberCount < 100f ? crestBronze3 : (memberCount < 1000f ? crestSilver3 : crestGold3);
-        int crestColor1 = memberCount < 100f ? crestBronze1 : (memberCount < 1000f ? crestSilver1 : crestGold1);
-        int crestColor2 = memberCount < 100f ? crestBronze2 : (memberCount < 1000f ? crestSilver2 : crestGold2);
         int crestColor4 = memberCount < 100f ? crestBronze4 : (memberCount < 1000f ? crestSilver4 : crestGold4);
+        int crestColor3 = memberCount < 100f ? crestBronze3 : (memberCount < 1000f ? crestSilver3 : crestGold3);
+        int crestColor2 = memberCount < 100f ? crestBronze2 : (memberCount < 1000f ? crestSilver2 : crestGold2);
+        int crestColor6 = memberCount < 100f ? crestBronze6 : (memberCount < 1000f ? crestSilver6 : crestGold6);
+        int crestColor1 = memberCount < 100f ? crestBronze1 : (memberCount < 1000f ? crestSilver1 : crestGold1);
         
         // Resize to Target Frame
         canvas.save();
@@ -10567,9 +10580,9 @@ public class HabiticaIcons {
         Paint paint = CacheForGuildCrestSmall.paint;
         
         // Local Colors
-        int crestGold4 = Color.argb(255, 255, 166, 35);
         int fillColor37 = Color.argb(255, 255, 255, 255);
         int crestSilver4 = Color.argb(255, 175, 175, 175);
+        int crestGold4 = Color.argb(255, 255, 166, 35);
         int crestBronze4 = Color.argb(255, 215, 122, 32);
         
         // Local Variables
@@ -10682,13 +10695,13 @@ public class HabiticaIcons {
         Paint paint = CacheForGuildHeaderCrest.paint;
         
         // Local Colors
-        int guildHeaderDark3 = PaintCodeColor.colorByChangingValue(guildHeader, 1f);
-        int guildHeaderDark5 = PaintCodeColor.colorByApplyingHighlight(guildHeaderDark3, 0.7f);
-        int guildHeaderDark4 = PaintCodeColor.colorByApplyingHighlight(guildHeaderDark3, 0.15f);
         int guildHeaderDark2 = PaintCodeColor.colorByChangingValue(guildHeader, 0.7f);
-        int guildHeaderDark6 = PaintCodeColor.colorByApplyingHighlight(guildHeaderDark2, 0.3f);
         int guildHeaderDark8 = PaintCodeColor.colorByApplyingHighlight(guildHeaderDark2, 0.4f);
         int guildHeaderDark7 = PaintCodeColor.colorByChangingValue(guildHeaderDark8, 1f);
+        int guildHeaderDark6 = PaintCodeColor.colorByApplyingHighlight(guildHeaderDark2, 0.3f);
+        int guildHeaderDark3 = PaintCodeColor.colorByChangingValue(guildHeader, 1f);
+        int guildHeaderDark4 = PaintCodeColor.colorByApplyingHighlight(guildHeaderDark3, 0.15f);
+        int guildHeaderDark5 = PaintCodeColor.colorByApplyingHighlight(guildHeaderDark3, 0.7f);
         int textForeground2 = Color.argb(255, 255, 255, 255);
         
         // Resize to Target Frame
@@ -11352,8 +11365,8 @@ public class HabiticaIcons {
         Paint paint = CacheForBlankAvatarIcon.paint;
         
         // Local Colors
-        int fillColor40 = Color.argb(255, 165, 161, 172);
         int fillColor101 = Color.argb(255, 247, 78, 82);
+        int fillColor40 = Color.argb(255, 165, 161, 172);
         
         // Resize to Target Frame
         canvas.save();
@@ -11627,9 +11640,9 @@ public class HabiticaIcons {
         int strokeColor19 = Color.argb(255, 154, 98, 255);
         
         // Local Variables
-        float filterNode3Position = 3f + 5f * percentage;
         float filterNode1Position = 3f + 10f * percentage;
         float filterNode2Position = 13f - 10f * percentage;
+        float filterNode3Position = 3f + 5f * percentage;
         
         // Resize to Target Frame
         canvas.save();
@@ -11954,85 +11967,6 @@ public class HabiticaIcons {
         
         canvas.restore();
     }
-
-    private static class CacheForBuffIconDark {
-        private static Paint paint = new Paint();
-        private static RectF originalFrame = new RectF(0f, 0f, 15f, 15f);
-        private static RectF resizedFrame = new RectF();
-        private static RectF rectangleRect = new RectF();
-        private static Path rectanglePath = new Path();
-        private static RectF bezier2Rect = new RectF();
-        private static Path bezier2Path = new Path();
-    }
-
-    public static void drawBuffIconDark(Canvas canvas) {
-        HabiticaIcons.drawBuffIconDark(canvas, new RectF(0f, 0f, 15f, 15f), ResizingBehavior.AspectFit);
-    }
-
-    public static void drawBuffIconDark(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
-        // General Declarations
-        Paint paint = CacheForBuffIcon.paint;
-
-        // Local Colors
-        int fillColor18 = Color.argb(255, 185, 172, 252);
-        int fillColor85 = Color.argb(255, 37, 29, 60);
-
-        // Resize to Target Frame
-        canvas.save();
-        RectF resizedFrame = CacheForBuffIcon.resizedFrame;
-        HabiticaIcons.resizingBehaviorApply(resizing, CacheForBuffIcon.originalFrame, targetFrame, resizedFrame);
-        canvas.translate(resizedFrame.left, resizedFrame.top);
-        canvas.scale(resizedFrame.width() / 15f, resizedFrame.height() / 15f);
-
-        // Rectangle
-        RectF rectangleRect = CacheForBuffIcon.rectangleRect;
-        rectangleRect.set(0f, 0f, 15f, 15f);
-        Path rectanglePath = CacheForBuffIcon.rectanglePath;
-        rectanglePath.reset();
-        rectanglePath.addRoundRect(rectangleRect, 2f, 2f, Path.Direction.CW);
-
-        paint.reset();
-        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-        paint.setStyle(Paint.Style.FILL);
-        paint.setColor(fillColor85);
-        canvas.drawPath(rectanglePath, paint);
-
-        // Bezier 2
-        RectF bezier2Rect = CacheForBuffIcon.bezier2Rect;
-        bezier2Rect.set(3.75f, 3f, 11.25f, 12f);
-        Path bezier2Path = CacheForBuffIcon.bezier2Path;
-        bezier2Path.reset();
-        bezier2Path.moveTo(7.5f, 3f);
-        bezier2Path.lineTo(11.25f, 7.5f);
-        bezier2Path.lineTo(9f, 7.5f);
-        bezier2Path.lineTo(9f, 9f);
-        bezier2Path.lineTo(6f, 9f);
-        bezier2Path.lineTo(6f, 7.5f);
-        bezier2Path.lineTo(3.75f, 7.5f);
-        bezier2Path.lineTo(7.5f, 3f);
-        bezier2Path.close();
-        bezier2Path.moveTo(6f, 9.75f);
-        bezier2Path.lineTo(9f, 9.75f);
-        bezier2Path.lineTo(9f, 10.5f);
-        bezier2Path.lineTo(6f, 10.5f);
-        bezier2Path.lineTo(6f, 9.75f);
-        bezier2Path.close();
-        bezier2Path.moveTo(6f, 11.25f);
-        bezier2Path.lineTo(9f, 11.25f);
-        bezier2Path.lineTo(9f, 12f);
-        bezier2Path.lineTo(6f, 12f);
-        bezier2Path.lineTo(6f, 11.25f);
-        bezier2Path.close();
-
-        paint.reset();
-        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-        bezier2Path.setFillType(Path.FillType.EVEN_ODD);
-        paint.setStyle(Paint.Style.FILL);
-        paint.setColor(fillColor18);
-        canvas.drawPath(bezier2Path, paint);
-
-        canvas.restore();
-    }
     
     private static class CacheForParticipantsIcon {
         private static Paint paint = new Paint();
@@ -12055,9 +11989,9 @@ public class HabiticaIcons {
         Paint paint = CacheForParticipantsIcon.paint;
         
         // Local Colors
-        int fillColor25 = Color.argb(255, 225, 224, 227);
-        int fillColor39 = Color.argb(255, 189, 168, 255);
         int fillColor104 = Color.argb(255, 249, 249, 249);
+        int fillColor39 = Color.argb(255, 189, 168, 255);
+        int fillColor25 = Color.argb(255, 225, 224, 227);
         
         // Resize to Target Frame
         canvas.save();
@@ -12567,6 +12501,449 @@ public class HabiticaIcons {
         canvas.restore();
     }
     
+    private static class CacheForItemIndicatorLockedDark {
+        private static RectF originalFrame = new RectF(0f, 0f, 28f, 28f);
+        private static RectF resizedFrame = new RectF();
+        private static RectF symbolRect = new RectF();
+        private static RectF symbolTargetRect = new RectF();
+    }
+    
+    private static void drawItemIndicatorLockedDark(Canvas canvas, int lockColor) {
+        HabiticaIcons.drawItemIndicatorLockedDark(canvas, new RectF(0f, 0f, 28f, 28f), ResizingBehavior.AspectFit, lockColor);
+    }
+    
+    private static void drawItemIndicatorLockedDark(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, int lockColor) {
+        // Resize to Target Frame
+        canvas.save();
+        RectF resizedFrame = CacheForItemIndicatorLockedDark.resizedFrame;
+        HabiticaIcons.resizingBehaviorApply(resizing, CacheForItemIndicatorLockedDark.originalFrame, targetFrame, resizedFrame);
+        canvas.translate(resizedFrame.left, resizedFrame.top);
+        canvas.scale(resizedFrame.width() / 28f, resizedFrame.height() / 28f);
+        
+        // Symbol
+        RectF symbolRect = CacheForItemIndicatorLockedDark.symbolRect;
+        symbolRect.set(0f, 0f, 28f, 28f);
+        canvas.save();
+        canvas.clipRect(symbolRect);
+        canvas.translate(symbolRect.left, symbolRect.top);
+        RectF symbolTargetRect = CacheForItemIndicatorLockedDark.symbolTargetRect;
+        symbolTargetRect.set(0f, 0f, symbolRect.width(), symbolRect.height());
+        HabiticaIcons.drawItemIndicator(canvas, symbolTargetRect, ResizingBehavior.Stretch, lockColor, true, false, true);
+        canvas.restore();
+        
+        canvas.restore();
+    }
+    
+    private static class CacheForBuffIconDark {
+        private static Paint paint = new Paint();
+        private static RectF originalFrame = new RectF(0f, 0f, 15f, 15f);
+        private static RectF resizedFrame = new RectF();
+        private static RectF rectangleRect = new RectF();
+        private static Path rectanglePath = new Path();
+        private static RectF bezier2Rect = new RectF();
+        private static Path bezier2Path = new Path();
+    }
+    
+    public static void drawBuffIconDark(Canvas canvas) {
+        HabiticaIcons.drawBuffIconDark(canvas, new RectF(0f, 0f, 15f, 15f), ResizingBehavior.AspectFit);
+    }
+    
+    public static void drawBuffIconDark(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
+        // General Declarations
+        Paint paint = CacheForBuffIconDark.paint;
+        
+        // Local Colors
+        int fillColor39 = Color.argb(255, 189, 168, 255);
+        int buffBackgroundColorDark = Color.argb(255, 70, 40, 125);
+        
+        // Resize to Target Frame
+        canvas.save();
+        RectF resizedFrame = CacheForBuffIconDark.resizedFrame;
+        HabiticaIcons.resizingBehaviorApply(resizing, CacheForBuffIconDark.originalFrame, targetFrame, resizedFrame);
+        canvas.translate(resizedFrame.left, resizedFrame.top);
+        canvas.scale(resizedFrame.width() / 15f, resizedFrame.height() / 15f);
+        
+        // Rectangle
+        RectF rectangleRect = CacheForBuffIconDark.rectangleRect;
+        rectangleRect.set(0f, 0f, 15f, 15f);
+        Path rectanglePath = CacheForBuffIconDark.rectanglePath;
+        rectanglePath.reset();
+        rectanglePath.addRoundRect(rectangleRect, 2f, 2f, Path.Direction.CW);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(buffBackgroundColorDark);
+        canvas.drawPath(rectanglePath, paint);
+        
+        // Bezier 2
+        RectF bezier2Rect = CacheForBuffIconDark.bezier2Rect;
+        bezier2Rect.set(3.75f, 3f, 11.25f, 12f);
+        Path bezier2Path = CacheForBuffIconDark.bezier2Path;
+        bezier2Path.reset();
+        bezier2Path.moveTo(7.5f, 3f);
+        bezier2Path.lineTo(11.25f, 7.5f);
+        bezier2Path.lineTo(9f, 7.5f);
+        bezier2Path.lineTo(9f, 9f);
+        bezier2Path.lineTo(6f, 9f);
+        bezier2Path.lineTo(6f, 7.5f);
+        bezier2Path.lineTo(3.75f, 7.5f);
+        bezier2Path.lineTo(7.5f, 3f);
+        bezier2Path.close();
+        bezier2Path.moveTo(6f, 9.75f);
+        bezier2Path.lineTo(9f, 9.75f);
+        bezier2Path.lineTo(9f, 10.5f);
+        bezier2Path.lineTo(6f, 10.5f);
+        bezier2Path.lineTo(6f, 9.75f);
+        bezier2Path.close();
+        bezier2Path.moveTo(6f, 11.25f);
+        bezier2Path.lineTo(9f, 11.25f);
+        bezier2Path.lineTo(9f, 12f);
+        bezier2Path.lineTo(6f, 12f);
+        bezier2Path.lineTo(6f, 11.25f);
+        bezier2Path.close();
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        bezier2Path.setFillType(Path.FillType.EVEN_ODD);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(fillColor39);
+        canvas.drawPath(bezier2Path, paint);
+        
+        canvas.restore();
+    }
+    
+    private static class CacheForStats {
+        private static Paint paint = new Paint();
+        private static RectF originalFrame = new RectF(0f, 0f, 30f, 22f);
+        private static RectF resizedFrame = new RectF();
+        private static RectF bezierRect = new RectF();
+        private static Path bezierPath = new Path();
+        private static RectF group = new RectF();
+        private static Path clipPath = new Path();
+        private static RectF bezier2Rect = new RectF();
+        private static Path bezier2Path = new Path();
+        private static RectF rectangleRect = new RectF();
+        private static Path rectanglePath = new Path();
+        private static RectF rectangle2Rect = new RectF();
+        private static Path rectangle2Path = new Path();
+        private static RectF rectangle3Rect = new RectF();
+        private static Path rectangle3Path = new Path();
+        private static RectF rectangle4Rect = new RectF();
+        private static Path rectangle4Path = new Path();
+        private static RectF rectangle5Rect = new RectF();
+        private static Path rectangle5Path = new Path();
+        private static RectF rectangle6Rect = new RectF();
+        private static Path rectangle6Path = new Path();
+        private static RectF rectangle7Rect = new RectF();
+        private static Path rectangle7Path = new Path();
+        private static RectF rectangle8Rect = new RectF();
+        private static Path rectangle8Path = new Path();
+        private static RectF rectangle9Rect = new RectF();
+        private static Path rectangle9Path = new Path();
+        private static RectF rectangle10Rect = new RectF();
+        private static Path rectangle10Path = new Path();
+        private static RectF rectangle11Rect = new RectF();
+        private static Path rectangle11Path = new Path();
+    }
+    
+    public static void drawStats(Canvas canvas) {
+        HabiticaIcons.drawStats(canvas, new RectF(0f, 0f, 30f, 22f), ResizingBehavior.AspectFit);
+    }
+    
+    public static void drawStats(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
+        // General Declarations
+        Paint paint = CacheForStats.paint;
+        
+        // Local Colors
+        int fillColor89 = Color.argb(255, 227, 143, 61);
+        int strokeColor21 = Color.argb(255, 135, 129, 144);
+        int fillColor25 = Color.argb(255, 225, 224, 227);
+        int fillColor106 = Color.argb(255, 216, 216, 216);
+        int fillColor107 = Color.argb(255, 179, 98, 19);
+        int fillColor35 = Color.argb(255, 195, 192, 199);
+        int fillColor40 = Color.argb(255, 165, 161, 172);
+        
+        // Resize to Target Frame
+        canvas.save();
+        RectF resizedFrame = CacheForStats.resizedFrame;
+        HabiticaIcons.resizingBehaviorApply(resizing, CacheForStats.originalFrame, targetFrame, resizedFrame);
+        canvas.translate(resizedFrame.left, resizedFrame.top);
+        canvas.scale(resizedFrame.width() / 30f, resizedFrame.height() / 22f);
+        
+        // Bezier
+        RectF bezierRect = CacheForStats.bezierRect;
+        bezierRect.set(1.75f, 1.75f, 28.25f, 20.25f);
+        Path bezierPath = CacheForStats.bezierPath;
+        bezierPath.reset();
+        bezierPath.moveTo(11.25f, 19f);
+        bezierPath.lineTo(10f, 20.25f);
+        bezierPath.lineTo(6f, 20.25f);
+        bezierPath.lineTo(4.75f, 19f);
+        bezierPath.lineTo(4.75f, 17.25f);
+        bezierPath.lineTo(3f, 17.25f);
+        bezierPath.lineTo(1.75f, 16f);
+        bezierPath.lineTo(1.75f, 6f);
+        bezierPath.lineTo(3f, 4.75f);
+        bezierPath.lineTo(4.75f, 4.75f);
+        bezierPath.lineTo(4.75f, 3f);
+        bezierPath.lineTo(6f, 1.75f);
+        bezierPath.lineTo(10f, 1.75f);
+        bezierPath.lineTo(11.25f, 3f);
+        bezierPath.lineTo(11.25f, 7.75f);
+        bezierPath.lineTo(18.75f, 7.75f);
+        bezierPath.lineTo(18.75f, 3f);
+        bezierPath.lineTo(20f, 1.75f);
+        bezierPath.lineTo(24f, 1.75f);
+        bezierPath.lineTo(25.25f, 3f);
+        bezierPath.lineTo(25.25f, 4.75f);
+        bezierPath.lineTo(27f, 4.75f);
+        bezierPath.lineTo(28.25f, 6f);
+        bezierPath.lineTo(28.25f, 16f);
+        bezierPath.lineTo(27f, 17.25f);
+        bezierPath.lineTo(25.25f, 17.25f);
+        bezierPath.lineTo(25.25f, 19f);
+        bezierPath.lineTo(24f, 20.25f);
+        bezierPath.lineTo(20f, 20.25f);
+        bezierPath.lineTo(18.75f, 19f);
+        bezierPath.lineTo(18.75f, 14.25f);
+        bezierPath.lineTo(11.25f, 14.25f);
+        bezierPath.lineTo(11.25f, 19f);
+        bezierPath.close();
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        bezierPath.setFillType(Path.FillType.EVEN_ODD);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(fillColor106);
+        canvas.drawPath(bezierPath, paint);
+        
+        // Group
+        {
+            RectF group = CacheForStats.group;
+            group.set(-22f, -22f, 52f, 44f);
+            canvas.save();
+            
+            // Clip
+            Path clipPath = CacheForStats.clipPath;
+            clipPath.reset();
+            clipPath.moveTo(-22f, -22f);
+            clipPath.lineTo(52f, -22f);
+            clipPath.lineTo(52f, 44f);
+            clipPath.lineTo(-22f, 44f);
+            clipPath.lineTo(-22f, -22f);
+            clipPath.close();
+            clipPath.moveTo(10f, 19f);
+            clipPath.lineTo(6f, 19f);
+            clipPath.lineTo(6f, 16f);
+            clipPath.lineTo(3f, 16f);
+            clipPath.lineTo(3f, 6f);
+            clipPath.lineTo(6f, 6f);
+            clipPath.lineTo(6f, 3f);
+            clipPath.lineTo(10f, 3f);
+            clipPath.lineTo(10f, 9f);
+            clipPath.lineTo(20f, 9f);
+            clipPath.lineTo(20f, 3f);
+            clipPath.lineTo(24f, 3f);
+            clipPath.lineTo(24f, 6f);
+            clipPath.lineTo(27f, 6f);
+            clipPath.lineTo(27f, 16f);
+            clipPath.lineTo(24f, 16f);
+            clipPath.lineTo(24f, 19f);
+            clipPath.lineTo(20f, 19f);
+            clipPath.lineTo(20f, 13f);
+            clipPath.lineTo(10f, 13f);
+            clipPath.lineTo(10f, 19f);
+            clipPath.close();
+            canvas.clipPath(clipPath);
+            
+            // Bezier 2
+            RectF bezier2Rect = CacheForStats.bezier2Rect;
+            bezier2Rect.set(3f, 3f, 27f, 19f);
+            Path bezier2Path = CacheForStats.bezier2Path;
+            bezier2Path.reset();
+            bezier2Path.moveTo(10f, 19f);
+            bezier2Path.lineTo(6f, 19f);
+            bezier2Path.lineTo(6f, 16f);
+            bezier2Path.lineTo(3f, 16f);
+            bezier2Path.lineTo(3f, 6f);
+            bezier2Path.lineTo(6f, 6f);
+            bezier2Path.lineTo(6f, 3f);
+            bezier2Path.lineTo(10f, 3f);
+            bezier2Path.lineTo(10f, 9f);
+            bezier2Path.lineTo(20f, 9f);
+            bezier2Path.lineTo(20f, 3f);
+            bezier2Path.lineTo(24f, 3f);
+            bezier2Path.lineTo(24f, 6f);
+            bezier2Path.lineTo(27f, 6f);
+            bezier2Path.lineTo(27f, 16f);
+            bezier2Path.lineTo(24f, 16f);
+            bezier2Path.lineTo(24f, 19f);
+            bezier2Path.lineTo(20f, 19f);
+            bezier2Path.lineTo(20f, 13f);
+            bezier2Path.lineTo(10f, 13f);
+            bezier2Path.lineTo(10f, 19f);
+            bezier2Path.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStrokeWidth(5f);
+            paint.setStrokeMiter(10f);
+            canvas.save();
+            paint.setStyle(Paint.Style.STROKE);
+            paint.setColor(strokeColor21);
+            canvas.drawPath(bezier2Path, paint);
+            canvas.restore();
+            
+            canvas.restore();
+        }
+        
+        // Rectangle
+        RectF rectangleRect = CacheForStats.rectangleRect;
+        rectangleRect.set(3f, 6f, 6f, 16f);
+        Path rectanglePath = CacheForStats.rectanglePath;
+        rectanglePath.reset();
+        rectanglePath.addRect(rectangleRect, Path.Direction.CW);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(fillColor40);
+        canvas.drawPath(rectanglePath, paint);
+        
+        // Rectangle 2
+        RectF rectangle2Rect = CacheForStats.rectangle2Rect;
+        rectangle2Rect.set(24f, 6f, 27f, 16f);
+        Path rectangle2Path = CacheForStats.rectangle2Path;
+        rectangle2Path.reset();
+        rectangle2Path.addRect(rectangle2Rect, Path.Direction.CW);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(fillColor40);
+        canvas.drawPath(rectangle2Path, paint);
+        
+        // Rectangle 3
+        RectF rectangle3Rect = CacheForStats.rectangle3Rect;
+        rectangle3Rect.set(10f, 9f, 20f, 13f);
+        Path rectangle3Path = CacheForStats.rectangle3Path;
+        rectangle3Path.reset();
+        rectangle3Path.addRect(rectangle3Rect, Path.Direction.CW);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(fillColor107);
+        canvas.drawPath(rectangle3Path, paint);
+        
+        // Rectangle 4
+        RectF rectangle4Rect = CacheForStats.rectangle4Rect;
+        rectangle4Rect.set(12f, 9f, 14f, 13f);
+        Path rectangle4Path = CacheForStats.rectangle4Path;
+        rectangle4Path.reset();
+        rectangle4Path.addRect(rectangle4Rect, Path.Direction.CW);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(fillColor89);
+        canvas.drawPath(rectangle4Path, paint);
+        
+        // Rectangle 5
+        RectF rectangle5Rect = CacheForStats.rectangle5Rect;
+        rectangle5Rect.set(16f, 9f, 18f, 13f);
+        Path rectangle5Path = CacheForStats.rectangle5Path;
+        rectangle5Path.reset();
+        rectangle5Path.addRect(rectangle5Rect, Path.Direction.CW);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(fillColor89);
+        canvas.drawPath(rectangle5Path, paint);
+        
+        // Rectangle 6
+        RectF rectangle6Rect = CacheForStats.rectangle6Rect;
+        rectangle6Rect.set(6f, 3f, 10f, 19f);
+        Path rectangle6Path = CacheForStats.rectangle6Path;
+        rectangle6Path.reset();
+        rectangle6Path.addRect(rectangle6Rect, Path.Direction.CW);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(fillColor35);
+        canvas.drawPath(rectangle6Path, paint);
+        
+        // Rectangle 7
+        RectF rectangle7Rect = CacheForStats.rectangle7Rect;
+        rectangle7Rect.set(20f, 3f, 24f, 19f);
+        Path rectangle7Path = CacheForStats.rectangle7Path;
+        rectangle7Path.reset();
+        rectangle7Path.addRect(rectangle7Rect, Path.Direction.CW);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(fillColor35);
+        canvas.drawPath(rectangle7Path, paint);
+        
+        // Rectangle 8
+        RectF rectangle8Rect = CacheForStats.rectangle8Rect;
+        rectangle8Rect.set(6f, 3f, 10f, 11f);
+        Path rectangle8Path = CacheForStats.rectangle8Path;
+        rectangle8Path.reset();
+        rectangle8Path.addRect(rectangle8Rect, Path.Direction.CW);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(fillColor25);
+        canvas.drawPath(rectangle8Path, paint);
+        
+        // Rectangle 9
+        RectF rectangle9Rect = CacheForStats.rectangle9Rect;
+        rectangle9Rect.set(3f, 6f, 6f, 11f);
+        Path rectangle9Path = CacheForStats.rectangle9Path;
+        rectangle9Path.reset();
+        rectangle9Path.addRect(rectangle9Rect, Path.Direction.CW);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(fillColor35);
+        canvas.drawPath(rectangle9Path, paint);
+        
+        // Rectangle 10
+        RectF rectangle10Rect = CacheForStats.rectangle10Rect;
+        rectangle10Rect.set(24f, 6f, 27f, 11f);
+        Path rectangle10Path = CacheForStats.rectangle10Path;
+        rectangle10Path.reset();
+        rectangle10Path.addRect(rectangle10Rect, Path.Direction.CW);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(fillColor35);
+        canvas.drawPath(rectangle10Path, paint);
+        
+        // Rectangle 11
+        RectF rectangle11Rect = CacheForStats.rectangle11Rect;
+        rectangle11Rect.set(20f, 3f, 24f, 11f);
+        Path rectangle11Path = CacheForStats.rectangle11Path;
+        rectangle11Path.reset();
+        rectangle11Path.addRect(rectangle11Rect, Path.Direction.CW);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(fillColor25);
+        canvas.drawPath(rectangle11Path, paint);
+        
+        canvas.restore();
+    }
+    
     
     // Canvas Images
     // Tab
@@ -12967,10 +13344,10 @@ public class HabiticaIcons {
         return imageOfInfoIcon;
     }
     
-    public static Bitmap imageOfContributorBadge(float contributorTier, boolean isNPC) {
+    public static Bitmap imageOfContributorBadge(float _1, boolean isNPC) {
         Bitmap imageOfContributorBadge = Bitmap.createBitmap(16, 16, Bitmap.Config.ARGB_8888);
         Canvas canvas = new Canvas(imageOfContributorBadge);
-        HabiticaIcons.drawContributorBadge(canvas, contributorTier, isNPC);
+        HabiticaIcons.drawContributorBadge(canvas, _1, isNPC);
         
         return imageOfContributorBadge;
     }
@@ -13199,6 +13576,26 @@ public class HabiticaIcons {
         return imageOfAlertIcon;
     }
     
+    public static Bitmap imageOfItemIndicatorLockedDark(int lockColor) {
+        Bitmap imageOfItemIndicatorLockedDark = Bitmap.createBitmap(28, 28, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(imageOfItemIndicatorLockedDark);
+        HabiticaIcons.drawItemIndicatorLockedDark(canvas, lockColor);
+        
+        return imageOfItemIndicatorLockedDark;
+    }
+    
+    private static Bitmap imageOfBuffIconDark = null;
+    public static Bitmap imageOfBuffIconDark() {
+        if (imageOfBuffIconDark != null)
+            return imageOfBuffIconDark;
+        
+        imageOfBuffIconDark = Bitmap.createBitmap(15, 15, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(imageOfBuffIconDark);
+        HabiticaIcons.drawBuffIconDark(canvas);
+        
+        return imageOfBuffIconDark;
+    }
+    
     
     // Resizing Behavior
     public static void resizingBehaviorApply(ResizingBehavior behavior, RectF rect, RectF target, RectF result) {
@@ -13244,25 +13641,25 @@ public class HabiticaIcons {
 
 class PaintCodeColor extends Color {
     private static float[] ColorToHSV(int originalColor) {
-        float[] hsv = new float[3];
+        float hsv[] = new float[3];
         RGBToHSV(red(originalColor), green(originalColor), blue(originalColor), hsv);
         return hsv;
     }
     
     public static int colorByChangingHue(int originalColor, float newHue) {
-        float[] hsv = ColorToHSV(originalColor);
+        float hsv[] = ColorToHSV(originalColor);
         hsv[0] = newHue;
         return HSVToColor(alpha(originalColor), hsv);
     }
     
     public static int colorByChangingSaturation(int originalColor, float newSaturation) {
-        float[] hsv = ColorToHSV(originalColor);
+        float hsv[] = ColorToHSV(originalColor);
         hsv[1] = newSaturation;
         return HSVToColor(alpha(originalColor), hsv);
     }
     
     public static int colorByChangingValue(int originalColor, float newValue) {
-        float[] hsv = ColorToHSV(originalColor);
+        float hsv[] = ColorToHSV(originalColor);
         hsv[2] = newValue;
         return HSVToColor(alpha(originalColor), hsv);
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIconsHelper.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIconsHelper.java
index 79889cb5d..16ac411a9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIconsHelper.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIconsHelper.java
@@ -51,6 +51,19 @@ public class HabiticaIconsHelper {
         return imageOfMagic;
     }
 
+    private static Bitmap imageOfMagicLarge = null;
+    public static Bitmap imageOfMagicLarge() {
+        if (imageOfMagicLarge != null)
+            return imageOfMagicLarge;
+
+        int size = scaleSize(36);
+        imageOfMagicLarge = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(imageOfMagicLarge);
+        HabiticaIcons.drawMagic(canvas, new RectF(0f, 0f, size, size), HabiticaIcons.ResizingBehavior.AspectFit);
+
+        return imageOfMagicLarge;
+    }
+
     private static Bitmap imageOfGold = null;
     public static Bitmap imageOfGold() {
         if (imageOfGold != null)
@@ -93,6 +106,19 @@ public class HabiticaIconsHelper {
         return imageOfHourglass;
     }
 
+    private static Bitmap imageOfHourglassLarge = null;
+    public static Bitmap imageOfHourglassLarge() {
+        if (imageOfHourglassLarge != null)
+            return imageOfHourglassLarge;
+
+        int size = scaleSize(40);
+        imageOfHourglassLarge = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(imageOfHourglassLarge);
+        HabiticaIcons.drawHourglass(canvas, new RectF(0f, 0f, size, size), HabiticaIcons.ResizingBehavior.AspectFit);
+
+        return imageOfHourglassLarge;
+    }
+
     private static Bitmap imageOfExperienceReward = null;
     public static Bitmap imageOfExperienceReward() {
         if (imageOfExperienceReward != null)
@@ -155,8 +181,7 @@ public class HabiticaIconsHelper {
         int size = scaleSize(36);
         imageOfHeartLarge = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
         Canvas canvas = new Canvas(imageOfHeartLarge);
-        canvas.scale(displayDensity, displayDensity);
-        HabiticaIcons.drawHeart(canvas, false);
+        HabiticaIcons.drawHeart(canvas, new RectF(0f, 0f, size, size), HabiticaIcons.ResizingBehavior.AspectFit, false);
 
         return imageOfHeartLarge;
     }
@@ -263,7 +288,7 @@ public class HabiticaIconsHelper {
         imageOfItemIndicatorNumber = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
         Canvas canvas = new Canvas(imageOfItemIndicatorNumber);
         canvas.scale(displayDensity, displayDensity);
-        HabiticaIcons.drawItemIndicator(canvas, Color.parseColor("#C3C0C7"), false, false);
+        HabiticaIcons.drawItemIndicator(canvas, Color.parseColor("#C3C0C7"), false, false, false);
 
         return imageOfItemIndicatorNumber;
     }
@@ -277,7 +302,7 @@ public class HabiticaIconsHelper {
         imageOfItemIndicatorLocked = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
         Canvas canvas = new Canvas(imageOfItemIndicatorLocked);
         canvas.scale(displayDensity, displayDensity);
-        HabiticaIcons.drawItemIndicator(canvas, Color.parseColor("#C3C0C7"), true, false);
+        HabiticaIcons.drawItemIndicator(canvas, Color.parseColor("#C3C0C7"), true, false, false);
         return imageOfItemIndicatorLocked;
     }
 
@@ -290,7 +315,7 @@ public class HabiticaIconsHelper {
         imageOfItemIndicatorLimited = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
         Canvas canvas = new Canvas(imageOfItemIndicatorLimited);
         canvas.scale(displayDensity, displayDensity);
-        HabiticaIcons.drawItemIndicator(canvas, Color.parseColor("#C3C0C7"), false, true);
+        HabiticaIcons.drawItemIndicator(canvas, Color.parseColor("#C3C0C7"), false, true, false);
 
         return imageOfItemIndicatorLimited;
     }
@@ -750,4 +775,15 @@ public class HabiticaIconsHelper {
 
         return imageOfHabitControlMinus;
     }
+
+    public static Bitmap imageOfStats() {
+        int width = scaleSize(30);
+        int height = scaleSize(30);
+        Bitmap imageOfHabitControlMinus = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(imageOfHabitControlMinus);
+        canvas.scale(displayDensity, displayDensity);
+        HabiticaIcons.drawStats(canvas);
+
+        return imageOfHabitControlMinus;
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/SupportCollapsibleSection.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/SupportCollapsibleSection.kt
new file mode 100644
index 000000000..b960feebd
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/SupportCollapsibleSection.kt
@@ -0,0 +1,52 @@
+package com.habitrpg.android.habitica.ui.views
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import android.widget.LinearLayout
+import androidx.core.content.ContextCompat
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.databinding.SupportCollapsibleSectionBinding
+import com.habitrpg.android.habitica.extensions.layoutInflater
+import com.habitrpg.android.habitica.ui.helpers.MarkdownParser
+
+class SupportCollapsibleSection : LinearLayout {
+    constructor(context: Context) : super(context) {
+        init(null, 0)
+    }
+
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
+        init(attrs, 0)
+    }
+
+    constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super(context, attrs, defStyle) {
+        init(attrs, defStyle)
+    }
+
+    private fun init(attrs: AttributeSet?, defStyle: Int) {
+        val binding = SupportCollapsibleSectionBinding.inflate(context.layoutInflater, this)
+        val a = context.obtainStyledAttributes(
+                attrs, R.styleable.SupportCollapsibleSection, defStyle, 0)
+
+        orientation = VERTICAL
+
+        binding.titleView.text = a.getString(R.styleable.SupportCollapsibleSection_title)
+        binding.subtitleView.text = a.getString(R.styleable.SupportCollapsibleSection_subtitle)
+        binding.descriptionView.text = MarkdownParser.parseMarkdown(a.getString(R.styleable.SupportCollapsibleSection_description))
+        binding.titleView.setTextColor(a.getColor(R.styleable.SupportCollapsibleSection_titleColor, ContextCompat.getColor(context, R.color.gray_50)))
+
+        background = context.getDrawable(R.drawable.layout_rounded_bg_gray_700)
+
+        a.recycle()
+
+        setOnClickListener {
+            binding.descriptionView.visibility = if (binding.descriptionView.visibility == View.VISIBLE){
+                binding.caretView.setImageResource(R.drawable.ic_keyboard_arrow_down_black_24dp)
+                View.GONE
+            } else{
+                binding.caretView.setImageResource(R.drawable.ic_keyboard_arrow_up_black_24dp)
+                View.VISIBLE
+            }
+        }
+    }
+}
diff --git a/build.gradle b/build.gradle
index 3c189c5d7..520febb9d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.0-rc03'
+        classpath 'com.android.tools.build:gradle:3.6.1'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
         classpath 'com.google.gms:google-services:4.3.3'
         classpath "io.realm:realm-gradle-plugin:6.0.2"