From 31a9e36ad7db37de527dd78d0dbf96d8ff007642 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Tue, 30 Jan 2018 13:41:22 +0100
Subject: [PATCH] implement additional tavern features

---
 Habitica/AndroidManifest.xml                  |    2 +-
 Habitica/build.gradle                         |   30 +-
 .../res/drawable/rounded_yellow_10_square.xml |   16 +
 .../res/layout/fragment_tavern_detail.xml     |   98 +-
 .../res/layout/view_collapsible_section.xml   |   36 +
 Habitica/res/values/attrs.xml                 |    6 +-
 Habitica/res/values/colors.contributor.xml    |   18 +-
 Habitica/res/values/strings.xml               |   10 +
 Habitica/res/values/styles.xml                |   12 +
 .../SetupCustomizationRepositoryImpl.java     |  112 +-
 .../events/commands/OpenMenuItemCommand.java  |    7 +
 .../habitica/models/SetupCustomization.java   |  111 --
 .../habitica/models/SetupCustomization.kt     |  106 ++
 .../habitica/models/members/PlayerTier.kt     |   39 +
 .../setup/CustomizationSetupAdapter.java      |   54 +-
 .../fragments/setup/AvatarSetupFragment.java  |    4 +-
 .../fragments/social/TavernDetailFragment.kt  |   69 +-
 .../ui/fragments/social/TavernFragment.java   |  161 --
 .../ui/fragments/social/TavernFragment.kt     |  114 ++
 .../habitica/ui/menu/MainDrawerBuilder.kt     |    6 +-
 .../ui/menu/SectionIconDrawerItem.java        |  127 --
 .../ui/views/CollapsibleSectionView.kt        |  102 ++
 .../habitica/ui/views/HabiticaIcons.java      | 1501 ++++++++++++++++-
 .../ui/views/HabiticaIconsHelper.java         |   55 +
 .../habitica/ui/views/social/UsernameLabel.kt |   48 +
 build.gradle                                  |    2 +-
 26 files changed, 2242 insertions(+), 604 deletions(-)
 create mode 100644 Habitica/res/drawable/rounded_yellow_10_square.xml
 create mode 100644 Habitica/res/layout/view_collapsible_section.xml
 delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/models/SetupCustomization.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/models/SetupCustomization.kt
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/models/members/PlayerTier.kt
 delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.kt
 delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/SectionIconDrawerItem.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CollapsibleSectionView.kt
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/UsernameLabel.kt

diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index 32342b111..cb4593dd8 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -9,7 +9,7 @@
 
     <uses-sdk
         android:minSdkVersion="15"
-        android:targetSdkVersion="26" />
+        android:targetSdkVersion="27" />
 
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index cf6006298..a1e6f36af 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -43,8 +43,8 @@ repositories {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     //Networking
-    implementation 'com.squareup.okhttp3:okhttp:3.9.0'
-    implementation 'com.squareup.okhttp3:logging-interceptor:3.9.0'
+    implementation 'com.squareup.okhttp3:okhttp:3.9.1'
+    implementation 'com.squareup.okhttp3:logging-interceptor:3.9.1'
     //REST API handling
     implementation('com.squareup.retrofit2:retrofit:2.3.0') {
         exclude module: 'okhttp'
@@ -52,24 +52,24 @@ dependencies {
     implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
     implementation 'com.squareup.retrofit2:adapter-rxjava:2.3.0'
     //Crash Logging
-    releaseImplementation('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') {
+    releaseImplementation('com.crashlytics.sdk.android:crashlytics:2.8.0@aar') {
         transitive = true
     }
     // View Elements Binding :)
     implementation 'com.jakewharton:butterknife:8.8.1'
     kapt 'com.jakewharton:butterknife-compiler:8.8.1'
     //Dependency Injection
-    implementation 'com.google.dagger:dagger:2.12'
-    kapt 'com.google.dagger:dagger-compiler:2.12'
+    implementation 'com.google.dagger:dagger:2.14.1'
+    kapt 'com.google.dagger:dagger-compiler:2.14.1'
     compileOnly 'org.glassfish:javax.annotation:10.0-b28'
     //App Compatibility and Material Design
     implementation('com.mikepenz:materialdrawer:5.8.3@aar') {
         transitive = true
     }
-    implementation 'com.android.support:appcompat-v7:27.0.1'
-    implementation 'com.android.support:design:27.0.1'
-    implementation 'com.android.support:recyclerview-v7:27.0.1'
-    implementation 'com.android.support:preference-v14:27.0.1'
+    implementation 'com.android.support:appcompat-v7:27.0.2'
+    implementation 'com.android.support:design:27.0.2'
+    implementation 'com.android.support:recyclerview-v7:27.0.2'
+    implementation 'com.android.support:preference-v14:27.0.2'
     //QR Code
     implementation 'com.github.kenglxn.QRGen:android:2.2.0'
     // Emojis
@@ -83,9 +83,9 @@ dependencies {
     // a better fab alternative
     implementation 'com.github.clans:fab:1.6.4'
     //Eventbus
-    implementation 'org.greenrobot:eventbus:3.0.0'
+    implementation 'org.greenrobot:eventbus:3.1.1'
     // IAP Handling / Verification
-    implementation 'org.solovyev.android:checkout:1.0.1'
+    implementation 'org.solovyev.android:checkout:1.2.1'
     //Facebook
     implementation('com.facebook.android:facebook-android-sdk:4.19.0') {
         transitive = true
@@ -95,14 +95,14 @@ dependencies {
     implementation 'com.github.javadev:underscore:1.23'
     //RxJava
     implementation 'io.reactivex:rxandroid:1.2.1'
-    implementation 'io.reactivex:rxjava:1.3.2'
+    implementation 'io.reactivex:rxjava:1.3.5'
     //Analytics
-    implementation 'com.amplitude:android-sdk:2.14.1'
+    implementation 'com.amplitude:android-sdk:2.16.0'
     // Fresco Image Management Library
-    implementation('com.facebook.fresco:fresco:1.5.0') {
+    implementation('com.facebook.fresco:fresco:1.8.0') {
         exclude module: 'bolts-android'
     }
-    implementation('com.facebook.fresco:animated-gif:1.5.0') {
+    implementation('com.facebook.fresco:animated-gif:1.8.0') {
         exclude module: 'bolts-android'
     }
     //Tests
diff --git a/Habitica/res/drawable/rounded_yellow_10_square.xml b/Habitica/res/drawable/rounded_yellow_10_square.xml
new file mode 100644
index 000000000..0451f7911
--- /dev/null
+++ b/Habitica/res/drawable/rounded_yellow_10_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/yellow_10" >
+    </solid>
+
+    <!-- Here is the corner radius -->
+    <corners
+        android:radius="4dp"   >
+    </corners>
+
+</shape>
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_tavern_detail.xml b/Habitica/res/layout/fragment_tavern_detail.xml
index c09301471..bb911c36d 100644
--- a/Habitica/res/layout/fragment_tavern_detail.xml
+++ b/Habitica/res/layout/fragment_tavern_detail.xml
@@ -1,34 +1,88 @@
 <?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.support.v4.widget.NestedScrollView
+    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="match_parent">
-    <include layout="@layout/shop_header" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="@color/days_gray"
-            android:layout_marginTop="@dimen/spacing_large"
-            android:layout_marginBottom="@dimen/spacing_large"/>
-
+<LinearLayout
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/white"
+    android:paddingBottom="?attr/actionBarSize">
+    <include layout="@layout/shop_header"
+        android:layout_marginBottom="@dimen/spacing_large"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"/>
+    <com.habitrpg.android.habitica.ui.views.CollapsibleSectionView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:title="@string/check_into_inn">
         <Button
-            android:id="@+id/dailiesButton"
+            android:id="@+id/innButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:text="@string/tavern.inn.rest"
-            android:layout_marginLeft="@dimen/spacing_large"
-            android:layout_marginRight="@dimen/spacing_large"
-            style="@style/Button.Purple.Small"/>
-
+            style="@style/Button.Yellow.Small"/>
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/inn_description"
-            android:layout_margin="@dimen/spacing_large"/>
-        <View
+            android:layout_marginTop="@dimen/spacing_large"/>
+    </com.habitrpg.android.habitica.ui.views.CollapsibleSectionView>
+    <com.habitrpg.android.habitica.ui.views.CollapsibleSectionView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:title="@string/community_guidelines">
+        <Button
+            android:id="@+id/guidelinesButton"
             android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="@color/days_gray" />
-
-</LinearLayout>
\ No newline at end of file
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="@string/view_community_guidelines"
+            style="@style/HabiticaButton.Gray"/>
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/guidelines_description"
+            android:layout_marginTop="@dimen/spacing_large"/>
+    </com.habitrpg.android.habitica.ui.views.CollapsibleSectionView>
+    <com.habitrpg.android.habitica.ui.views.CollapsibleSectionView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:title="@string/helpful_links">
+        <Button
+            android:id="@+id/faqButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="@string/view_faq"
+            style="@style/HabiticaButton.Gray"/>
+        <Button
+            android:id="@+id/reportButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="@string/report_bug"
+            style="@style/HabiticaButton.Gray"
+            android:layout_marginTop="@dimen/spacing_large"/>
+    </com.habitrpg.android.habitica.ui.views.CollapsibleSectionView>
+    <com.habitrpg.android.habitica.ui.views.CollapsibleSectionView
+        android:id="@+id/moderatorsView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:title="@string/staff_moderators">
+    </com.habitrpg.android.habitica.ui.views.CollapsibleSectionView>
+    <com.habitrpg.android.habitica.ui.views.CollapsibleSectionView
+        android:id="@+id/playerTiersView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:title="@string/player_tiers">
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/tiers_descriptions"/>
+    </com.habitrpg.android.habitica.ui.views.CollapsibleSectionView>
+</LinearLayout>
+</android.support.v4.widget.NestedScrollView>
\ No newline at end of file
diff --git a/Habitica/res/layout/view_collapsible_section.xml b/Habitica/res/layout/view_collapsible_section.xml
new file mode 100644
index 000000000..0de3768a5
--- /dev/null
+++ b/Habitica/res/layout/view_collapsible_section.xml
@@ -0,0 +1,36 @@
+<?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="match_parent">
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/days_gray"/>
+    <LinearLayout
+        android:id="@+id/title_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingLeft="@dimen/spacing_large"
+        android:paddingRight="@dimen/spacing_large">
+        <TextView
+            android:id="@+id/titleTextView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_marginTop="@dimen/spacing_large"
+            android:layout_marginBottom="@dimen/spacing_large"
+            android:textSize="16sp"
+            android:textColor="@color/gray_50"
+            tools:text="Example"/>
+
+        <ImageView
+            android:id="@+id/caretView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:scaleType="center"
+            android:layout_gravity="center_vertical"
+            android:layout_marginRight="16dp" />
+    </LinearLayout>
+</merge>
\ No newline at end of file
diff --git a/Habitica/res/values/attrs.xml b/Habitica/res/values/attrs.xml
index 916d1caa3..ecc06e801 100644
--- a/Habitica/res/values/attrs.xml
+++ b/Habitica/res/values/attrs.xml
@@ -1,6 +1,7 @@
 <resources>
     <attr name="statsColor" format="color" />
     <attr name="statsTitle" format="string" />
+    <attr name="title" format="string" />
     <attr name="hasLightBackground" format="boolean" />
     <declare-styleable name="AvatarView">
         <attr name="showBackground" format="boolean" />
@@ -48,7 +49,7 @@
     </declare-styleable>
     <declare-styleable name="FixValuesEditText">
         <attr name="fixIconName" format="string" />
-        <attr name="title" format="string" />
+        <attr name="title" />
         <attr name="iconBgColor" format="color" />
         <attr name="hintStyle" format="reference" />
     </declare-styleable>
@@ -65,4 +66,7 @@
         <attr name="statsTextColor" format="color" />
         <attr name="statsTitle" />
     </declare-styleable>
+    <declare-styleable name="CollapsibleSectionView">
+        <attr name="title" />
+    </declare-styleable>
 </resources>
diff --git a/Habitica/res/values/colors.contributor.xml b/Habitica/res/values/colors.contributor.xml
index e65b5cfb0..e2a659dfc 100644
--- a/Habitica/res/values/colors.contributor.xml
+++ b/Habitica/res/values/colors.contributor.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="contributor.0">#aaa</color>
-    <color name="contributor.1">#f57a9d</color>
-    <color name="contributor.2">#b93030</color>
-    <color name="contributor.3">#ff3300</color>
-    <color name="contributor.4">#ff9500</color>
-    <color name="contributor.5">#fff700</color>
-    <color name="contributor.6">#5eff00</color>
-    <color name="contributor.7">#00aaff</color>
-    <color name="contributor.mod">#130ead</color>
-    <color name="contributor.staff">#88108f</color>
+    <color name="contributor.1">#c42871</color>
+    <color name="contributor.2">#b01515</color>
+    <color name="contributor.3">#d70e14</color>
+    <color name="contributor.4">#c24d00</color>
+    <color name="contributor.5">#9e650f</color>
+    <color name="contributor.6">#2b8363</color>
+    <color name="contributor.7">#167e87</color>
+    <color name="contributor.mod">#277eab</color>
+    <color name="contributor.staff">#6133b4</color>
     <color name="contributor.npc">#000</color>
     <color name="contributor.npc.font">#00FF00</color>
 </resources>
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 7b0bf5c99..ca371cb2d 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -724,4 +724,14 @@
     <string name="available_stats" formatted="false">%d points</string>
     <string name="toogle_emojis">Toogle Emojis</string>
     <string name="tavern_description">Welcome to the Inn! Pull up a chair to chat, or take a break from your tasks.</string>
+    <string name="check_into_inn">Check into Inn</string>
+    <string name="community_guidelines">Community Guidelines</string>
+    <string name="view_community_guidelines">View Community Guidelines</string>
+    <string name="guidelines_description">Habitica tries to create a welcoming environment for users of all ages and backgrounds, especially in public spaces like the Tavern. If you have any questions, please consult our guidelines.</string>
+    <string name="helpful_links">Helpful Links</string>
+    <string name="view_faq">View FAQ</string>
+    <string name="report_bug">Report a Bug</string>
+    <string name="player_tiers">Player Tiers</string>
+    <string name="staff_moderators">Staff and Moderators</string>
+    <string name="tiers_descriptions">The colored usernames you see in chat represent a person’s contributor tier. The higher the tier, the more the person has contributed to habitica through art, code, the community, or more!</string>
 </resources>
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index 02b2e8ba7..c2b2e79a8 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -304,6 +304,18 @@
         <item name="android:paddingBottom">@dimen/button_padding_vertical_small</item>
     </style>
 
+    <style name="Button.Yellow">
+        <item name="android:background">@drawable/rounded_yellow_10_square</item>
+        <item name="android:textColor">@color/white</item>
+    </style>
+
+    <style name="Button.Yellow.Small">
+        <item name="android:paddingLeft">@dimen/button_padding_small</item>
+        <item name="android:paddingRight">@dimen/button_padding_small</item>
+        <item name="android:paddingTop">@dimen/button_padding_vertical_small</item>
+        <item name="android:paddingBottom">@dimen/button_padding_vertical_small</item>
+    </style>
+
     <style name="LoginEditTextTheme">
         <item name="colorAccent">@color/white_50_alpha</item>
         <item name="colorControlNormal">@color/white_15_alpha</item>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SetupCustomizationRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SetupCustomizationRepositoryImpl.java
index 7527e272f..db9d6a115 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SetupCustomizationRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SetupCustomizationRepositoryImpl.java
@@ -67,107 +67,107 @@ public class SetupCustomizationRepositoryImpl implements SetupCustomizationRepos
 
     private List<SetupCustomization> getWheelchairs() {
         return Arrays.asList(
-                SetupCustomization.createWheelchair("none", 0),
-                SetupCustomization.createWheelchair("black", R.drawable.creator_chair_black),
-                SetupCustomization.createWheelchair("blue", R.drawable.creator_chair_blue),
-                SetupCustomization.createWheelchair("green", R.drawable.creator_chair_green),
-                SetupCustomization.createWheelchair("pink", R.drawable.creator_chair_pink),
-                SetupCustomization.createWheelchair("red", R.drawable.creator_chair_red),
-                SetupCustomization.createWheelchair("yellow", R.drawable.creator_chair_yellow)
+                SetupCustomization.Companion.createWheelchair("none", 0),
+                SetupCustomization.Companion.createWheelchair("black", R.drawable.creator_chair_black),
+                SetupCustomization.Companion.createWheelchair("blue", R.drawable.creator_chair_blue),
+                SetupCustomization.Companion.createWheelchair("green", R.drawable.creator_chair_green),
+                SetupCustomization.Companion.createWheelchair("pink", R.drawable.creator_chair_pink),
+                SetupCustomization.Companion.createWheelchair("red", R.drawable.creator_chair_red),
+                SetupCustomization.Companion.createWheelchair("yellow", R.drawable.creator_chair_yellow)
         );
     }
 
     private List<SetupCustomization> getGlasses() {
         return Arrays.asList(
-                SetupCustomization.createGlasses("", R.drawable.creator_blank_face),
-                SetupCustomization.createGlasses("eyewear_special_blackTopFrame", R.drawable.creator_eyewear_special_blacktopframe),
-                SetupCustomization.createGlasses("eyewear_special_blueTopFrame", R.drawable.creator_eyewear_special_bluetopframe),
-                SetupCustomization.createGlasses("eyewear_special_greenTopFrame", R.drawable.creator_eyewear_special_greentopframe),
-                SetupCustomization.createGlasses("eyewear_special_pinkTopFrame", R.drawable.creator_eyewear_special_pinktopframe),
-                SetupCustomization.createGlasses("eyewear_special_redTopFrame", R.drawable.creator_eyewear_special_redtopframe),
-                SetupCustomization.createGlasses("eyewear_special_yellowTopFrame", R.drawable.creator_eyewear_special_yellowtopframe),
-                SetupCustomization.createGlasses("eyewear_special_whiteTopFrame", R.drawable.creator_eyewear_special_whitetopframe)
+                SetupCustomization.Companion.createGlasses("", R.drawable.creator_blank_face),
+                SetupCustomization.Companion.createGlasses("eyewear_special_blackTopFrame", R.drawable.creator_eyewear_special_blacktopframe),
+                SetupCustomization.Companion.createGlasses("eyewear_special_blueTopFrame", R.drawable.creator_eyewear_special_bluetopframe),
+                SetupCustomization.Companion.createGlasses("eyewear_special_greenTopFrame", R.drawable.creator_eyewear_special_greentopframe),
+                SetupCustomization.Companion.createGlasses("eyewear_special_pinkTopFrame", R.drawable.creator_eyewear_special_pinktopframe),
+                SetupCustomization.Companion.createGlasses("eyewear_special_redTopFrame", R.drawable.creator_eyewear_special_redtopframe),
+                SetupCustomization.Companion.createGlasses("eyewear_special_yellowTopFrame", R.drawable.creator_eyewear_special_yellowtopframe),
+                SetupCustomization.Companion.createGlasses("eyewear_special_whiteTopFrame", R.drawable.creator_eyewear_special_whitetopframe)
         );
     }
 
     private List<SetupCustomization> getFlowers() {
         return Arrays.asList(
-                SetupCustomization.createFlower("0", R.drawable.creator_blank_face),
-                SetupCustomization.createFlower("1", R.drawable.creator_hair_flower_1),
-                SetupCustomization.createFlower("2", R.drawable.creator_hair_flower_2),
-                SetupCustomization.createFlower("3", R.drawable.creator_hair_flower_3),
-                SetupCustomization.createFlower("4", R.drawable.creator_hair_flower_4),
-                SetupCustomization.createFlower("5", R.drawable.creator_hair_flower_5),
-                SetupCustomization.createFlower("6", R.drawable.creator_hair_flower_6)
+                SetupCustomization.Companion.createFlower("0", R.drawable.creator_blank_face),
+                SetupCustomization.Companion.createFlower("1", R.drawable.creator_hair_flower_1),
+                SetupCustomization.Companion.createFlower("2", R.drawable.creator_hair_flower_2),
+                SetupCustomization.Companion.createFlower("3", R.drawable.creator_hair_flower_3),
+                SetupCustomization.Companion.createFlower("4", R.drawable.creator_hair_flower_4),
+                SetupCustomization.Companion.createFlower("5", R.drawable.creator_hair_flower_5),
+                SetupCustomization.Companion.createFlower("6", R.drawable.creator_hair_flower_6)
         );
     }
 
     private List<SetupCustomization> getHairColors() {
         return Arrays.asList(
-                SetupCustomization.createHairColor("white", R.color.hair_white),
-                SetupCustomization.createHairColor("brown", R.color.hair_brown),
-                SetupCustomization.createHairColor("blond", R.color.hair_blond),
-                SetupCustomization.createHairColor("red", R.color.hair_red),
-                SetupCustomization.createHairColor("black", R.color.hair_black)
+                SetupCustomization.Companion.createHairColor("white", R.color.hair_white),
+                SetupCustomization.Companion.createHairColor("brown", R.color.hair_brown),
+                SetupCustomization.Companion.createHairColor("blond", R.color.hair_blond),
+                SetupCustomization.Companion.createHairColor("red", R.color.hair_red),
+                SetupCustomization.Companion.createHairColor("black", R.color.hair_black)
         );
     }
 
     private List<SetupCustomization> getHairBases(String color) {
         return Arrays.asList(
-                SetupCustomization.createHairPonytail("0", R.drawable.creator_blank_face),
-                SetupCustomization.createHairPonytail("1", getResId("creator_hair_base_1_"+color)),
-                SetupCustomization.createHairPonytail("3", getResId("creator_hair_base_3_"+color))
+                SetupCustomization.Companion.createHairPonytail("0", R.drawable.creator_blank_face),
+                SetupCustomization.Companion.createHairPonytail("1", getResId("creator_hair_base_1_"+color)),
+                SetupCustomization.Companion.createHairPonytail("3", getResId("creator_hair_base_3_"+color))
                 );
     }
 
     private List<SetupCustomization> getBangs(String color) {
         return Arrays.asList(
-                SetupCustomization.createHairBangs("0", R.drawable.creator_blank_face),
-                SetupCustomization.createHairBangs("1", getResId("creator_hair_bangs_1_"+color)),
-                SetupCustomization.createHairBangs("2", getResId("creator_hair_bangs_2_"+color)),
-                SetupCustomization.createHairBangs("3", getResId("creator_hair_bangs_3_"+color))
+                SetupCustomization.Companion.createHairBangs("0", R.drawable.creator_blank_face),
+                SetupCustomization.Companion.createHairBangs("1", getResId("creator_hair_bangs_1_"+color)),
+                SetupCustomization.Companion.createHairBangs("2", getResId("creator_hair_bangs_2_"+color)),
+                SetupCustomization.Companion.createHairBangs("3", getResId("creator_hair_bangs_3_"+color))
         );
     }
 
     private List<SetupCustomization> getSizes() {
         return Arrays.asList(
-                SetupCustomization.createSize("slim", R.drawable.creator_slim_shirt_black, context.getString(R.string.avatar_size_slim)),
-                SetupCustomization.createSize("broad", R.drawable.creator_broad_shirt_black, context.getString(R.string.avatar_size_broad))
+                SetupCustomization.Companion.createSize("slim", R.drawable.creator_slim_shirt_black, context.getString(R.string.avatar_size_slim)),
+                SetupCustomization.Companion.createSize("broad", R.drawable.creator_broad_shirt_black, context.getString(R.string.avatar_size_broad))
         );
     }
 
     private List<SetupCustomization> getShirts(String size) {
         if (size.equals("broad")) {
             return Arrays.asList(
-                    SetupCustomization.createShirt("black", R.drawable.creator_broad_shirt_black),
-                    SetupCustomization.createShirt("blue", R.drawable.creator_broad_shirt_blue),
-                    SetupCustomization.createShirt("green", R.drawable.creator_broad_shirt_green),
-                    SetupCustomization.createShirt("pink", R.drawable.creator_broad_shirt_pink),
-                    SetupCustomization.createShirt("white", R.drawable.creator_broad_shirt_white),
-                    SetupCustomization.createShirt("yellow", R.drawable.creator_broad_shirt_yellow)
+                    SetupCustomization.Companion.createShirt("black", R.drawable.creator_broad_shirt_black),
+                    SetupCustomization.Companion.createShirt("blue", R.drawable.creator_broad_shirt_blue),
+                    SetupCustomization.Companion.createShirt("green", R.drawable.creator_broad_shirt_green),
+                    SetupCustomization.Companion.createShirt("pink", R.drawable.creator_broad_shirt_pink),
+                    SetupCustomization.Companion.createShirt("white", R.drawable.creator_broad_shirt_white),
+                    SetupCustomization.Companion.createShirt("yellow", R.drawable.creator_broad_shirt_yellow)
             );
         } else {
             return Arrays.asList(
-                    SetupCustomization.createShirt("black", R.drawable.creator_slim_shirt_black),
-                    SetupCustomization.createShirt("blue", R.drawable.creator_slim_shirt_blue),
-                    SetupCustomization.createShirt("green", R.drawable.creator_slim_shirt_green),
-                    SetupCustomization.createShirt("pink", R.drawable.creator_slim_shirt_pink),
-                    SetupCustomization.createShirt("white", R.drawable.creator_slim_shirt_white),
-                    SetupCustomization.createShirt("yellow", R.drawable.creator_slim_shirt_yellow)
+                    SetupCustomization.Companion.createShirt("black", R.drawable.creator_slim_shirt_black),
+                    SetupCustomization.Companion.createShirt("blue", R.drawable.creator_slim_shirt_blue),
+                    SetupCustomization.Companion.createShirt("green", R.drawable.creator_slim_shirt_green),
+                    SetupCustomization.Companion.createShirt("pink", R.drawable.creator_slim_shirt_pink),
+                    SetupCustomization.Companion.createShirt("white", R.drawable.creator_slim_shirt_white),
+                    SetupCustomization.Companion.createShirt("yellow", R.drawable.creator_slim_shirt_yellow)
             );
         }
     }
 
     private List<SetupCustomization> getSkins() {
         return Arrays.asList(
-                SetupCustomization.createSkin("ddc994", R.color.skin_ddc994),
-                SetupCustomization.createSkin("f5a76e", R.color.skin_f5a76e),
-                SetupCustomization.createSkin("ea8349", R.color.skin_ea8349),
-                SetupCustomization.createSkin("c06534", R.color.skin_c06534),
-                SetupCustomization.createSkin("98461a", R.color.skin_98461a),
-                SetupCustomization.createSkin("915533", R.color.skin_915533),
-                SetupCustomization.createSkin("c3e1dc", R.color.skin_c3e1dc),
-                SetupCustomization.createSkin("6bd049", R.color.skin_6bd049)
+                SetupCustomization.Companion.createSkin("ddc994", R.color.skin_ddc994),
+                SetupCustomization.Companion.createSkin("f5a76e", R.color.skin_f5a76e),
+                SetupCustomization.Companion.createSkin("ea8349", R.color.skin_ea8349),
+                SetupCustomization.Companion.createSkin("c06534", R.color.skin_c06534),
+                SetupCustomization.Companion.createSkin("98461a", R.color.skin_98461a),
+                SetupCustomization.Companion.createSkin("915533", R.color.skin_915533),
+                SetupCustomization.Companion.createSkin("c3e1dc", R.color.skin_c3e1dc),
+                SetupCustomization.Companion.createSkin("6bd049", R.color.skin_6bd049)
         );
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/OpenMenuItemCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/OpenMenuItemCommand.java
index 7e3b56b42..0665c1746 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/OpenMenuItemCommand.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/OpenMenuItemCommand.java
@@ -5,4 +5,11 @@ package com.habitrpg.android.habitica.events.commands;
  */
 public class OpenMenuItemCommand {
     public int identifier;
+
+    public OpenMenuItemCommand(int identifier) {
+        this.identifier = identifier;
+    }
+
+    public OpenMenuItemCommand() {
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/SetupCustomization.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/SetupCustomization.java
deleted file mode 100644
index 36c15f000..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/SetupCustomization.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package com.habitrpg.android.habitica.models;
-
-
-public class SetupCustomization {
-
-    public String key;
-    public Integer drawableId;
-    public Integer colorId;
-    public String text;
-    public String path;
-    public String category;
-    public String subcategory;
-
-    public SetupCustomization() {
-        super();
-    }
-
-    public String getPath() {
-        return path;
-    }
-
-    public static SetupCustomization createSize(String key, int drawableId, String text) {
-        SetupCustomization customization = new SetupCustomization();
-        customization.key = key;
-        customization.drawableId = drawableId;
-        customization.text = text;
-        customization.path = "size";
-        customization.category = "body";
-        customization.subcategory = "size";
-        return customization;
-    }
-
-    public static SetupCustomization createShirt(String key, int drawableId) {
-        SetupCustomization customization = new SetupCustomization();
-        customization.key = key;
-        customization.drawableId = drawableId;
-        customization.path = "shirt";
-        customization.category = "body";
-        customization.subcategory = "shirt";
-        return customization;
-    }
-
-    public static SetupCustomization createSkin(String key, Integer colorId) {
-        SetupCustomization customization = new SetupCustomization();
-        customization.key = key;
-        customization.colorId = colorId;
-        customization.path = "skin";
-        customization.category = "skin";
-        return customization;
-    }
-
-    public static SetupCustomization createHairColor(String key, Integer colorId) {
-        SetupCustomization customization = new SetupCustomization();
-        customization.key = key;
-        customization.colorId = colorId;
-        customization.path = "hair.color";
-        customization.category = "hair";
-        customization.subcategory = "color";
-        return customization;
-    }
-
-    public static SetupCustomization createHairBangs(String key, Integer drawableId) {
-        SetupCustomization customization = new SetupCustomization();
-        customization.key = key;
-        customization.drawableId = drawableId;
-        customization.path = "hair.bangs";
-        customization.category = "hair";
-        customization.subcategory = "bangs";
-        return customization;
-    }
-
-    public static SetupCustomization createHairPonytail(String key, Integer drawableId) {
-        SetupCustomization customization = new SetupCustomization();
-        customization.key = key;
-        customization.drawableId = drawableId;
-        customization.path = "hair.base";
-        customization.category = "hair";
-        customization.subcategory = "base";
-        return customization;
-    }
-
-    public static SetupCustomization createGlasses(String key, Integer drawableId) {
-        SetupCustomization customization = new SetupCustomization();
-        customization.key = key;
-        customization.drawableId = drawableId;
-        customization.path = "glasses";
-        customization.category = "extras";
-        customization.subcategory = "glasses";
-        return customization;
-    }
-
-    public static SetupCustomization createFlower(String key, Integer drawableId) {
-        SetupCustomization customization = new SetupCustomization();
-        customization.key = key;
-        customization.drawableId = drawableId;
-        customization.path = "hair.flower";
-        customization.category = "extras";
-        customization.subcategory = "flower";
-        return customization;
-    }
-
-    public static SetupCustomization createWheelchair(String key, Integer drawableId) {
-        SetupCustomization customization = new SetupCustomization();
-        customization.key = key;
-        customization.drawableId = drawableId;
-        customization.path = "chair";
-        customization.category = "extras";
-        customization.subcategory = "wheelchair";
-        return customization;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/SetupCustomization.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/SetupCustomization.kt
new file mode 100644
index 000000000..5b68f351b
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/SetupCustomization.kt
@@ -0,0 +1,106 @@
+package com.habitrpg.android.habitica.models
+
+
+class SetupCustomization {
+
+    lateinit var key: String
+    var drawableId: Int? = null
+    var colorId: Int? = null
+    lateinit var text: String
+    lateinit var path: String
+    lateinit var category: String
+    lateinit var subcategory: String
+
+    companion object {
+
+        fun createSize(key: String, drawableId: Int, text: String): SetupCustomization {
+            val customization = SetupCustomization()
+            customization.key = key
+            customization.drawableId = drawableId
+            customization.text = text
+            customization.path = "size"
+            customization.category = "body"
+            customization.subcategory = "size"
+            return customization
+        }
+
+        fun createShirt(key: String, drawableId: Int): SetupCustomization {
+            val customization = SetupCustomization()
+            customization.key = key
+            customization.drawableId = drawableId
+            customization.path = "shirt"
+            customization.category = "body"
+            customization.subcategory = "shirt"
+            return customization
+        }
+
+        fun createSkin(key: String, colorId: Int?): SetupCustomization {
+            val customization = SetupCustomization()
+            customization.key = key
+            customization.colorId = colorId
+            customization.path = "skin"
+            customization.category = "skin"
+            return customization
+        }
+
+        fun createHairColor(key: String, colorId: Int?): SetupCustomization {
+            val customization = SetupCustomization()
+            customization.key = key
+            customization.colorId = colorId
+            customization.path = "hair.color"
+            customization.category = "hair"
+            customization.subcategory = "color"
+            return customization
+        }
+
+        fun createHairBangs(key: String, drawableId: Int?): SetupCustomization {
+            val customization = SetupCustomization()
+            customization.key = key
+            customization.drawableId = drawableId
+            customization.path = "hair.bangs"
+            customization.category = "hair"
+            customization.subcategory = "bangs"
+            return customization
+        }
+
+        fun createHairPonytail(key: String, drawableId: Int?): SetupCustomization {
+            val customization = SetupCustomization()
+            customization.key = key
+            customization.drawableId = drawableId
+            customization.path = "hair.base"
+            customization.category = "hair"
+            customization.subcategory = "base"
+            return customization
+        }
+
+        fun createGlasses(key: String, drawableId: Int?): SetupCustomization {
+            val customization = SetupCustomization()
+            customization.key = key
+            customization.drawableId = drawableId
+            customization.path = "glasses"
+            customization.category = "extras"
+            customization.subcategory = "glasses"
+            return customization
+        }
+
+        fun createFlower(key: String, drawableId: Int?): SetupCustomization {
+            val customization = SetupCustomization()
+            customization.key = key
+            customization.drawableId = drawableId
+            customization.path = "hair.flower"
+            customization.category = "extras"
+            customization.subcategory = "flower"
+            return customization
+        }
+
+        fun createWheelchair(key: String, drawableId: Int?): SetupCustomization {
+            val customization = SetupCustomization()
+            customization.key = key
+            customization.drawableId = drawableId
+            customization.path = "chair"
+            customization.category = "extras"
+            customization.subcategory = "wheelchair"
+            return customization
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/PlayerTier.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/PlayerTier.kt
new file mode 100644
index 000000000..9b46014a3
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/PlayerTier.kt
@@ -0,0 +1,39 @@
+package com.habitrpg.android.habitica.models.members
+
+import android.content.Context
+import android.support.v4.content.ContextCompat
+import com.habitrpg.android.habitica.R
+
+class PlayerTier(val title: String, val id: Int) {
+
+    companion object {
+        fun getTiers(): List<PlayerTier> {
+            return arrayListOf(
+                    PlayerTier("Tier 1 (Friend)", 1),
+                    PlayerTier("Tier 2 (Friend)", 2),
+                    PlayerTier("Tier 3 (Elite)", 3),
+                    PlayerTier("Tier 4 (Elite)", 4),
+                    PlayerTier("Tier 5 (Champion)", 5),
+                    PlayerTier("Tier 6 (Champion)", 6),
+                    PlayerTier("Tier 7 (Legendary)", 7),
+                    PlayerTier("Moderator (Guardian)", 8),
+                    PlayerTier("Staff (Heroic)", 9)
+            )
+        }
+
+        fun getColorForTier(context: Context, value: Int): Int {
+            return when (value) {
+                1 -> ContextCompat.getColor(context, R.color.contributor_1)
+                2 -> ContextCompat.getColor(context, R.color.contributor_2)
+                3 -> ContextCompat.getColor(context, R.color.contributor_3)
+                4 -> ContextCompat.getColor(context, R.color.contributor_4)
+                5 -> ContextCompat.getColor(context, R.color.contributor_5)
+                6 -> ContextCompat.getColor(context, R.color.contributor_6)
+                7 -> ContextCompat.getColor(context, R.color.contributor_7)
+                8 -> ContextCompat.getColor(context, R.color.contributor_mod)
+                9 -> ContextCompat.getColor(context, R.color.contributor_staff)
+                else -> ContextCompat.getColor(context, R.color.contributor_0)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/CustomizationSetupAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/CustomizationSetupAdapter.java
index 3fea4ab92..c52fcf286 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/CustomizationSetupAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/CustomizationSetupAdapter.java
@@ -63,42 +63,42 @@ public class CustomizationSetupAdapter extends RecyclerView.Adapter<RecyclerView
             return false;
         }
         Preferences prefs = this.user.getPreferences();
-        switch (customization.category) {
+        switch (customization.getCategory()) {
             case "body": {
-                switch (customization.subcategory) {
+                switch (customization.getSubcategory()) {
                     case "size":
-                        return customization.key.equals(prefs.getSize());
+                        return customization.getKey().equals(prefs.getSize());
                     case "shirt":
-                        return customization.key.equals(prefs.getShirt());
+                        return customization.getKey().equals(prefs.getShirt());
                 }
             }
             case "skin":
-                return customization.key.equals(prefs.getSkin());
+                return customization.getKey().equals(prefs.getSkin());
             case "background":
-                return customization.key.equals(prefs.getBackground());
+                return customization.getKey().equals(prefs.getBackground());
             case "hair":
-                switch (customization.subcategory) {
+                switch (customization.getSubcategory()) {
                     case "bangs":
-                        return Integer.parseInt(customization.key) == prefs.getHair().getBangs();
+                        return Integer.parseInt(customization.getKey()) == prefs.getHair().getBangs();
                     case "base":
-                        return Integer.parseInt(customization.key) == prefs.getHair().getBase();
+                        return Integer.parseInt(customization.getKey()) == prefs.getHair().getBase();
                     case "color":
-                        return customization.key.equals(prefs.getHair().getColor());
+                        return customization.getKey().equals(prefs.getHair().getColor());
                     case "flower":
-                        return Integer.parseInt(customization.key) == prefs.getHair().getFlower();
+                        return Integer.parseInt(customization.getKey()) == prefs.getHair().getFlower();
                     case "beard":
-                        return Integer.parseInt(customization.key) == prefs.getHair().getBeard();
+                        return Integer.parseInt(customization.getKey()) == prefs.getHair().getBeard();
                     case "mustache":
-                        return Integer.parseInt(customization.key) == prefs.getHair().getMustache();
+                        return Integer.parseInt(customization.getKey()) == prefs.getHair().getMustache();
                 }
             case "extras": {
-                switch (customization.subcategory) {
+                switch (customization.getSubcategory()) {
                     case "glasses":
-                        return customization.key.equals(this.user.getItems().getGear().getEquipped().getEyeWear()) || ("eyewear_base_0".equals(this.user.getItems().getGear().getEquipped().getEyeWear()) && customization.key.length() == 0);
+                        return customization.getKey().equals(this.user.getItems().getGear().getEquipped().getEyeWear()) || ("eyewear_base_0".equals(this.user.getItems().getGear().getEquipped().getEyeWear()) && customization.getKey().length() == 0);
                     case "flower":
-                        return Integer.parseInt(customization.key) == prefs.getHair().getFlower();
+                        return Integer.parseInt(customization.getKey()) == prefs.getHair().getFlower();
                     case "wheelchair":
-                        return ("chair_"+customization.key).equals(prefs.getChair()) || customization.key.equals(prefs.getChair()) || (customization.key.equals("none") && prefs.getChair() == null);
+                        return ("chair_"+ customization.getKey()).equals(prefs.getChair()) || customization.getKey().equals(prefs.getChair()) || (customization.getKey().equals("none") && prefs.getChair() == null);
                 }
             }
         }
@@ -129,19 +129,19 @@ public class CustomizationSetupAdapter extends RecyclerView.Adapter<RecyclerView
         public void bind(SetupCustomization customization) {
             this.customization = customization;
 
-            if (customization.drawableId != null) {
-                imageView.setImageResource(customization.drawableId);
-            } else if (customization.colorId != null) {
+            if (customization.getDrawableId() != null) {
+                imageView.setImageResource(customization.getDrawableId());
+            } else if (customization.getColorId() != null) {
                 Drawable drawable = ContextCompat.getDrawable(context, R.drawable.setup_customization_circle);
                 if (drawable != null) {
-                    drawable.setColorFilter(ContextCompat.getColor(context, customization.colorId), PorterDuff.Mode.MULTIPLY);
+                    drawable.setColorFilter(ContextCompat.getColor(context, customization.getColorId()), PorterDuff.Mode.MULTIPLY);
                 }
                 imageView.setImageDrawable(drawable);
             } else {
                 imageView.setImageDrawable(null);
             }
-            textView.setText(customization.text);
-            if (!"0".equals(customization.key) && "flower".equals(customization.subcategory)) {
+            textView.setText(customization.getText());
+            if (!"0".equals(customization.getKey()) && "flower".equals(customization.getSubcategory())) {
                 if (isCustomizationActive(customization)) {
                     imageView.setBackgroundResource(R.drawable.setup_customization_flower_bg_selected);
                 } else {
@@ -160,12 +160,12 @@ public class CustomizationSetupAdapter extends RecyclerView.Adapter<RecyclerView
 
         @Override
         public void onClick(View v) {
-            if (customization.path.equals("glasses")) {
+            if (customization.getPath().equals("glasses")) {
                 EquipCommand command = new EquipCommand();
-                if (customization.key.length() == 0) {
+                if (customization.getKey().length() == 0) {
                     command.key = user.getItems().getGear().getEquipped().getEyeWear();
                 } else {
-                    command.key = customization.key;
+                    command.key = customization.getKey();
                 }
                 command.type = "equipped";
                 EventBus.getDefault().post(command);
@@ -173,7 +173,7 @@ public class CustomizationSetupAdapter extends RecyclerView.Adapter<RecyclerView
                 UpdateUserCommand command = new UpdateUserCommand();
                 Map<String, Object> updateData = new HashMap<>();
                 String updatePath = "preferences." + customization.getPath();
-                updateData.put(updatePath, customization.key);
+                updateData.put(updatePath, customization.getKey());
 
                 command.updateData = updateData;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.java
index a2d6eb9bb..0ea96b4f0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.java
@@ -243,10 +243,10 @@ public class AvatarSetupFragment extends BaseFragment {
         }
         if (weighFirstOption) {
             if (random.nextInt(10) > 3) {
-                return customizations.get(0).key;
+                return customizations.get(0).getKey();
             }
         }
-        return customizations.get(random.nextInt(customizations.size())).key;
+        return customizations.get(random.nextInt(customizations.size())).getKey();
     }
 
     private void activateButton(AvatarCategoryView button) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernDetailFragment.kt
index c87838fd3..fd2b97c15 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernDetailFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernDetailFragment.kt
@@ -1,13 +1,17 @@
 package com.habitrpg.android.habitica.ui.fragments.social
 
+import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.Shader
 import android.graphics.drawable.BitmapDrawable
 import android.net.Uri
 import android.os.Bundle
+import android.support.v4.content.ContextCompat
+import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.FrameLayout
 import android.widget.ImageView
 
 import com.habitrpg.android.habitica.R
@@ -29,11 +33,16 @@ import com.facebook.drawee.backends.pipeline.Fresco
 import com.facebook.imagepipeline.datasource.BaseBitmapDataSubscriber
 import com.facebook.imagepipeline.image.CloseableImage
 import com.facebook.imagepipeline.request.ImageRequestBuilder
+import com.habitrpg.android.habitica.events.commands.OpenMenuItemCommand
 import com.habitrpg.android.habitica.helpers.RemoteConfigManager
+import com.habitrpg.android.habitica.models.members.PlayerTier
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils
+import com.habitrpg.android.habitica.ui.menu.MainDrawerBuilder
+import com.habitrpg.android.habitica.ui.views.social.UsernameLabel
 import kotlinx.android.synthetic.main.shop_header.*
 import kotlinx.android.synthetic.main.fragment_tavern_detail.*
 import kotlinx.android.synthetic.main.stats_view.view.*
+import org.greenrobot.eventbus.EventBus
 import rx.Observable
 import rx.android.schedulers.AndroidSchedulers
 import rx.functions.Action1
@@ -92,35 +101,67 @@ class TavernDetailFragment : BaseFragment() {
                     drawable.tileModeX = Shader.TileMode.REPEAT
                     Observable.just(drawable)
                             .observeOn(AndroidSchedulers.mainThread())
-                            .subscribe(Action1 {
-                                if(android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.JELLY_BEAN) {
-                                    backgroundView?.setBackgroundDrawable(it)
-                                } else {
-                                    backgroundView?.background = it
-                                }}, RxErrorHandler.handleEmptyError())
+                            .subscribe(Action1 { backgroundView.background = it }, RxErrorHandler.handleEmptyError())
                     dataSource.close()
                 }
             }
         }, CallerThreadExecutor.getInstance())
+
+        addPlayerTiers()
+        bindButtons()
+    }
+
+    private fun bindButtons() {
+        innButton.setOnClickListener {
+            user?.let { userRepository.sleep(it).subscribe(Action1 { }, RxErrorHandler.handleEmptyError()) }
+        }
+        guidelinesButton.setOnClickListener {
+            val i = Intent(Intent.ACTION_VIEW)
+            i.data = Uri.parse("https://habitica.com/static/community-guidelines")
+            context?.startActivity(i)
+        }
+        faqButton.setOnClickListener {
+            EventBus.getDefault().post(OpenMenuItemCommand(MainDrawerBuilder.SIDEBAR_HELP))
+
+        }
+        reportButton.setOnClickListener {
+            EventBus.getDefault().post(OpenMenuItemCommand(MainDrawerBuilder.SIDEBAR_ABOUT))
+        }
     }
 
     private fun updatePausedState() {
-        if (dailiesButton == null) {
+        if (innButton == null) {
             return
         }
         if (user?.preferences?.sleep == true) {
-            dailiesButton .setText(R.string.tavern_inn_checkOut)
+            innButton .setText(R.string.tavern_inn_checkOut)
         } else {
-            dailiesButton.setText(R.string.tavern_inn_rest)
+            innButton.setText(R.string.tavern_inn_rest)
+        }
+    }
+
+    private fun addPlayerTiers() {
+        for (tier in PlayerTier.getTiers()) {
+            val container = FrameLayout(context)
+            val context = this.context
+            if (context != null) {
+                container.setBackgroundDrawable(ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_gray_700))
+            }
+            val label = UsernameLabel(context, null)
+            label.tier = tier.id
+            label.username = tier.title
+            val params = FrameLayout.LayoutParams(
+                    FrameLayout.LayoutParams.WRAP_CONTENT,
+                    FrameLayout.LayoutParams.WRAP_CONTENT,
+                    Gravity.CENTER)
+            container.addView(label, params)
+            playerTiersView.addView(container)
+            val padding = context?.resources?.getDimension(R.dimen.spacing_medium)?.toInt() ?: 0
+            container.setPadding(0, padding, 0, padding)
         }
     }
 
     override fun injectFragment(component: AppComponent) {
         component.inject(this)
     }
-
-    @OnClick(R.id.dailiesButton)
-    fun dailiesButtonClicked() {
-        user?.let { userRepository.sleep(it).subscribe(Action1 { }, RxErrorHandler.handleEmptyError()) }
-    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.java
deleted file mode 100644
index cdd843d37..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.java
+++ /dev/null
@@ -1,161 +0,0 @@
-package com.habitrpg.android.habitica.ui.fragments.social;
-
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.data.InventoryRepository;
-import com.habitrpg.android.habitica.data.SocialRepository;
-import com.habitrpg.android.habitica.helpers.RxErrorHandler;
-import com.habitrpg.android.habitica.models.social.Group;
-import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
-
-import javax.inject.Inject;
-
-public class TavernFragment extends BaseMainFragment {
-
-    @Inject
-    SocialRepository socialRepository;
-
-    public ViewPager viewPager;
-    Group tavern;
-
-    ChatListFragment chatListFragment;
-    GroupInformationFragment questInfoFragment;
-
-    @Inject
-    InventoryRepository inventoryRepository;
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        this.usesTabLayout = true;
-        hideToolbar();
-        disableToolbarScrolling();
-        super.onCreateView(inflater, container, savedInstanceState);
-        View v = inflater.inflate(R.layout.fragment_viewpager, container, false);
-
-        viewPager = (ViewPager) v.findViewById(R.id.viewPager);
-
-        viewPager.setCurrentItem(0);
-
-        setViewPagerAdapter();
-
-        this.setTutorialStepIdentifier("tavern");
-        this.setTutorialText(getString(R.string.tutorial_tavern));
-
-        return v;
-    }
-
-    @Override
-    public void onDestroyView() {
-        showToolbar();
-        enableToolbarScrolling();
-        super.onDestroyView();
-    }
-
-    @Override
-    public void onDestroy() {
-        socialRepository.close();
-        super.onDestroy();
-    }
-
-    @Override
-    public void injectFragment(AppComponent component) {
-        component.inject(this);
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        if (this.socialRepository != null) {
-            getCompositeSubscription().add(socialRepository.getGroup("habitrpg")
-                    .subscribe(group -> {
-                        TavernFragment.this.tavern = group;
-                        if (group.quest != null && group.quest.key != null && TavernFragment.this.isAdded()) {
-                            TavernFragment.this.viewPager.getAdapter().notifyDataSetChanged();
-                            if (TavernFragment.this.tabLayout != null) {
-                                TavernFragment.this.tabLayout.setVisibility(View.VISIBLE);
-                                TavernFragment.this.tabLayout.setupWithViewPager(TavernFragment.this.viewPager);
-                            }
-                        }
-                    }, RxErrorHandler.handleEmptyError()));
-        }
-    }
-
-    public void setViewPagerAdapter() {
-        android.support.v4.app.FragmentManager fragmentManager = getChildFragmentManager();
-        if (this.user == null) {
-            return;
-        }
-
-        this.viewPager.setAdapter(new FragmentPagerAdapter(fragmentManager) {
-
-            @Override
-            public Fragment getItem(int position) {
-
-                Fragment fragment;
-
-                switch (position) {
-                    case 0: {
-                        fragment = new TavernDetailFragment();
-                        break;
-                    }
-                    case 1: {
-                        chatListFragment = new ChatListFragment();
-                        chatListFragment.configure("habitrpg", user, true);
-                        fragment = chatListFragment;
-                        break;
-                    }
-                    case 2: {
-                        fragment = questInfoFragment = GroupInformationFragment.Companion.newInstance(tavern, user);
-                        break;
-                    }
-                    default:
-                        fragment = new Fragment();
-                }
-
-                return fragment;
-            }
-
-            @Override
-            public int getCount() {
-                if (tavern != null && tavern.quest != null && tavern.quest.key != null) {
-                    return 3;
-                }
-                return 2;
-            }
-
-            @Override
-            public CharSequence getPageTitle(int position) {
-                switch (position) {
-                    case 0:
-                        return getContext().getString(R.string.inn);
-                    case 1:
-                        return getContext().getString(R.string.chat);
-                    case 2:
-                        return getContext().getString(R.string.world_quest);
-                }
-                return "";
-            }
-        });
-
-        if (tabLayout != null) {
-            tabLayout.setupWithViewPager(viewPager);
-        }
-    }
-
-    @Override
-    public String customTitle() {
-        if (!isAdded()) {
-            return "";
-        }
-        return getString(R.string.sidebar_tavern);
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.kt
new file mode 100644
index 000000000..4747aeaff
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.kt
@@ -0,0 +1,114 @@
+package com.habitrpg.android.habitica.ui.fragments.social
+
+import android.os.Bundle
+import android.support.v4.app.Fragment
+import android.support.v4.app.FragmentPagerAdapter
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.components.AppComponent
+import com.habitrpg.android.habitica.data.SocialRepository
+import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.models.social.Group
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
+import kotlinx.android.synthetic.main.fragment_viewpager.*
+import rx.functions.Action1
+import javax.inject.Inject
+
+class TavernFragment : BaseMainFragment() {
+
+    @Inject
+    lateinit var socialRepository: SocialRepository
+
+    internal var tavern: Group? = null
+
+    internal var tavernDetailFragment = TavernDetailFragment()
+    internal var chatListFragment = ChatListFragment()
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        this.usesTabLayout = true
+        hideToolbar()
+        disableToolbarScrolling()
+        super.onCreateView(inflater, container, savedInstanceState)
+        val v = inflater.inflate(R.layout.fragment_viewpager, container, false)
+        this.tutorialStepIdentifier = "tavern"
+        this.tutorialText = getString(R.string.tutorial_tavern)
+
+        return v
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setViewPagerAdapter()
+        viewPager.currentItem = 0
+        compositeSubscription.add(socialRepository.getGroup("habitrpg")?.subscribe(Action1 { group ->
+            this@TavernFragment.tavern = group
+            if (group.quest != null && group.quest.key != null && this@TavernFragment.isAdded) {
+                this@TavernFragment.viewPager.adapter?.notifyDataSetChanged()
+                this@TavernFragment.tabLayout?.visibility = View.VISIBLE
+                this@TavernFragment.tabLayout?.setupWithViewPager(this@TavernFragment.viewPager)
+            }
+        }, RxErrorHandler.handleEmptyError()))
+    }
+
+    override fun onDestroyView() {
+        showToolbar()
+        enableToolbarScrolling()
+        super.onDestroyView()
+    }
+
+    override fun onDestroy() {
+        socialRepository.close()
+        super.onDestroy()
+    }
+
+    override fun injectFragment(component: AppComponent) {
+        component.inject(this)
+    }
+
+    private fun setViewPagerAdapter() {
+        val fragmentManager = childFragmentManager
+        if (this.user == null) {
+            return
+        }
+
+        viewPager.adapter = object : FragmentPagerAdapter(fragmentManager) {
+            override fun getItem(position: Int): Fragment {
+                return when (position) {
+                    0 -> {
+                        tavernDetailFragment
+                    }
+                    1 -> {
+                        chatListFragment.configure("habitrpg", user, true)
+                        chatListFragment
+                    }
+                    else -> Fragment()
+                }
+            }
+
+            override fun getCount(): Int {
+                return if (tavern != null && tavern?.quest != null && tavern?.quest?.key != null) {
+                    3
+                } else 2
+            }
+
+            override fun getPageTitle(position: Int): CharSequence? {
+                when (position) {
+                    0 -> return context?.getString(R.string.inn)
+                    1 -> return context?.getString(R.string.chat)
+                    2 -> return context?.getString(R.string.world_quest)
+                }
+                return ""
+            }
+        }
+        tabLayout?.setupWithViewPager(viewPager)
+    }
+
+    override fun customTitle(): String {
+        return if (!isAdded) {
+            ""
+        } else getString(R.string.sidebar_tavern)
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/MainDrawerBuilder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/MainDrawerBuilder.kt
index fbdfae0a3..8f26ca39f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/MainDrawerBuilder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/MainDrawerBuilder.kt
@@ -83,14 +83,14 @@ object MainDrawerBuilder {
                         PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_skills)).withIdentifier(SIDEBAR_SKILLS.toLong()),
                         PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_stats)).withIdentifier(SIDEBAR_STATS.toLong()),
 
-                        SectionIconDrawerItem().withName(activity.getString(R.string.sidebar_section_social).toUpperCase(Locale.getDefault())),
+                        //SectionIconDrawerItem().withName(activity.getString(R.string.sidebar_section_social).toUpperCase(Locale.getDefault())),
                         PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_inbox)).withIdentifier(SIDEBAR_INBOX.toLong()),
                         PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_tavern)).withIdentifier(SIDEBAR_TAVERN.toLong()),
                         PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_party)).withIdentifier(SIDEBAR_PARTY.toLong()),
                         PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_guilds)).withIdentifier(SIDEBAR_GUILDS.toLong()),
                         PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_challenges)).withIdentifier(SIDEBAR_CHALLENGES.toLong()),
 
-                        SectionIconDrawerItem().withName(activity.getString(R.string.sidebar_section_inventory).toUpperCase(Locale.getDefault())),
+                        //SectionIconDrawerItem().withName(activity.getString(R.string.sidebar_section_inventory).toUpperCase(Locale.getDefault())),
                         PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_shops)).withIdentifier(SIDEBAR_SHOPS.toLong()),
                         PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_avatar)).withIdentifier(SIDEBAR_AVATAR.toLong()),
                         PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_equipment)).withIdentifier(SIDEBAR_EQUIPMENT.toLong()),
@@ -98,7 +98,7 @@ object MainDrawerBuilder {
                         PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_stable)).withIdentifier(SIDEBAR_STABLE.toLong()),
                         PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_purchaseGems)).withIdentifier(SIDEBAR_PURCHASE.toLong()),
 
-                        SectionIconDrawerItem().withName(activity.getString(R.string.sidebar_about).toUpperCase(Locale.getDefault())),
+                        //SectionIconDrawerItem().withName(activity.getString(R.string.sidebar_about).toUpperCase(Locale.getDefault())),
                         PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_news)).withIdentifier(SIDEBAR_NEWS.toLong()).withSelectable(false),
                         PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_settings)).withIdentifier(SIDEBAR_SETTINGS.toLong()).withSelectable(false),
                         PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_help)).withIdentifier(SIDEBAR_HELP.toLong()),
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/SectionIconDrawerItem.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/SectionIconDrawerItem.java
deleted file mode 100644
index 744db3d6c..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/SectionIconDrawerItem.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.habitrpg.android.habitica.ui.menu;
-
-import android.content.Context;
-import android.graphics.Typeface;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.StringRes;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.RecyclerView;
-import android.view.View;
-import android.widget.TextView;
-
-import com.habitrpg.android.habitica.R;
-import com.mikepenz.fastadapter.utils.ViewHolderFactory;
-import com.mikepenz.materialdrawer.holder.StringHolder;
-import com.mikepenz.materialdrawer.model.AbstractDrawerItem;
-import com.mikepenz.materialdrawer.model.interfaces.Nameable;
-import com.mikepenz.materialdrawer.model.interfaces.Typefaceable;
-
-import java.util.List;
-
-/**
- * Created by mikepenz on 03.02.15.
- */
-public class SectionIconDrawerItem extends AbstractDrawerItem<SectionIconDrawerItem, SectionIconDrawerItem.ViewHolder> implements Nameable<SectionIconDrawerItem>, Typefaceable<SectionIconDrawerItem> {
-    private StringHolder name;
-
-    private Typeface typeface = null;
-
-    public SectionIconDrawerItem withName(StringHolder name) {
-        this.name = name;
-        return this;
-    }
-
-    public SectionIconDrawerItem withName(String name) {
-        this.name = new StringHolder(name);
-        return this;
-    }
-
-    public SectionIconDrawerItem withName(@StringRes int nameRes) {
-        this.name = new StringHolder(nameRes);
-        return this;
-    }
-
-    public SectionIconDrawerItem withTypeface(Typeface typeface) {
-        this.typeface = typeface;
-        return this;
-    }
-
-    public StringHolder getName() {
-        return name;
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return false;
-    }
-
-    @Override
-    public boolean isSelected() {
-        return false;
-    }
-
-    @Override
-    public int getType() {
-        return R.id.material_drawer_item_section;
-    }
-
-    @Override
-    @LayoutRes
-    public int getLayoutRes() {
-        return R.layout.material_drawer_item_section_icon;
-    }
-
-    @Override
-    public Typeface getTypeface() {
-        return typeface;
-    }
-
-    @Override
-    public void bindView(ViewHolder holder, List<Object> payloads) {
-        super.bindView(holder, payloads);
-        Context ctx = holder.itemView.getContext();
-
-        //set the identifier from the drawerItem here. It can be used to run tests
-        holder.itemView.setId(hashCode());
-
-        //define this item to be not clickable nor enabled
-        holder.view.setClickable(false);
-        holder.view.setEnabled(false);
-
-        //define the text color
-        holder.name.setTextColor(ContextCompat.getColor(ctx, R.color.white));
-
-        //set the text for the name
-        StringHolder.applyTo(this.getName(), holder.name);
-
-        //define the typeface for our textViews
-        if (getTypeface() != null) {
-            holder.name.setTypeface(getTypeface());
-        }
-
-        //call the onPostBindView method to trigger post bind view actions (like the listener to modify the item if required)
-        onPostBindView(this, holder.itemView);
-    }
-
-    @Override
-    public ViewHolderFactory<ViewHolder> getFactory() {
-        return new ItemFactory();
-    }
-
-    public static class ItemFactory implements ViewHolderFactory<ViewHolder> {
-        public ViewHolder create(View v) {
-            return new ViewHolder(v);
-        }
-    }
-
-    protected static class ViewHolder extends RecyclerView.ViewHolder {
-        private View view;
-        private TextView name;
-
-        private ViewHolder(View view) {
-            super(view);
-            this.view = view;
-            this.name = (TextView) view.findViewById(R.id.material_drawer_name);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CollapsibleSectionView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CollapsibleSectionView.kt
new file mode 100644
index 000000000..a1b197a84
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/CollapsibleSectionView.kt
@@ -0,0 +1,102 @@
+package com.habitrpg.android.habitica.ui.views
+
+import android.content.Context
+import android.support.v4.content.ContextCompat
+import android.util.AttributeSet
+import android.view.View
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.extensions.bindView
+
+
+/**
+ * Created by phillip on 29.01.18.
+ */
+
+
+class CollapsibleSectionView(context: Context?, attrs: AttributeSet?) : LinearLayout(context, attrs) {
+
+    private val titleView: LinearLayout by bindView(R.id.title_view)
+    private val titleLabel: TextView by bindView(R.id.titleTextView)
+    private val caretView: ImageView by bindView(R.id.caretView)
+
+    private val padding = context?.resources?.getDimension(R.dimen.spacing_large)?.toInt() ?: 0
+
+    var title: CharSequence
+    get() {
+        return titleLabel.text
+    }
+    set(value) {
+        titleLabel.text = value
+    }
+
+    var isCollapsed = false
+    set(value) {
+        field = value
+        if (value) {
+            hideViews()
+        } else {
+            showViews()
+        }
+    }
+
+    var caretColor: Int = 0
+
+    private fun showViews() {
+        setCaretImage()
+        setPadding(0, 0, 0, padding)
+        (2 until childCount)
+                .filter { getChildAt(it) != titleView }
+                .forEach { getChildAt(it).visibility = View.VISIBLE }
+    }
+
+    private fun hideViews() {
+        setCaretImage()
+        setPadding(0, 0, 0, 0)
+        (2 until childCount)
+                .map { getChildAt(it) }
+                .forEach {
+                    it.visibility = View.GONE
+                }
+    }
+
+    private fun setCaretImage() {
+        caretView.setImageBitmap(HabiticaIconsHelper.imageOfCaret(caretColor, isCollapsed))
+    }
+
+    private fun setChildMargins() {
+        (2 until childCount)
+                .map { getChildAt(it) }
+                .forEach {
+                    val lp = it.layoutParams as LayoutParams
+                    lp.setMargins(padding, 0, padding, padding)
+                    it.layoutParams = lp
+                }
+    }
+
+    override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) {
+        super.onLayout(changed, l, t, r, b)
+        setChildMargins()
+    }
+
+    init {
+        val thisContext = this.context
+        if (thisContext != null) {
+            caretColor = ContextCompat.getColor(thisContext, R.color.black_50_alpha)
+        }
+        View.inflate(context, R.layout.view_collapsible_section, this)
+        orientation = LinearLayout.VERTICAL
+        titleView.setOnClickListener {
+            isCollapsed = !isCollapsed
+        }
+        val attributes = context?.theme?.obtainStyledAttributes(
+                attrs,
+                R.styleable.CollapsibleSectionView,
+                0, 0)
+        title = attributes?.getString(R.styleable.CollapsibleSectionView_title) ?: ""
+        setCaretImage()
+        setChildMargins()
+    }
+}
\ 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 817654a5c..3f856929a 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,24 +1,23 @@
 package com.habitrpg.android.habitica.ui.views;
 
+import android.graphics.Paint;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffXfermode;
+import android.graphics.Matrix;
+import android.graphics.RectF;
 import android.graphics.Bitmap;
 import android.graphics.BlurMaskFilter;
 import android.graphics.Canvas;
 import android.graphics.Color;
-import android.graphics.DashPathEffect;
-import android.graphics.Matrix;
-import android.graphics.Paint;
 import android.graphics.Path;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffXfermode;
-import android.graphics.RectF;
-
+import android.graphics.DashPathEffect;
 import java.util.Stack;
 
 
 
 /**
- * Created by Phillip Thelen on 06.11.17.
- * Copyright © 2017 HabitRPG Inc.. All rights reserved.
+ * Created by Phillip Thelen on 29. Jan 2018.
+ * Copyright © 2018 HabitRPG Inc.. All rights reserved.
  *
  * Generated by PaintCode
  * http://www.paintcodeapp.com
@@ -78,13 +77,13 @@ public class HabiticaIcons {
         Paint paint = CacheForHeart.paint;
         
         // Local Colors
-        int heartDarkBackground = Color.argb(178, 255, 255, 255);
-        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 heartLightBackground = Color.argb(255, 247, 78, 82);
         int fillColor6 = Color.argb(128, 181, 36, 40);
+        int heartLightBackground = Color.argb(255, 247, 78, 82);
+        int fillColor4 = Color.argb(89, 181, 36, 40);
+        int heartDarkBackground = Color.argb(178, 255, 255, 255);
         int fillColor2 = Color.argb(255, 255, 97, 101);
+        int fillColor5 = Color.argb(64, 255, 255, 255);
         
         // Local Variables
         int expression = darkBackground ? heartDarkBackground : heartLightBackground;
@@ -358,8 +357,8 @@ 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 fillColor3 = Color.argb(128, 255, 255, 255);
         int fillColor11 = Color.argb(64, 191, 125, 26);
         int fillColor5 = Color.argb(64, 255, 255, 255);
         int fillColor10 = Color.argb(255, 255, 166, 35);
@@ -589,11 +588,11 @@ public class HabiticaIcons {
         Paint paint = CacheForMagic.paint;
         
         // Local Colors
+        int fillColor5 = Color.argb(64, 255, 255, 255);
         int fillColor3 = Color.argb(128, 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 fillColor5 = Color.argb(64, 255, 255, 255);
         
         // Resize to Target Frame
         canvas.save();
@@ -895,9 +894,9 @@ public class HabiticaIcons {
         
         // Local Colors
         int fillColor3 = Color.argb(128, 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);
+        int fillColor14 = Color.argb(255, 36, 204, 143);
+        int fillColor15 = Color.argb(89, 27, 153, 107);
         
         // Resize to Target Frame
         canvas.save();
@@ -1103,8 +1102,8 @@ public class HabiticaIcons {
         Paint paint = CacheForHourglass.paint;
         
         // Local Colors
-        int fillColor18 = Color.argb(255, 154, 98, 255);
         int fillColor19 = Color.argb(255, 79, 42, 147);
+        int fillColor18 = Color.argb(255, 154, 98, 255);
         int fillColor17 = Color.argb(230, 255, 255, 255);
         int fillColor16 = Color.argb(204, 169, 220, 246);
         
@@ -1521,13 +1520,13 @@ public class HabiticaIcons {
         Paint paint = CacheForWarrior.paint;
         
         // Local Colors
-        int fillColor = Color.argb(255, 240, 97, 102);
-        int fillColor21 = Color.argb(255, 255, 182, 184);
         int fillColor22 = Color.argb(255, 242, 123, 134);
         int fillColor20 = Color.argb(255, 255, 181, 183);
-        int fillColor43 = Color.argb(255, 200, 43, 43);
-        int fillColor41 = Color.argb(255, 255, 149, 152);
         int fillColor23 = Color.argb(255, 229, 65, 77);
+        int fillColor43 = Color.argb(255, 200, 43, 43);
+        int fillColor21 = Color.argb(255, 255, 182, 184);
+        int fillColor41 = Color.argb(255, 255, 149, 152);
+        int fillColor = Color.argb(255, 240, 97, 102);
         int fillColor42 = Color.argb(255, 255, 149, 152);
         
         // Local Variables
@@ -2696,9 +2695,9 @@ public class HabiticaIcons {
     public static void drawDifficultyStars(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, float difficulty) {
         // Local Variables
         float _4StarDifficulty = difficulty >= 4f ? 1f : (difficulty >= 3.5f ? 0.5f : 0f);
+        float _3StarDifficulty = difficulty >= 3f ? 1f : (difficulty >= 2.5f ? 0.5f : 0f);
         float _1StarDifficulty = difficulty >= 1f ? 1f : (difficulty >= 0.5f ? 0.5f : 0f);
         float _2StarDifficulty = difficulty >= 2f ? 1f : (difficulty >= 1.5f ? 0.5f : 0f);
-        float _3StarDifficulty = difficulty >= 3f ? 1f : (difficulty >= 2.5f ? 0.5f : 0f);
         
         // Resize to Target Frame
         canvas.save();
@@ -2779,8 +2778,8 @@ public class HabiticaIcons {
         int fillColor25 = Color.argb(255, 225, 224, 227);
         
         // Local Variables
-        boolean isFull = singleDifficulty == 1f;
         boolean isHalf = singleDifficulty == 0.5f;
+        boolean isFull = singleDifficulty == 1f;
         
         // Resize to Target Frame
         canvas.save();
@@ -3028,8 +3027,8 @@ 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 fillColor28 = Color.argb(64, 229, 220, 255);
         int fillColor30 = Color.argb(166, 229, 220, 255);
         int fillColor29 = Color.argb(128, 229, 220, 255);
         int fillColor27 = Color.argb(255, 229, 220, 255);
@@ -3963,12 +3962,12 @@ public class HabiticaIcons {
         
         // Local Colors
         int fillColor40 = Color.argb(255, 165, 161, 172);
-        int strokeColor = Color.argb(255, 97, 51, 180);
         int fillColor39 = Color.argb(255, 189, 168, 255);
-        int fillColor38 = Color.argb(255, 165, 161, 172);
+        int strokeColor = Color.argb(255, 97, 51, 180);
+        int indicatorLocked = Color.argb(255, 237, 236, 238);
         int shadowTint = Color.argb(255, 26, 24, 29);
         int strokeColor2 = Color.argb(255, 189, 168, 255);
-        int indicatorLocked = Color.argb(255, 237, 236, 238);
+        int fillColor38 = Color.argb(255, 165, 161, 172);
         
         // Local Shadows
         PaintCodeShadow shadow = CacheForItemIndicator.shadow.get(PaintCodeColor.colorByChangingAlpha(shadowTint, (int) (Color.alpha(shadowTint) * 0.12f * 255f)), 0f, 1f, 1f);
@@ -4387,13 +4386,13 @@ public class HabiticaIcons {
         Paint paint = CacheForRogue.paint;
         
         // Local Colors
-        int fillColor44 = Color.argb(255, 204, 190, 237);
-        int fillColor47 = Color.argb(255, 198, 182, 228);
+        int fillColor19 = Color.argb(255, 79, 42, 147);
         int fillColor45 = Color.argb(255, 155, 129, 226);
         int fillColor48 = Color.argb(255, 137, 102, 199);
-        int fillColor36 = Color.argb(255, 97, 51, 180);
         int fillColor46 = Color.argb(255, 122, 84, 192);
-        int fillColor19 = Color.argb(255, 79, 42, 147);
+        int fillColor36 = Color.argb(255, 97, 51, 180);
+        int fillColor44 = Color.argb(255, 204, 190, 237);
+        int fillColor47 = Color.argb(255, 198, 182, 228);
         
         // Local Variables
         boolean lightBackground = !darkBackground;
@@ -5184,18 +5183,18 @@ public class HabiticaIcons {
         Paint paint = CacheForHealer.paint;
         
         // Local Colors
-        int fillColor51 = Color.argb(255, 229, 144, 37);
         int fillColor49 = Color.argb(255, 255, 215, 168);
-        int fillColor59 = Color.argb(255, 255, 228, 201);
         int fillColor57 = Color.argb(255, 255, 221, 181);
-        int fillColor10 = Color.argb(255, 255, 166, 35);
-        int fillColor56 = Color.argb(255, 255, 166, 35);
-        int fillColor58 = Color.argb(255, 229, 144, 37);
-        int fillColor52 = Color.argb(255, 253, 198, 126);
-        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 fillColor50 = Color.argb(255, 226, 158, 69);
+        int fillColor58 = Color.argb(255, 229, 144, 37);
+        int fillColor10 = Color.argb(255, 255, 166, 35);
+        int fillColor51 = Color.argb(255, 229, 144, 37);
+        int fillColor59 = Color.argb(255, 255, 228, 201);
+        int fillColor52 = Color.argb(255, 253, 198, 126);
+        int fillColor53 = Color.argb(255, 206, 129, 41);
+        int fillColor54 = Color.argb(255, 207, 130, 41);
+        int fillColor55 = Color.argb(255, 253, 198, 126);
+        int fillColor56 = Color.argb(255, 255, 166, 35);
         
         // Local Variables
         boolean lightBackground = !darkBackground;
@@ -6021,17 +6020,17 @@ public class HabiticaIcons {
         Paint paint = CacheForMage.paint;
         
         // Local Colors
-        int fillColor66 = Color.argb(255, 107, 196, 233);
-        int fillColor68 = Color.argb(255, 31, 110, 162);
-        int fillColor60 = Color.argb(255, 182, 225, 247);
-        int fillColor65 = Color.argb(255, 107, 196, 233);
-        int fillColor64 = Color.argb(255, 77, 178, 214);
-        int fillColor69 = Color.argb(255, 169, 219, 245);
-        int fillColor62 = Color.argb(255, 83, 180, 229);
         int fillColor63 = Color.argb(255, 42, 160, 207);
-        int fillColor70 = Color.argb(255, 132, 207, 242);
-        int fillColor67 = Color.argb(255, 83, 180, 229);
+        int fillColor60 = Color.argb(255, 182, 225, 247);
+        int fillColor66 = Color.argb(255, 107, 196, 233);
         int fillColor61 = Color.argb(255, 39, 138, 191);
+        int fillColor69 = Color.argb(255, 169, 219, 245);
+        int fillColor64 = Color.argb(255, 77, 178, 214);
+        int fillColor67 = Color.argb(255, 83, 180, 229);
+        int fillColor62 = Color.argb(255, 83, 180, 229);
+        int fillColor70 = Color.argb(255, 132, 207, 242);
+        int fillColor65 = Color.argb(255, 107, 196, 233);
+        int fillColor68 = Color.argb(255, 31, 110, 162);
         
         // Local Variables
         boolean lightBackground = !darkBackground;
@@ -6591,8 +6590,8 @@ public class HabiticaIcons {
         Paint paint = CacheForHourglassShop.paint;
         
         // Local Colors
-        int fillColor18 = Color.argb(255, 154, 98, 255);
         int fillColor19 = Color.argb(255, 79, 42, 147);
+        int fillColor18 = Color.argb(255, 154, 98, 255);
         int fillColor17 = Color.argb(230, 255, 255, 255);
         int fillColor16 = Color.argb(204, 169, 220, 246);
         
@@ -6842,10 +6841,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 fillColor72 = Color.argb(255, 255, 97, 101);
-        int fillColor73 = Color.argb(255, 255, 180, 69);
         
         // Resize to Target Frame
         canvas.save();
@@ -6969,9 +6968,9 @@ public class HabiticaIcons {
         
         // Local Colors
         int fillColor18 = Color.argb(255, 154, 98, 255);
-        int fillColor72 = Color.argb(255, 255, 97, 101);
         int fillColor71 = Color.argb(255, 80, 181, 233);
         int fillColor74 = Color.argb(255, 255, 190, 93);
+        int fillColor72 = Color.argb(255, 255, 97, 101);
         
         // Resize to Target Frame
         canvas.save();
@@ -7186,6 +7185,1356 @@ public class HabiticaIcons {
         canvas.restore();
     }
     
+    private static class CacheForContributorBadge {
+        private static Paint paint = new Paint();
+        private static RectF originalFrame = new RectF(0f, 0f, 16f, 16f);
+        private static RectF resizedFrame = new RectF();
+        private static RectF tier1Rect = new RectF();
+        private static Path tier1Path = new Path();
+        private static RectF tier2Rect = new RectF();
+        private static Path tier2Path = new Path();
+        private static RectF tier3Rect = new RectF();
+        private static Path tier3Path = new Path();
+        private static RectF tier4Rect = new RectF();
+        private static Path tier4Path = new Path();
+        private static RectF tier5Rect = new RectF();
+        private static Path tier5Path = new Path();
+        private static RectF tier6Rect = new RectF();
+        private static Path tier6Path = new Path();
+        private static RectF tier7Rect = new RectF();
+        private static Path tier7Path = new Path();
+        private static RectF tierModRect = new RectF();
+        private static Path tierModPath = new Path();
+        private static RectF tierStaffRect = new RectF();
+        private static Path tierStaffPath = new Path();
+        private static RectF bezier4Rect = new RectF();
+        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, RectF targetFrame, ResizingBehavior resizing, float contributorTier, 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 strokeColor7 = Color.argb(255, 238, 145, 9);
+        int fillColor76 = Color.argb(255, 255, 182, 184);
+        int fillColor78 = Color.argb(255, 255, 148, 76);
+        int strokeColor11 = Color.argb(255, 106, 52, 204);
+        int strokeColor8 = Color.argb(255, 28, 163, 114);
+        int strokeColor3 = Color.argb(255, 253, 124, 127);
+        int strokeColor5 = Color.argb(255, 225, 22, 27);
+        int fillColor82 = Color.argb(255, 154, 98, 255);
+        int strokeColor9 = Color.argb(255, 52, 181, 193);
+        int fillColor2 = Color.argb(255, 255, 97, 101);
+        int fillColor77 = Color.argb(255, 201, 43, 43);
+        int fillColor83 = Color.argb(255, 119, 244, 199);
+        int fillColor79 = Color.argb(255, 255, 190, 93);
+        int strokeColor10 = Color.argb(255, 5, 112, 168);
+        int fillColor80 = Color.argb(255, 63, 218, 162);
+        int strokeColor4 = Color.argb(255, 136, 10, 10);
+        int strokeColor12 = Color.argb(255, 0, 87, 55);
+        int strokeColor6 = Color.argb(255, 236, 109, 23);
+        int fillColor7 = Color.argb(255, 41, 149, 205);
+        
+        // Local Variables
+        boolean isTier7 = contributorTier == 7f && !isNPC;
+        boolean isTier4 = contributorTier == 4f && !isNPC;
+        boolean isTier3 = contributorTier == 3f && !isNPC;
+        boolean isTier5 = contributorTier == 5f && !isNPC;
+        boolean isTier2 = contributorTier == 2f && !isNPC;
+        boolean isTier1 = contributorTier == 1f && !isNPC;
+        boolean isTier9 = contributorTier == 9f && !isNPC;
+        boolean isTier6 = contributorTier == 6f && !isNPC;
+        boolean isTier8 = contributorTier == 8f && !isNPC;
+        
+        // Resize to Target Frame
+        canvas.save();
+        RectF resizedFrame = CacheForContributorBadge.resizedFrame;
+        HabiticaIcons.resizingBehaviorApply(resizing, CacheForContributorBadge.originalFrame, targetFrame, resizedFrame);
+        canvas.translate(resizedFrame.left, resizedFrame.top);
+        canvas.scale(resizedFrame.width() / 16f, resizedFrame.height() / 16f);
+        
+        // Tier1
+        if (isTier1) {
+            RectF tier1Rect = CacheForContributorBadge.tier1Rect;
+            tier1Rect.set(3f, 4f, 12f, 13f);
+            Path tier1Path = CacheForContributorBadge.tier1Path;
+            tier1Path.reset();
+            tier1Path.moveTo(7.5f, 4f);
+            tier1Path.lineTo(11.4f, 6.25f);
+            tier1Path.lineTo(11.4f, 10.75f);
+            tier1Path.lineTo(7.5f, 13f);
+            tier1Path.lineTo(3.6f, 10.75f);
+            tier1Path.lineTo(3.6f, 6.25f);
+            tier1Path.lineTo(7.5f, 4f);
+            tier1Path.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(fillColor76);
+            canvas.drawPath(tier1Path, paint);
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStrokeWidth(1f);
+            paint.setStrokeMiter(10f);
+            canvas.save();
+            paint.setStyle(Paint.Style.STROKE);
+            paint.setColor(strokeColor3);
+            canvas.drawPath(tier1Path, paint);
+            canvas.restore();
+        }
+        
+        // Tier2
+        if (isTier2) {
+            RectF tier2Rect = CacheForContributorBadge.tier2Rect;
+            tier2Rect.set(3f, 4f, 12f, 13f);
+            Path tier2Path = CacheForContributorBadge.tier2Path;
+            tier2Path.reset();
+            tier2Path.moveTo(7.5f, 4f);
+            tier2Path.lineTo(11.4f, 6.25f);
+            tier2Path.lineTo(11.4f, 10.75f);
+            tier2Path.lineTo(7.5f, 13f);
+            tier2Path.lineTo(3.6f, 10.75f);
+            tier2Path.lineTo(3.6f, 6.25f);
+            tier2Path.lineTo(7.5f, 4f);
+            tier2Path.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(fillColor77);
+            canvas.drawPath(tier2Path, paint);
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStrokeWidth(1f);
+            paint.setStrokeMiter(10f);
+            canvas.save();
+            paint.setStyle(Paint.Style.STROKE);
+            paint.setColor(strokeColor4);
+            canvas.drawPath(tier2Path, paint);
+            canvas.restore();
+        }
+        
+        // Tier3
+        if (isTier3) {
+            RectF tier3Rect = CacheForContributorBadge.tier3Rect;
+            tier3Rect.set(3.5f, 3.5f, 12.5f, 12.5f);
+            Path tier3Path = CacheForContributorBadge.tier3Path;
+            tier3Path.reset();
+            tier3Path.moveTo(8f, 3.5f);
+            tier3Path.lineTo(12.5f, 12.5f);
+            tier3Path.lineTo(3.5f, 12.5f);
+            tier3Path.lineTo(8f, 3.5f);
+            tier3Path.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(fillColor2);
+            canvas.drawPath(tier3Path, paint);
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStrokeWidth(1f);
+            paint.setStrokeMiter(10f);
+            canvas.save();
+            paint.setStyle(Paint.Style.STROKE);
+            paint.setColor(strokeColor5);
+            canvas.drawPath(tier3Path, paint);
+            canvas.restore();
+        }
+        
+        // Tier4
+        if (isTier4) {
+            RectF tier4Rect = CacheForContributorBadge.tier4Rect;
+            tier4Rect.set(3.5f, 3.5f, 12.5f, 12.5f);
+            Path tier4Path = CacheForContributorBadge.tier4Path;
+            tier4Path.reset();
+            tier4Path.moveTo(8f, 3.5f);
+            tier4Path.lineTo(12.5f, 12.5f);
+            tier4Path.lineTo(3.5f, 12.5f);
+            tier4Path.lineTo(8f, 3.5f);
+            tier4Path.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(fillColor78);
+            canvas.drawPath(tier4Path, paint);
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStrokeWidth(1f);
+            paint.setStrokeMiter(10f);
+            canvas.save();
+            paint.setStyle(Paint.Style.STROKE);
+            paint.setColor(strokeColor6);
+            canvas.drawPath(tier4Path, paint);
+            canvas.restore();
+        }
+        
+        // Tier5
+        if (isTier5) {
+            RectF tier5Rect = CacheForContributorBadge.tier5Rect;
+            tier5Rect.set(3.5f, 3.5f, 12.5f, 12.5f);
+            Path tier5Path = CacheForContributorBadge.tier5Path;
+            tier5Path.reset();
+            tier5Path.moveTo(tier5Rect.left, tier5Rect.top);
+            tier5Path.lineTo(tier5Rect.right, tier5Rect.top);
+            tier5Path.lineTo(tier5Rect.right, tier5Rect.bottom);
+            tier5Path.lineTo(tier5Rect.left, tier5Rect.bottom);
+            tier5Path.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(fillColor79);
+            canvas.drawPath(tier5Path, paint);
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStrokeWidth(1f);
+            paint.setStrokeMiter(10f);
+            canvas.save();
+            paint.setStyle(Paint.Style.STROKE);
+            paint.setColor(strokeColor7);
+            canvas.drawPath(tier5Path, paint);
+            canvas.restore();
+        }
+        
+        // Tier6
+        if (isTier6) {
+            RectF tier6Rect = CacheForContributorBadge.tier6Rect;
+            tier6Rect.set(3.5f, 3.5f, 12.5f, 12.5f);
+            Path tier6Path = CacheForContributorBadge.tier6Path;
+            tier6Path.reset();
+            tier6Path.moveTo(tier6Rect.left, tier6Rect.top);
+            tier6Path.lineTo(tier6Rect.right, tier6Rect.top);
+            tier6Path.lineTo(tier6Rect.right, tier6Rect.bottom);
+            tier6Path.lineTo(tier6Rect.left, tier6Rect.bottom);
+            tier6Path.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(fillColor80);
+            canvas.drawPath(tier6Path, paint);
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStrokeWidth(1f);
+            paint.setStrokeMiter(10f);
+            canvas.save();
+            paint.setStyle(Paint.Style.STROKE);
+            paint.setColor(strokeColor8);
+            canvas.drawPath(tier6Path, paint);
+            canvas.restore();
+        }
+        
+        // Tier7
+        if (isTier7) {
+            canvas.save();
+            canvas.translate(8.16f, 7.84f);
+            currentTransformation.peek().postTranslate(8.16f, 7.84f);
+            canvas.rotate(45f);
+            currentTransformation.peek().postRotate(45f);
+            RectF tier7Rect = CacheForContributorBadge.tier7Rect;
+            tier7Rect.set(-4f, -4f, 4f, 4f);
+            Path tier7Path = CacheForContributorBadge.tier7Path;
+            tier7Path.reset();
+            tier7Path.addRect(tier7Rect, Path.Direction.CW);
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(fillColor81);
+            canvas.drawPath(tier7Path, paint);
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStrokeWidth(1f);
+            paint.setStrokeMiter(10f);
+            canvas.save();
+            paint.setStyle(Paint.Style.STROKE);
+            paint.setColor(strokeColor9);
+            canvas.drawPath(tier7Path, paint);
+            canvas.restore();
+            canvas.restore();
+        }
+        
+        // TierMod
+        if (isTier8) {
+            RectF tierModRect = CacheForContributorBadge.tierModRect;
+            tierModRect.set(1.5f, 2.5f, 13.5f, 14.5f);
+            Path tierModPath = CacheForContributorBadge.tierModPath;
+            tierModPath.reset();
+            tierModPath.moveTo(7.5f, 2.5f);
+            tierModPath.lineTo(9.44f, 5.83f);
+            tierModPath.lineTo(13.21f, 6.65f);
+            tierModPath.lineTo(10.64f, 9.52f);
+            tierModPath.lineTo(11.03f, 13.35f);
+            tierModPath.lineTo(7.5f, 11.8f);
+            tierModPath.lineTo(3.97f, 13.35f);
+            tierModPath.lineTo(4.36f, 9.52f);
+            tierModPath.lineTo(1.79f, 6.65f);
+            tierModPath.lineTo(5.56f, 5.83f);
+            tierModPath.lineTo(7.5f, 2.5f);
+            tierModPath.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(fillColor7);
+            canvas.drawPath(tierModPath, paint);
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStrokeWidth(1f);
+            paint.setStrokeMiter(10f);
+            canvas.save();
+            paint.setStyle(Paint.Style.STROKE);
+            paint.setColor(strokeColor10);
+            canvas.drawPath(tierModPath, paint);
+            canvas.restore();
+        }
+        
+        // TierStaff
+        if (isTier9) {
+            RectF tierStaffRect = CacheForContributorBadge.tierStaffRect;
+            tierStaffRect.set(2.5f, 4.5f, 12.5f, 12.5f);
+            Path tierStaffPath = CacheForContributorBadge.tierStaffPath;
+            tierStaffPath.reset();
+            tierStaffPath.moveTo(2.5f, 4.5f);
+            tierStaffPath.lineTo(2.5f, 12.5f);
+            tierStaffPath.lineTo(12.5f, 12.5f);
+            tierStaffPath.lineTo(12.5f, 4.5f);
+            tierStaffPath.lineTo(9.5f, 7.5f);
+            tierStaffPath.lineTo(7.46f, 4.54f);
+            tierStaffPath.lineTo(5.5f, 7.5f);
+            tierStaffPath.lineTo(2.5f, 4.5f);
+            tierStaffPath.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(fillColor82);
+            canvas.drawPath(tierStaffPath, paint);
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStrokeWidth(1f);
+            paint.setStrokeMiter(10f);
+            canvas.save();
+            paint.setStyle(Paint.Style.STROKE);
+            paint.setColor(strokeColor11);
+            canvas.drawPath(tierStaffPath, paint);
+            canvas.restore();
+        }
+        
+        // Bezier 4
+        if (isNPC) {
+            RectF bezier4Rect = CacheForContributorBadge.bezier4Rect;
+            bezier4Rect.set(3.5f, 3.5f, 11.5f, 13.5f);
+            Path bezier4Path = CacheForContributorBadge.bezier4Path;
+            bezier4Path.reset();
+            bezier4Path.moveTo(11.5f, 3.5f);
+            bezier4Path.lineTo(11.5f, 7.5f);
+            bezier4Path.lineTo(11.5f, 13.5f);
+            bezier4Path.lineTo(7.5f, 10.5f);
+            bezier4Path.lineTo(3.5f, 13.5f);
+            bezier4Path.lineTo(3.5f, 7.5f);
+            bezier4Path.lineTo(3.5f, 3.5f);
+            bezier4Path.lineTo(7.5f, 3.5f);
+            bezier4Path.lineTo(11.5f, 3.5f);
+            bezier4Path.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(fillColor83);
+            canvas.drawPath(bezier4Path, paint);
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStrokeWidth(1f);
+            paint.setStrokeMiter(10f);
+            canvas.save();
+            paint.setStyle(Paint.Style.STROKE);
+            paint.setColor(strokeColor12);
+            canvas.drawPath(bezier4Path, paint);
+            canvas.restore();
+        }
+        
+        canvas.restore();
+    }
+    
+    private static class CacheForChatLikeIcon {
+        private static Paint paint = new Paint();
+        private static RectF originalFrame = new RectF(0f, 0f, 12f, 12f);
+        private static RectF resizedFrame = new RectF();
+        private static RectF bezierRect = new RectF();
+        private static Path bezierPath = new Path();
+    }
+    
+    public static void drawChatLikeIcon(Canvas canvas, boolean wasLiked) {
+        HabiticaIcons.drawChatLikeIcon(canvas, new RectF(0f, 0f, 12f, 12f), ResizingBehavior.AspectFit, wasLiked);
+    }
+    
+    public static void drawChatLikeIcon(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, boolean wasLiked) {
+        // General Declarations
+        Paint paint = CacheForChatLikeIcon.paint;
+        
+        // Local Colors
+        int fillColor82 = Color.argb(255, 154, 98, 255);
+        int fillColor25 = Color.argb(255, 225, 224, 227);
+        
+        // Local Variables
+        int expression2 = wasLiked ? fillColor82 : fillColor25;
+        
+        // Resize to Target Frame
+        canvas.save();
+        RectF resizedFrame = CacheForChatLikeIcon.resizedFrame;
+        HabiticaIcons.resizingBehaviorApply(resizing, CacheForChatLikeIcon.originalFrame, targetFrame, resizedFrame);
+        canvas.translate(resizedFrame.left, resizedFrame.top);
+        canvas.scale(resizedFrame.width() / 12f, resizedFrame.height() / 12f);
+        
+        // Bezier
+        RectF bezierRect = CacheForChatLikeIcon.bezierRect;
+        bezierRect.set(0f, 0f, 12f, 12f);
+        Path bezierPath = CacheForChatLikeIcon.bezierPath;
+        bezierPath.reset();
+        bezierPath.moveTo(8.25f, 7.5f);
+        bezierPath.cubicTo(8.25f, 8.74f, 7.24f, 9.75f, 6f, 9.75f);
+        bezierPath.cubicTo(4.76f, 9.75f, 3.75f, 8.74f, 3.75f, 7.5f);
+        bezierPath.lineTo(8.25f, 7.5f);
+        bezierPath.close();
+        bezierPath.moveTo(9.75f, 4.88f);
+        bezierPath.cubicTo(9.75f, 5.5f, 9.25f, 6f, 8.63f, 6f);
+        bezierPath.cubicTo(8f, 6f, 7.5f, 5.5f, 7.5f, 4.88f);
+        bezierPath.cubicTo(7.5f, 4.25f, 8f, 3.75f, 8.63f, 3.75f);
+        bezierPath.cubicTo(9.25f, 3.75f, 9.75f, 4.25f, 9.75f, 4.88f);
+        bezierPath.lineTo(9.75f, 4.88f);
+        bezierPath.close();
+        bezierPath.moveTo(4.5f, 4.88f);
+        bezierPath.cubicTo(4.5f, 5.5f, 4f, 6f, 3.38f, 6f);
+        bezierPath.cubicTo(2.75f, 6f, 2.25f, 5.5f, 2.25f, 4.88f);
+        bezierPath.cubicTo(2.25f, 4.25f, 2.75f, 3.75f, 3.38f, 3.75f);
+        bezierPath.cubicTo(4f, 3.75f, 4.5f, 4.25f, 4.5f, 4.88f);
+        bezierPath.lineTo(4.5f, 4.88f);
+        bezierPath.close();
+        bezierPath.moveTo(10.5f, 0f);
+        bezierPath.lineTo(1.5f, 0f);
+        bezierPath.cubicTo(0.67f, 0f, 0f, 0.67f, 0f, 1.5f);
+        bezierPath.lineTo(0f, 10.5f);
+        bezierPath.cubicTo(0f, 11.33f, 0.67f, 12f, 1.5f, 12f);
+        bezierPath.lineTo(10.5f, 12f);
+        bezierPath.cubicTo(11.33f, 12f, 12f, 11.33f, 12f, 10.5f);
+        bezierPath.lineTo(12f, 1.5f);
+        bezierPath.cubicTo(12f, 0.67f, 11.33f, 0f, 10.5f, 0f);
+        bezierPath.lineTo(10.5f, 0f);
+        bezierPath.close();
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        bezierPath.setFillType(Path.FillType.EVEN_ODD);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(expression2);
+        canvas.drawPath(bezierPath, paint);
+        
+        canvas.restore();
+    }
+    
+    private static class CacheForQuestBackground {
+        private static Paint paint = new Paint();
+        private static RectF originalFrame = new RectF(0f, 0f, 21f, 21f);
+        private static RectF resizedFrame = new RectF();
+        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();
+        private static RectF rectangle12Rect = new RectF();
+        private static Path rectangle12Path = new Path();
+        private static RectF rectangle13Rect = new RectF();
+        private static Path rectangle13Path = new Path();
+        private static RectF rectangle14Rect = new RectF();
+        private static Path rectangle14Path = new Path();
+        private static RectF rectangle15Rect = new RectF();
+        private static Path rectangle15Path = new Path();
+    }
+    
+    public static void drawQuestBackground(Canvas canvas, int bossColorDark, int bossColorMedium, int bossColorLight) {
+        HabiticaIcons.drawQuestBackground(canvas, new RectF(0f, 0f, 21f, 21f), ResizingBehavior.AspectFit, bossColorDark, bossColorMedium, bossColorLight);
+    }
+    
+    public static void drawQuestBackground(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, int bossColorDark, int bossColorMedium, int bossColorLight) {
+        // General Declarations
+        Paint paint = CacheForQuestBackground.paint;
+        
+        // Resize to Target Frame
+        canvas.save();
+        RectF resizedFrame = CacheForQuestBackground.resizedFrame;
+        HabiticaIcons.resizingBehaviorApply(resizing, CacheForQuestBackground.originalFrame, targetFrame, resizedFrame);
+        canvas.translate(resizedFrame.left, resizedFrame.top);
+        canvas.scale(resizedFrame.width() / 21f, resizedFrame.height() / 21f);
+        
+        // Rectangle
+        RectF rectangleRect = CacheForQuestBackground.rectangleRect;
+        rectangleRect.set(0f, 0f, 21f, 21f);
+        Path rectanglePath = CacheForQuestBackground.rectanglePath;
+        rectanglePath.reset();
+        rectanglePath.addRect(rectangleRect, Path.Direction.CW);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(bossColorMedium);
+        canvas.drawPath(rectanglePath, paint);
+        
+        // Group
+        {
+            // Rectangle 2
+            RectF rectangle2Rect = CacheForQuestBackground.rectangle2Rect;
+            rectangle2Rect.set(2f, 13f, 8f, 19f);
+            Path rectangle2Path = CacheForQuestBackground.rectangle2Path;
+            rectangle2Path.reset();
+            rectangle2Path.addRect(rectangle2Rect, Path.Direction.CW);
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(bossColorLight);
+            canvas.drawPath(rectangle2Path, paint);
+            
+            // Rectangle 3
+            RectF rectangle3Rect = CacheForQuestBackground.rectangle3Rect;
+            rectangle3Rect.set(4f, 15f, 6f, 17f);
+            Path rectangle3Path = CacheForQuestBackground.rectangle3Path;
+            rectangle3Path.reset();
+            rectangle3Path.addRect(rectangle3Rect, Path.Direction.CW);
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(bossColorDark);
+            canvas.drawPath(rectangle3Path, paint);
+        }
+        
+        // Group 2
+        {
+            // Rectangle 4
+            RectF rectangle4Rect = CacheForQuestBackground.rectangle4Rect;
+            rectangle4Rect.set(2f, 2f, 8f, 8f);
+            Path rectangle4Path = CacheForQuestBackground.rectangle4Path;
+            rectangle4Path.reset();
+            rectangle4Path.addRect(rectangle4Rect, Path.Direction.CW);
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(bossColorLight);
+            canvas.drawPath(rectangle4Path, paint);
+            
+            // Rectangle 5
+            RectF rectangle5Rect = CacheForQuestBackground.rectangle5Rect;
+            rectangle5Rect.set(4f, 4f, 6f, 6f);
+            Path rectangle5Path = CacheForQuestBackground.rectangle5Path;
+            rectangle5Path.reset();
+            rectangle5Path.addRect(rectangle5Rect, Path.Direction.CW);
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(bossColorDark);
+            canvas.drawPath(rectangle5Path, paint);
+        }
+        
+        // Group 3
+        {
+            // Rectangle 6
+            RectF rectangle6Rect = CacheForQuestBackground.rectangle6Rect;
+            rectangle6Rect.set(13f, 2f, 19f, 8f);
+            Path rectangle6Path = CacheForQuestBackground.rectangle6Path;
+            rectangle6Path.reset();
+            rectangle6Path.addRect(rectangle6Rect, Path.Direction.CW);
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(bossColorLight);
+            canvas.drawPath(rectangle6Path, paint);
+            
+            // Rectangle 7
+            RectF rectangle7Rect = CacheForQuestBackground.rectangle7Rect;
+            rectangle7Rect.set(15f, 4f, 17f, 6f);
+            Path rectangle7Path = CacheForQuestBackground.rectangle7Path;
+            rectangle7Path.reset();
+            rectangle7Path.addRect(rectangle7Rect, Path.Direction.CW);
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(bossColorDark);
+            canvas.drawPath(rectangle7Path, paint);
+        }
+        
+        // Group 4
+        {
+            // Rectangle 8
+            RectF rectangle8Rect = CacheForQuestBackground.rectangle8Rect;
+            rectangle8Rect.set(13f, 13f, 19f, 19f);
+            Path rectangle8Path = CacheForQuestBackground.rectangle8Path;
+            rectangle8Path.reset();
+            rectangle8Path.addRect(rectangle8Rect, Path.Direction.CW);
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(bossColorLight);
+            canvas.drawPath(rectangle8Path, paint);
+            
+            // Rectangle 9
+            RectF rectangle9Rect = CacheForQuestBackground.rectangle9Rect;
+            rectangle9Rect.set(15f, 15f, 17f, 17f);
+            Path rectangle9Path = CacheForQuestBackground.rectangle9Path;
+            rectangle9Path.reset();
+            rectangle9Path.addRect(rectangle9Rect, Path.Direction.CW);
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(bossColorDark);
+            canvas.drawPath(rectangle9Path, paint);
+        }
+        
+        // Rectangle 10
+        RectF rectangle10Rect = CacheForQuestBackground.rectangle10Rect;
+        rectangle10Rect.set(17f, 10f, 19f, 11f);
+        Path rectangle10Path = CacheForQuestBackground.rectangle10Path;
+        rectangle10Path.reset();
+        rectangle10Path.addRect(rectangle10Rect, Path.Direction.CW);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(bossColorLight);
+        canvas.drawPath(rectangle10Path, paint);
+        
+        // Rectangle 11
+        RectF rectangle11Rect = CacheForQuestBackground.rectangle11Rect;
+        rectangle11Rect.set(10f, 17f, 11f, 19f);
+        Path rectangle11Path = CacheForQuestBackground.rectangle11Path;
+        rectangle11Path.reset();
+        rectangle11Path.addRect(rectangle11Rect, Path.Direction.CW);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(bossColorLight);
+        canvas.drawPath(rectangle11Path, paint);
+        
+        // Rectangle 12
+        RectF rectangle12Rect = CacheForQuestBackground.rectangle12Rect;
+        rectangle12Rect.set(10f, 2f, 11f, 4f);
+        Path rectangle12Path = CacheForQuestBackground.rectangle12Path;
+        rectangle12Path.reset();
+        rectangle12Path.addRect(rectangle12Rect, Path.Direction.CW);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(bossColorLight);
+        canvas.drawPath(rectangle12Path, paint);
+        
+        // Rectangle 13
+        RectF rectangle13Rect = CacheForQuestBackground.rectangle13Rect;
+        rectangle13Rect.set(10f, 4f, 11f, 17f);
+        Path rectangle13Path = CacheForQuestBackground.rectangle13Path;
+        rectangle13Path.reset();
+        rectangle13Path.addRect(rectangle13Rect, Path.Direction.CW);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(bossColorDark);
+        canvas.drawPath(rectangle13Path, paint);
+        
+        // Rectangle 14
+        RectF rectangle14Rect = CacheForQuestBackground.rectangle14Rect;
+        rectangle14Rect.set(4f, 10f, 17f, 11f);
+        Path rectangle14Path = CacheForQuestBackground.rectangle14Path;
+        rectangle14Path.reset();
+        rectangle14Path.addRect(rectangle14Rect, Path.Direction.CW);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(bossColorDark);
+        canvas.drawPath(rectangle14Path, paint);
+        
+        // Rectangle 15
+        RectF rectangle15Rect = CacheForQuestBackground.rectangle15Rect;
+        rectangle15Rect.set(2f, 10f, 4f, 11f);
+        Path rectangle15Path = CacheForQuestBackground.rectangle15Path;
+        rectangle15Path.reset();
+        rectangle15Path.addRect(rectangle15Rect, Path.Direction.CW);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(bossColorLight);
+        canvas.drawPath(rectangle15Path, paint);
+        
+        canvas.restore();
+    }
+    
+    private static class CacheForDamage {
+        private static Paint paint = new Paint();
+        private static RectF originalFrame = new RectF(0f, 0f, 18f, 18f);
+        private static RectF resizedFrame = new RectF();
+        private static RectF bezierRect = new RectF();
+        private static Path bezierPath = 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 bezier3Rect = new RectF();
+        private static Path bezier3Path = new Path();
+        private static RectF bezier4Rect = new RectF();
+        private static Path bezier4Path = new Path();
+        private static RectF bezier5Rect = new RectF();
+        private static Path bezier5Path = new Path();
+        private static RectF bezier6Rect = new RectF();
+        private static Path bezier6Path = new Path();
+        private static RectF bezier7Rect = new RectF();
+        private static Path bezier7Path = new Path();
+        private static RectF bezier8Rect = new RectF();
+        private static Path bezier8Path = new Path();
+        private static RectF bezier9Rect = new RectF();
+        private static Path bezier9Path = new Path();
+        private static RectF bezier10Rect = new RectF();
+        private static Path bezier10Path = new Path();
+        private static RectF bezier11Rect = new RectF();
+        private static Path bezier11Path = new Path();
+        private static RectF bezier12Rect = new RectF();
+        private static Path bezier12Path = 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 bezier13Rect = new RectF();
+        private static Path bezier13Path = new Path();
+        private static RectF bezier14Rect = new RectF();
+        private static Path bezier14Path = new Path();
+        private static RectF bezier15Rect = new RectF();
+        private static Path bezier15Path = new Path();
+        private static RectF group3 = new RectF();
+        private static Path clipPath = new Path();
+        private static RectF bezier16Rect = new RectF();
+        private static Path bezier16Path = new Path();
+    }
+    
+    public static void drawDamage(Canvas canvas) {
+        HabiticaIcons.drawDamage(canvas, new RectF(0f, 0f, 18f, 18f), ResizingBehavior.AspectFit);
+    }
+    
+    public static void drawDamage(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
+        // General Declarations
+        Stack<Matrix> currentTransformation = new Stack<Matrix>();
+        currentTransformation.push(new Matrix());
+        Paint paint = CacheForDamage.paint;
+        
+        // Local Colors
+        int fillColor89 = Color.argb(255, 227, 143, 61);
+        int fillColor25 = Color.argb(255, 225, 224, 227);
+        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 fillColor75 = Color.argb(255, 135, 129, 144);
+        int fillColor85 = Color.argb(255, 237, 236, 238);
+        int fillColor84 = Color.argb(255, 240, 97, 102);
+        int fillColor37 = Color.argb(255, 255, 255, 255);
+        int fillColor90 = Color.argb(179, 78, 74, 87);
+        
+        // Resize to Target Frame
+        canvas.save();
+        RectF resizedFrame = CacheForDamage.resizedFrame;
+        HabiticaIcons.resizingBehaviorApply(resizing, CacheForDamage.originalFrame, targetFrame, resizedFrame);
+        canvas.translate(resizedFrame.left, resizedFrame.top);
+        canvas.scale(resizedFrame.width() / 18f, resizedFrame.height() / 18f);
+        
+        // Group 2
+        {
+            // Bezier
+            RectF bezierRect = CacheForDamage.bezierRect;
+            bezierRect.set(8f, 8.06f, 14.65f, 14.71f);
+            Path bezierPath = CacheForDamage.bezierPath;
+            bezierPath.reset();
+            bezierPath.moveTo(11.1f, 11.16f);
+            bezierPath.lineTo(8.73f, 12.26f);
+            bezierPath.cubicTo(8.53f, 12.35f, 8.4f, 12.53f, 8.35f, 12.74f);
+            bezierPath.cubicTo(8.27f, 13.1f, 8.02f, 13.93f, 8f, 14.37f);
+            bezierPath.cubicTo(8f, 14.48f, 8.05f, 14.59f, 8.15f, 14.65f);
+            bezierPath.cubicTo(8.24f, 14.72f, 8.36f, 14.73f, 8.47f, 14.68f);
+            bezierPath.lineTo(12.44f, 12.78f);
+            bezierPath.cubicTo(12.56f, 12.72f, 12.66f, 12.62f, 12.72f, 12.49f);
+            bezierPath.lineTo(14.63f, 8.53f);
+            bezierPath.cubicTo(14.67f, 8.42f, 14.66f, 8.3f, 14.6f, 8.2f);
+            bezierPath.cubicTo(14.53f, 8.11f, 14.42f, 8.05f, 14.31f, 8.06f);
+            bezierPath.cubicTo(13.87f, 8.08f, 13.06f, 8.32f, 12.68f, 8.41f);
+            bezierPath.cubicTo(12.47f, 8.46f, 12.29f, 8.59f, 12.2f, 8.79f);
+            bezierPath.lineTo(11.1f, 11.16f);
+            bezierPath.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(fillColor84);
+            canvas.drawPath(bezierPath, paint);
+            
+            // Bezier 2
+            RectF bezier2Rect = CacheForDamage.bezier2Rect;
+            bezier2Rect.set(0.59f, 0.65f, 17.87f, 17.93f);
+            Path bezier2Path = CacheForDamage.bezier2Path;
+            bezier2Path.reset();
+            bezier2Path.moveTo(16.85f, 16.91f);
+            bezier2Path.lineTo(15.82f, 17.93f);
+            bezier2Path.lineTo(13.17f, 17.72f);
+            bezier2Path.lineTo(13.03f, 15.98f);
+            bezier2Path.lineTo(11.5f, 14.45f);
+            bezier2Path.lineTo(8.73f, 15.77f);
+            bezier2Path.lineTo(6.65f, 15.21f);
+            bezier2Path.lineTo(7.52f, 11.47f);
+            bezier2Path.lineTo(1.71f, 6.04f);
+            bezier2Path.lineTo(0.59f, 0.65f);
+            bezier2Path.lineTo(0.59f, 0.65f);
+            bezier2Path.lineTo(0.59f, 0.65f);
+            bezier2Path.lineTo(0.59f, 0.65f);
+            bezier2Path.lineTo(5.98f, 1.76f);
+            bezier2Path.lineTo(11.41f, 7.58f);
+            bezier2Path.lineTo(15.15f, 6.71f);
+            bezier2Path.lineTo(15.71f, 8.79f);
+            bezier2Path.lineTo(14.39f, 11.56f);
+            bezier2Path.lineTo(15.92f, 13.09f);
+            bezier2Path.lineTo(17.66f, 13.22f);
+            bezier2Path.lineTo(17.87f, 15.88f);
+            bezier2Path.lineTo(16.85f, 16.91f);
+            bezier2Path.lineTo(16.85f, 16.91f);
+            bezier2Path.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(fillColor90);
+            canvas.drawPath(bezier2Path, paint);
+            
+            // Rectangle
+            canvas.save();
+            canvas.translate(13.65f, 13.75f);
+            currentTransformation.peek().postTranslate(13.65f, 13.75f);
+            canvas.rotate(45f);
+            currentTransformation.peek().postRotate(45f);
+            RectF rectangleRect = CacheForDamage.rectangleRect;
+            rectangleRect.set(-2.32f, -0.95f, 2.32f, 0.95f);
+            Path rectanglePath = CacheForDamage.rectanglePath;
+            rectanglePath.reset();
+            rectanglePath.moveTo(rectangleRect.left, rectangleRect.top);
+            rectanglePath.lineTo(rectangleRect.right, rectangleRect.top);
+            rectanglePath.lineTo(rectangleRect.right, rectangleRect.bottom);
+            rectanglePath.lineTo(rectangleRect.left, rectangleRect.bottom);
+            rectanglePath.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(fillColor84);
+            canvas.drawPath(rectanglePath, paint);
+            canvas.restore();
+            
+            // Bezier 3
+            RectF bezier3Rect = CacheForDamage.bezier3Rect;
+            bezier3Rect.set(14.1f, 14.15f, 16.73f, 16.79f);
+            Path bezier3Path = CacheForDamage.bezier3Path;
+            bezier3Path.reset();
+            bezier3Path.moveTo(16.73f, 15.46f);
+            bezier3Path.lineTo(16.64f, 14.25f);
+            bezier3Path.lineTo(15.42f, 14.15f);
+            bezier3Path.lineTo(14.1f, 15.48f);
+            bezier3Path.lineTo(14.19f, 16.7f);
+            bezier3Path.lineTo(15.4f, 16.79f);
+            bezier3Path.lineTo(16.73f, 15.46f);
+            bezier3Path.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(fillColor84);
+            canvas.drawPath(bezier3Path, paint);
+            
+            // Bezier 4
+            RectF bezier4Rect = CacheForDamage.bezier4Rect;
+            bezier4Rect.set(2.12f, 2.17f, 5.27f, 5.22f);
+            Path bezier4Path = CacheForDamage.bezier4Path;
+            bezier4Path.reset();
+            bezier4Path.moveTo(5.27f, 2.82f);
+            bezier4Path.lineTo(5.16f, 5.22f);
+            bezier4Path.lineTo(2.12f, 2.18f);
+            bezier4Path.cubicTo(2.18f, 2.13f, 4.47f, 2.39f, 5.27f, 2.82f);
+            bezier4Path.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(fillColor37);
+            canvas.drawPath(bezier4Path, paint);
+            
+            // Bezier 5
+            RectF bezier5Rect = CacheForDamage.bezier5Rect;
+            bezier5Rect.set(5.16f, 2.82f, 11.75f, 10.16f);
+            Path bezier5Path = CacheForDamage.bezier5Path;
+            bezier5Path.reset();
+            bezier5Path.moveTo(5.33f, 2.85f);
+            bezier5Path.lineTo(11.75f, 9.59f);
+            bezier5Path.lineTo(10.11f, 10.16f);
+            bezier5Path.lineTo(5.16f, 5.22f);
+            bezier5Path.lineTo(5.27f, 2.82f);
+            bezier5Path.lineTo(5.33f, 2.85f);
+            bezier5Path.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(fillColor85);
+            canvas.drawPath(bezier5Path, paint);
+            
+            // Bezier 6
+            RectF bezier6Rect = CacheForDamage.bezier6Rect;
+            bezier6Rect.set(2.12f, 2.18f, 11.81f, 11.17f);
+            Path bezier6Path = CacheForDamage.bezier6Path;
+            bezier6Path.reset();
+            bezier6Path.moveTo(11.75f, 9.59f);
+            bezier6Path.lineTo(11.81f, 9.65f);
+            bezier6Path.lineTo(11.11f, 11.17f);
+            bezier6Path.lineTo(10.11f, 10.16f);
+            bezier6Path.lineTo(11.75f, 9.59f);
+            bezier6Path.lineTo(11.75f, 9.59f);
+            bezier6Path.close();
+            bezier6Path.moveTo(2.77f, 5.33f);
+            bezier6Path.lineTo(5.16f, 5.22f);
+            bezier6Path.lineTo(2.12f, 2.18f);
+            bezier6Path.cubicTo(2.07f, 2.24f, 2.33f, 4.53f, 2.77f, 5.33f);
+            bezier6Path.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(fillColor85);
+            canvas.drawPath(bezier6Path, paint);
+            
+            // Bezier 7
+            RectF bezier7Rect = CacheForDamage.bezier7Rect;
+            bezier7Rect.set(2.77f, 5.22f, 10.11f, 11.81f);
+            Path bezier7Path = CacheForDamage.bezier7Path;
+            bezier7Path.reset();
+            bezier7Path.moveTo(2.79f, 5.39f);
+            bezier7Path.lineTo(9.53f, 11.81f);
+            bezier7Path.lineTo(10.11f, 10.16f);
+            bezier7Path.lineTo(5.16f, 5.22f);
+            bezier7Path.lineTo(2.77f, 5.33f);
+            bezier7Path.cubicTo(2.78f, 5.35f, 2.79f, 5.37f, 2.79f, 5.39f);
+            bezier7Path.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(fillColor25);
+            canvas.drawPath(bezier7Path, paint);
+            
+            // Bezier 8
+            RectF bezier8Rect = CacheForDamage.bezier8Rect;
+            bezier8Rect.set(9.53f, 10.17f, 11.11f, 11.87f);
+            Path bezier8Path = CacheForDamage.bezier8Path;
+            bezier8Path.reset();
+            bezier8Path.moveTo(9.53f, 11.81f);
+            bezier8Path.lineTo(9.59f, 11.87f);
+            bezier8Path.lineTo(11.11f, 11.17f);
+            bezier8Path.lineTo(10.11f, 10.17f);
+            bezier8Path.lineTo(9.53f, 11.81f);
+            bezier8Path.lineTo(9.53f, 11.81f);
+            bezier8Path.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(fillColor25);
+            canvas.drawPath(bezier8Path, paint);
+            
+            // Bezier 9
+            RectF bezier9Rect = CacheForDamage.bezier9Rect;
+            bezier9Rect.set(14.1f, 14.15f, 16.64f, 16.69f);
+            Path bezier9Path = CacheForDamage.bezier9Path;
+            bezier9Path.reset();
+            bezier9Path.moveTo(15.43f, 14.15f);
+            bezier9Path.lineTo(15.71f, 15.18f);
+            bezier9Path.lineTo(16.64f, 14.25f);
+            bezier9Path.lineTo(15.43f, 14.15f);
+            bezier9Path.close();
+            bezier9Path.moveTo(14.1f, 15.48f);
+            bezier9Path.lineTo(15.13f, 15.76f);
+            bezier9Path.lineTo(14.19f, 16.69f);
+            bezier9Path.lineTo(14.1f, 15.48f);
+            bezier9Path.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(fillColor86);
+            canvas.drawPath(bezier9Path, paint);
+            
+            // Bezier 10
+            RectF bezier10Rect = CacheForDamage.bezier10Rect;
+            bezier10Rect.set(14.1f, 14.15f, 15.71f, 15.76f);
+            Path bezier10Path = CacheForDamage.bezier10Path;
+            bezier10Path.reset();
+            bezier10Path.moveTo(15.43f, 14.15f);
+            bezier10Path.lineTo(14.1f, 15.48f);
+            bezier10Path.lineTo(15.13f, 15.76f);
+            bezier10Path.lineTo(15.71f, 15.18f);
+            bezier10Path.lineTo(15.43f, 14.15f);
+            bezier10Path.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(fillColor87);
+            canvas.drawPath(bezier10Path, paint);
+            
+            // Bezier 11
+            RectF bezier11Rect = CacheForDamage.bezier11Rect;
+            bezier11Rect.set(14.19f, 14.25f, 16.73f, 16.79f);
+            Path bezier11Path = CacheForDamage.bezier11Path;
+            bezier11Path.reset();
+            bezier11Path.moveTo(16.73f, 15.46f);
+            bezier11Path.lineTo(15.7f, 15.18f);
+            bezier11Path.lineTo(16.64f, 14.25f);
+            bezier11Path.lineTo(16.73f, 15.46f);
+            bezier11Path.close();
+            bezier11Path.moveTo(15.41f, 16.79f);
+            bezier11Path.lineTo(15.12f, 15.76f);
+            bezier11Path.lineTo(14.19f, 16.7f);
+            bezier11Path.lineTo(15.41f, 16.79f);
+            bezier11Path.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(fillColor87);
+            canvas.drawPath(bezier11Path, paint);
+            
+            // Bezier 12
+            RectF bezier12Rect = CacheForDamage.bezier12Rect;
+            bezier12Rect.set(15.12f, 15.18f, 16.73f, 16.79f);
+            Path bezier12Path = CacheForDamage.bezier12Path;
+            bezier12Path.reset();
+            bezier12Path.moveTo(16.73f, 15.46f);
+            bezier12Path.lineTo(15.4f, 16.79f);
+            bezier12Path.lineTo(15.12f, 15.76f);
+            bezier12Path.lineTo(15.7f, 15.18f);
+            bezier12Path.lineTo(16.73f, 15.46f);
+            bezier12Path.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(fillColor86);
+            canvas.drawPath(bezier12Path, paint);
+            
+            // Rectangle 2
+            canvas.save();
+            canvas.translate(12.75f, 12.8f);
+            currentTransformation.peek().postTranslate(12.75f, 12.8f);
+            canvas.rotate(45f);
+            currentTransformation.peek().postRotate(45f);
+            RectF rectangle2Rect = CacheForDamage.rectangle2Rect;
+            rectangle2Rect.set(-0.57f, -0.95f, 0.57f, 0.95f);
+            Path rectangle2Path = CacheForDamage.rectangle2Path;
+            rectangle2Path.reset();
+            rectangle2Path.moveTo(rectangle2Rect.left, rectangle2Rect.top);
+            rectangle2Path.lineTo(rectangle2Rect.right, rectangle2Rect.top);
+            rectangle2Path.lineTo(rectangle2Rect.right, rectangle2Rect.bottom);
+            rectangle2Path.lineTo(rectangle2Rect.left, rectangle2Rect.bottom);
+            rectangle2Path.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(fillColor88);
+            canvas.drawPath(rectangle2Path, paint);
+            canvas.restore();
+            
+            // Rectangle 3
+            canvas.save();
+            canvas.translate(13.55f, 13.6f);
+            currentTransformation.peek().postTranslate(13.55f, 13.6f);
+            canvas.rotate(45f);
+            currentTransformation.peek().postRotate(45f);
+            RectF rectangle3Rect = CacheForDamage.rectangle3Rect;
+            rectangle3Rect.set(-0.57f, -0.95f, 0.57f, 0.95f);
+            Path rectangle3Path = CacheForDamage.rectangle3Path;
+            rectangle3Path.reset();
+            rectangle3Path.moveTo(rectangle3Rect.left, rectangle3Rect.top);
+            rectangle3Path.lineTo(rectangle3Rect.right, rectangle3Rect.top);
+            rectangle3Path.lineTo(rectangle3Rect.right, rectangle3Rect.bottom);
+            rectangle3Path.lineTo(rectangle3Rect.left, rectangle3Rect.bottom);
+            rectangle3Path.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(fillColor89);
+            canvas.drawPath(rectangle3Path, paint);
+            canvas.restore();
+            
+            // Rectangle 4
+            canvas.save();
+            canvas.translate(14.35f, 14.4f);
+            currentTransformation.peek().postTranslate(14.35f, 14.4f);
+            canvas.rotate(-45f);
+            currentTransformation.peek().postRotate(-45f);
+            RectF rectangle4Rect = CacheForDamage.rectangle4Rect;
+            rectangle4Rect.set(-0.95f, -0.57f, 0.95f, 0.57f);
+            Path rectangle4Path = CacheForDamage.rectangle4Path;
+            rectangle4Path.reset();
+            rectangle4Path.moveTo(rectangle4Rect.left, rectangle4Rect.top);
+            rectangle4Path.lineTo(rectangle4Rect.right, rectangle4Rect.top);
+            rectangle4Path.lineTo(rectangle4Rect.right, rectangle4Rect.bottom);
+            rectangle4Path.lineTo(rectangle4Rect.left, rectangle4Rect.bottom);
+            rectangle4Path.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(fillColor88);
+            canvas.drawPath(rectangle4Path, paint);
+            canvas.restore();
+            
+            // Bezier 13
+            RectF bezier13Rect = CacheForDamage.bezier13Rect;
+            bezier13Rect.set(11.1f, 8.06f, 14.58f, 11.87f);
+            Path bezier13Path = CacheForDamage.bezier13Path;
+            bezier13Path.reset();
+            bezier13Path.moveTo(11.1f, 11.16f);
+            bezier13Path.lineTo(12.2f, 8.79f);
+            bezier13Path.cubicTo(12.24f, 8.7f, 12.3f, 8.63f, 12.37f, 8.57f);
+            bezier13Path.cubicTo(12.46f, 8.49f, 12.57f, 8.44f, 12.68f, 8.41f);
+            bezier13Path.cubicTo(13.06f, 8.32f, 13.87f, 8.08f, 14.31f, 8.06f);
+            bezier13Path.cubicTo(14.41f, 8.06f, 14.51f, 8.1f, 14.58f, 8.19f);
+            bezier13Path.lineTo(12.98f, 9.55f);
+            bezier13Path.lineTo(11.81f, 11.87f);
+            bezier13Path.lineTo(11.1f, 11.16f);
+            bezier13Path.lineTo(11.1f, 11.16f);
+            bezier13Path.lineTo(11.1f, 11.16f);
+            bezier13Path.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(fillColor35);
+            canvas.drawPath(bezier13Path, paint);
+            
+            // Bezier 14
+            RectF bezier14Rect = CacheForDamage.bezier14Rect;
+            bezier14Rect.set(8f, 8.19f, 14.65f, 14.64f);
+            Path bezier14Path = CacheForDamage.bezier14Path;
+            bezier14Path.reset();
+            bezier14Path.moveTo(12.98f, 9.55f);
+            bezier14Path.lineTo(14.58f, 8.19f);
+            bezier14Path.cubicTo(14.66f, 8.28f, 14.67f, 8.41f, 14.62f, 8.53f);
+            bezier14Path.lineTo(12.72f, 12.5f);
+            bezier14Path.cubicTo(12.69f, 12.56f, 12.65f, 12.61f, 12.6f, 12.66f);
+            bezier14Path.lineTo(11.81f, 11.87f);
+            bezier14Path.lineTo(12.98f, 9.55f);
+            bezier14Path.close();
+            bezier14Path.moveTo(8f, 14.37f);
+            bezier14Path.cubicTo(8.02f, 13.93f, 8.25f, 13.12f, 8.35f, 12.74f);
+            bezier14Path.cubicTo(8.38f, 12.63f, 8.43f, 12.52f, 8.51f, 12.43f);
+            bezier14Path.cubicTo(8.56f, 12.36f, 8.64f, 12.3f, 8.72f, 12.26f);
+            bezier14Path.lineTo(11.1f, 11.16f);
+            bezier14Path.lineTo(11.1f, 11.16f);
+            bezier14Path.lineTo(11.81f, 11.87f);
+            bezier14Path.lineTo(9.49f, 13.04f);
+            bezier14Path.lineTo(8.12f, 14.64f);
+            bezier14Path.cubicTo(8.04f, 14.58f, 7.99f, 14.47f, 8f, 14.37f);
+            bezier14Path.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(fillColor40);
+            canvas.drawPath(bezier14Path, paint);
+            
+            // Bezier 15
+            RectF bezier15Rect = CacheForDamage.bezier15Rect;
+            bezier15Rect.set(8.12f, 11.87f, 12.6f, 14.71f);
+            Path bezier15Path = CacheForDamage.bezier15Path;
+            bezier15Path.reset();
+            bezier15Path.moveTo(9.49f, 13.04f);
+            bezier15Path.lineTo(8.12f, 14.64f);
+            bezier15Path.cubicTo(8.22f, 14.72f, 8.35f, 14.73f, 8.46f, 14.68f);
+            bezier15Path.lineTo(12.43f, 12.78f);
+            bezier15Path.cubicTo(12.49f, 12.75f, 12.55f, 12.71f, 12.6f, 12.66f);
+            bezier15Path.lineTo(11.81f, 11.87f);
+            bezier15Path.lineTo(9.49f, 13.04f);
+            bezier15Path.lineTo(9.49f, 13.04f);
+            bezier15Path.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(fillColor75);
+            canvas.drawPath(bezier15Path, paint);
+            
+            // Group 3
+            {
+                RectF group3 = CacheForDamage.group3;
+                group3.set(6.23f, 3.79f, 8.78f, 8.83f);
+                canvas.save();
+                
+                // Clip
+                Path clipPath = CacheForDamage.clipPath;
+                clipPath.reset();
+                clipPath.moveTo(6.23f, 3.79f);
+                clipPath.lineTo(8.78f, 6.47f);
+                clipPath.lineTo(8.78f, 8.83f);
+                clipPath.lineTo(6.23f, 6.29f);
+                clipPath.lineTo(6.23f, 3.79f);
+                clipPath.close();
+                canvas.clipPath(clipPath);
+                
+                // Bezier 16
+                RectF bezier16Rect = CacheForDamage.bezier16Rect;
+                bezier16Rect.set(6.58f, 3f, 8.78f, 9f);
+                Path bezier16Path = CacheForDamage.bezier16Path;
+                bezier16Path.reset();
+                bezier16Path.moveTo(8.78f, 4.22f);
+                bezier16Path.cubicTo(8.78f, 4.22f, 8.78f, 7.06f, 8.78f, 9f);
+                bezier16Path.lineTo(7.68f, 9f);
+                bezier16Path.cubicTo(7.68f, 7.06f, 7.68f, 4.22f, 7.68f, 4.22f);
+                bezier16Path.lineTo(8.78f, 4.22f);
+                bezier16Path.lineTo(8.78f, 4.22f);
+                bezier16Path.close();
+                bezier16Path.moveTo(6.95f, 8.96f);
+                bezier16Path.lineTo(6.58f, 9f);
+                bezier16Path.cubicTo(6.58f, 8.3f, 6.58f, 4.34f, 6.58f, 3f);
+                bezier16Path.lineTo(6.95f, 3f);
+                bezier16Path.cubicTo(6.95f, 4.34f, 6.95f, 8.3f, 6.95f, 9f);
+                bezier16Path.lineTo(6.95f, 8.96f);
+                bezier16Path.close();
+                
+                paint.reset();
+                paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+                paint.setStyle(Paint.Style.FILL);
+                paint.setColor(fillColor37);
+                canvas.drawPath(bezier16Path, paint);
+                
+                canvas.restore();
+            }
+        }
+        
+        canvas.restore();
+    }
+    
+    private static class CacheForCaret {
+        private static Paint paint = new Paint();
+        private static RectF originalFrame = new RectF(0f, 0f, 16f, 16f);
+        private static RectF resizedFrame = new RectF();
+        private static RectF bezierRect = new RectF();
+        private static Path bezierPath = new Path();
+    }
+    
+    public static void drawCaret(Canvas canvas, int caretColor, boolean pointsUp) {
+        HabiticaIcons.drawCaret(canvas, new RectF(0f, 0f, 16f, 16f), ResizingBehavior.AspectFit, caretColor, pointsUp);
+    }
+    
+    public static void drawCaret(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, int caretColor, boolean pointsUp) {
+        // General Declarations
+        Stack<Matrix> currentTransformation = new Stack<Matrix>();
+        currentTransformation.push(new Matrix());
+        Paint paint = CacheForCaret.paint;
+        
+        // Local Variables
+        float caretRotation = pointsUp ? 180f : 0f;
+        
+        // Resize to Target Frame
+        canvas.save();
+        RectF resizedFrame = CacheForCaret.resizedFrame;
+        HabiticaIcons.resizingBehaviorApply(resizing, CacheForCaret.originalFrame, targetFrame, resizedFrame);
+        canvas.translate(resizedFrame.left, resizedFrame.top);
+        canvas.scale(resizedFrame.width() / 16f, resizedFrame.height() / 16f);
+        
+        // Bezier
+        canvas.saveLayerAlpha(null, 138, Canvas.ALL_SAVE_FLAG);
+        {
+            canvas.translate(8f, 8f);
+            currentTransformation.peek().postTranslate(8f, 8f);
+            canvas.rotate(-caretRotation);
+            currentTransformation.peek().postRotate(-caretRotation);
+            RectF bezierRect = CacheForCaret.bezierRect;
+            bezierRect.set(-6f, -3.7f, 6f, 3.7f);
+            Path bezierPath = CacheForCaret.bezierPath;
+            bezierPath.reset();
+            bezierPath.moveTo(4.6f, -3.7f);
+            bezierPath.lineTo(6f, -2.3f);
+            bezierPath.lineTo(0f, 3.7f);
+            bezierPath.lineTo(-6f, -2.3f);
+            bezierPath.lineTo(-4.6f, -3.7f);
+            bezierPath.lineTo(0f, 0.9f);
+            bezierPath.lineTo(4.6f, -3.7f);
+            bezierPath.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            bezierPath.setFillType(Path.FillType.EVEN_ODD);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(caretColor);
+            canvas.drawPath(bezierPath, paint);
+        }
+        canvas.restore();
+        
+        canvas.restore();
+    }
+    
     
     // Canvas Images
     // Tab
@@ -7602,6 +8951,50 @@ public class HabiticaIcons {
         return imageOfInfoIcon;
     }
     
+    public static Bitmap imageOfContributorBadge(float contributorTier, boolean isNPC) {
+        Bitmap imageOfContributorBadge = Bitmap.createBitmap(16, 16, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(imageOfContributorBadge);
+        HabiticaIcons.drawContributorBadge(canvas, contributorTier, isNPC);
+        
+        return imageOfContributorBadge;
+    }
+    
+    public static Bitmap imageOfChatLikeIcon(boolean wasLiked) {
+        Bitmap imageOfChatLikeIcon = Bitmap.createBitmap(12, 12, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(imageOfChatLikeIcon);
+        HabiticaIcons.drawChatLikeIcon(canvas, wasLiked);
+        
+        return imageOfChatLikeIcon;
+    }
+    
+    public static Bitmap imageOfQuestBackground(int bossColorDark, int bossColorMedium, int bossColorLight) {
+        Bitmap imageOfQuestBackground = Bitmap.createBitmap(21, 21, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(imageOfQuestBackground);
+        HabiticaIcons.drawQuestBackground(canvas, bossColorDark, bossColorMedium, bossColorLight);
+        
+        return imageOfQuestBackground;
+    }
+    
+    private static Bitmap imageOfDamage = null;
+    public static Bitmap imageOfDamage() {
+        if (imageOfDamage != null)
+            return imageOfDamage;
+        
+        imageOfDamage = Bitmap.createBitmap(18, 18, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(imageOfDamage);
+        HabiticaIcons.drawDamage(canvas);
+        
+        return imageOfDamage;
+    }
+    
+    public static Bitmap imageOfCaret(int caretColor, boolean pointsUp) {
+        Bitmap imageOfCaret = Bitmap.createBitmap(16, 16, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(imageOfCaret);
+        HabiticaIcons.drawCaret(canvas, caretColor, pointsUp);
+        
+        return imageOfCaret;
+    }
+    
     
     // Resizing Behavior
     public static void resizingBehaviorApply(ResizingBehavior behavior, RectF rect, RectF target, RectF result) {
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 ba97f232e..fe078bf55 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
@@ -486,4 +486,59 @@ public class HabiticaIconsHelper {
 
         return imageOfInfoIcon;
     }
+
+    public static Bitmap imageOfContributorBadge(float contributorTier, boolean isNPC) {
+        int size = scaleSize(16);
+        Bitmap imageOfContributorBadge = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(imageOfContributorBadge);
+        canvas.scale(displayDensity, displayDensity);
+        HabiticaIcons.drawContributorBadge(canvas, contributorTier, isNPC);
+
+        return imageOfContributorBadge;
+    }
+
+    public static Bitmap imageOfChatLikeIcon(boolean wasLiked) {
+        int size = scaleSize(12);
+        Bitmap imageOfChatLikeIcon = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(imageOfChatLikeIcon);
+        canvas.scale(displayDensity, displayDensity);
+        HabiticaIcons.drawChatLikeIcon(canvas, wasLiked);
+
+        return imageOfChatLikeIcon;
+    }
+
+    public static Bitmap imageOfQuestBackground(int bossColorDark, int bossColorMedium, int bossColorLight) {
+        int size = scaleSize(21);
+        Bitmap imageOfQuestBackground = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(imageOfQuestBackground);
+        canvas.scale(displayDensity, displayDensity);
+        HabiticaIcons.drawQuestBackground(canvas, bossColorDark, bossColorMedium, bossColorLight);
+
+        return imageOfQuestBackground;
+    }
+
+    private static Bitmap imageOfDamage = null;
+    public static Bitmap imageOfDamage() {
+        if (imageOfDamage != null)
+            return imageOfDamage;
+
+        int size = scaleSize(18);
+        imageOfDamage = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(imageOfDamage);
+        canvas.scale(displayDensity, displayDensity);
+        HabiticaIcons.drawDamage(canvas);
+
+        return imageOfDamage;
+    }
+
+    public static Bitmap imageOfCaret(int caretColor, boolean pointsUp) {
+        int size = scaleSize(16);
+        Bitmap imageOfCaret = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(imageOfCaret);
+        canvas.scale(displayDensity, displayDensity);
+        HabiticaIcons.drawCaret(canvas, caretColor, pointsUp);
+
+        return imageOfCaret;
+    }
+
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/UsernameLabel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/UsernameLabel.kt
new file mode 100644
index 000000000..315d2db59
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/UsernameLabel.kt
@@ -0,0 +1,48 @@
+package com.habitrpg.android.habitica.ui.views.social
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.Gravity
+import android.view.View
+import android.widget.FrameLayout
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.models.members.PlayerTier
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+
+class UsernameLabel(context: Context?, attrs: AttributeSet?) : LinearLayout(context, attrs) {
+
+    private val textView = TextView(context)
+    private val tierIconView = ImageView(context)
+
+    var username: String = ""
+    set(value) {
+        textView.text = value
+    }
+
+    var tier: Int = 0
+    set(value) {
+        field = value
+        textView.setTextColor(PlayerTier.getColorForTier(context, value))
+        when (value) {
+            0 -> tierIconView.visibility = View.GONE
+            else -> {
+                tierIconView.visibility = View.VISIBLE
+                tierIconView.setImageBitmap(HabiticaIconsHelper.imageOfContributorBadge(value.toFloat(), false))
+            }
+        }
+    }
+
+    init {
+        val params = LinearLayout.LayoutParams(
+                FrameLayout.LayoutParams.WRAP_CONTENT,
+                FrameLayout.LayoutParams.WRAP_CONTENT)
+        params.gravity = Gravity.CENTER_VERTICAL
+        addView(textView, params)
+        val padding = context?.resources?.getDimension(R.dimen.spacing_small)?.toInt() ?: 0
+        textView.setPadding(0, 0, padding, 0)
+        addView(tierIconView, params)
+    }
+}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 2e256857f..2537b59e2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@
 buildscript {
     ext.kotlin_version = '1.1.61'
     ext.build_tools_version = '26.0.2'
-    ext.sdk_version = 26
+    ext.sdk_version = 27
 
     repositories {
         jcenter()