diff --git a/Habitica/res/drawable/border_1f000000_white.xml b/Habitica/res/drawable/border_1f000000_white.xml
new file mode 100644
index 000000000..d873a2142
--- /dev/null
+++ b/Habitica/res/drawable/border_1f000000_white.xml
@@ -0,0 +1,10 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <stroke
+        android:width="0.5dip"
+        android:color="#2f000000"/>
+
+</shape>
diff --git a/Habitica/res/drawable/circle_white.xml b/Habitica/res/drawable/circle_white.xml
new file mode 100644
index 000000000..94367b567
--- /dev/null
+++ b/Habitica/res/drawable/circle_white.xml
@@ -0,0 +1,6 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+
+    <solid android:color="@color/white" />
+
+</shape>
diff --git a/Habitica/res/drawable/pill_bg_white.xml b/Habitica/res/drawable/pill_bg_white.xml
new file mode 100644
index 000000000..f90c324d3
--- /dev/null
+++ b/Habitica/res/drawable/pill_bg_white.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/white"/>
+    <corners android:radius="20dip"/>
+    <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
+</shape>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_challenge_detail_daily.xml b/Habitica/res/layout/dialog_challenge_detail_daily.xml
index fe8705b6c..18b0b5459 100644
--- a/Habitica/res/layout/dialog_challenge_detail_daily.xml
+++ b/Habitica/res/layout/dialog_challenge_detail_daily.xml
@@ -1,30 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:background="@drawable/border_1f000000"
-              android:orientation="horizontal"
-              android:weightSum="3"
-              android:baselineAligned="false">
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/border_1f000000_white"
+    android:orientation="horizontal"
+    android:weightSum="3"
+    android:baselineAligned="false"
+    android:minHeight="60dp">
 
+    <FrameLayout
+        android:id="@+id/lock_icon_background"
+        android:layout_width="48dp"
+        android:layout_height="match_parent"
+        android:layout_marginRight="@dimen/spacing_large"
+        android:layout_marginTop="0.5dp"
+        android:layout_marginBottom="0.5dp">
         <ImageView
-            android:layout_width="16dp"
-            android:layout_height="16dp"
-            android:layout_marginBottom="18dp"
-            android:layout_marginEnd="15.5dp"
-            android:layout_marginLeft="14.5dp"
-            android:layout_marginRight="15.5dp"
-            android:layout_marginStart="14.5dp"
-            android:layout_marginTop="18dp"
-            android:src="@drawable/daily_checkbox" />
-
-
-    </LinearLayout>
+            android:id="@+id/lock_icon"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:layout_gravity="center"
+            android:scaleType="center"/>
+    </FrameLayout>
 
 
     <LinearLayout
diff --git a/Habitica/res/layout/dialog_challenge_detail_habit.xml b/Habitica/res/layout/dialog_challenge_detail_habit.xml
index c66f3f10c..6f79a4a7e 100644
--- a/Habitica/res/layout/dialog_challenge_detail_habit.xml
+++ b/Habitica/res/layout/dialog_challenge_detail_habit.xml
@@ -4,45 +4,26 @@
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
               android:orientation="horizontal"
-              android:background="@drawable/border_1f000000"
+              android:background="@drawable/border_1f000000_white"
               android:weightSum="3"
-              android:baselineAligned="false">
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
+              android:baselineAligned="false"
+    android:minHeight="60dp">
 
+    <FrameLayout
+        android:id="@+id/lock_icon_background_plus"
+        android:layout_width="48dp"
+        android:layout_height="match_parent"
+        android:background="@color/gray_700"
+        android:layout_marginRight="@dimen/spacing_large"
+        android:layout_marginTop="0.5dp"
+        android:layout_marginBottom="0.5dp">
         <ImageView
-            android:id="@+id/plus_img_tinted"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="18dp"
-            android:layout_marginEnd="15.5dp"
-            android:layout_marginLeft="14.5dp"
-            android:layout_marginRight="15.5dp"
-            android:layout_marginStart="14.5dp"
-            android:layout_marginTop="18dp"
-            android:src="@drawable/plus"
-            android:tint="#4d000000"
-            android:visibility="gone"
-            tools:visibility="visible" />
-
-        <ImageView
-            android:id="@+id/plus_img"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="18dp"
-            android:layout_marginEnd="15.5dp"
-            android:layout_marginLeft="14.5dp"
-            android:layout_marginRight="15.5dp"
-            android:layout_marginStart="14.5dp"
-            android:layout_marginTop="18dp"
-            android:src="@drawable/plus"
-            android:tint="#1f000000"
-            android:visibility="gone"
-            tools:visibility="visible" />
-
-    </LinearLayout>
+            android:id="@+id/lock_icon_plus"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:layout_gravity="center"
+            android:scaleType="center"/>
+    </FrameLayout>
 
 
     <LinearLayout
@@ -63,40 +44,20 @@
 
     </LinearLayout>
 
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-
+    <FrameLayout
+        android:id="@+id/lock_icon_background_minus"
+        android:layout_width="48dp"
+        android:layout_height="match_parent"
+        android:background="@color/gray_700"
+        android:layout_marginLeft="@dimen/spacing_large"
+        android:layout_marginTop="0.5dp"
+        android:layout_marginBottom="0.5dp">
         <ImageView
-            android:id="@+id/minus_img_tinted"
-            android:layout_width="16dp"
-            android:layout_height="16dp"
-            android:layout_marginBottom="18dp"
-            android:layout_marginEnd="15.5dp"
-            android:layout_marginLeft="14.5dp"
-            android:layout_marginRight="15.5dp"
-            android:layout_marginStart="14.5dp"
-            android:layout_marginTop="18dp"
-            android:src="@drawable/minus"
-            android:tint="#4d000000"
-            android:visibility="gone"
-            tools:visibility="visible" />
-
-        <ImageView
-            android:id="@+id/minus_img"
-            android:layout_width="16dp"
-            android:layout_height="16dp"
-            android:layout_marginBottom="18dp"
-            android:layout_marginEnd="15.5dp"
-            android:layout_marginLeft="14.5dp"
-            android:layout_marginRight="15.5dp"
-            android:layout_marginStart="14.5dp"
-            android:layout_marginTop="18dp"
-            android:src="@drawable/minus"
-            android:tint="#1f000000"
-            android:visibility="gone"
-            tools:visibility="visible" />
-
-    </LinearLayout>
+            android:id="@+id/lock_icon_minus"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:layout_gravity="center"
+            android:scaleType="center"/>
+    </FrameLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_challenge_detail_reward.xml b/Habitica/res/layout/dialog_challenge_detail_reward.xml
index 83e57dfe1..fdf376c03 100644
--- a/Habitica/res/layout/dialog_challenge_detail_reward.xml
+++ b/Habitica/res/layout/dialog_challenge_detail_reward.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:orientation="horizontal"
-              android:background="@drawable/border_1f000000"
-              android:weightSum="3"
-              android:baselineAligned="false">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:background="@drawable/border_1f000000_white"
+    android:weightSum="3"
+    android:baselineAligned="false"
+    android:minHeight="60dp">
         <ImageView
             android:id="@+id/gold_icon"
             android:layout_width="16dp"
diff --git a/Habitica/res/layout/dialog_challenge_detail_task_group.xml b/Habitica/res/layout/dialog_challenge_detail_task_group.xml
index 0403b2d0b..c908c8756 100644
--- a/Habitica/res/layout/dialog_challenge_detail_task_group.xml
+++ b/Habitica/res/layout/dialog_challenge_detail_task_group.xml
@@ -4,20 +4,35 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/task_group_name"
-        style="@style/Body1"
-        android:layout_marginTop="13dp"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        tools:text="2 Habits" />
+        android:gravity="center_vertical"
+        android:layout_marginLeft="@dimen/spacing_large"
+        android:layout_marginTop="24dp"
+        android:layout_marginBottom="@dimen/spacing_large"
+        >
+        <TextView
+            android:id="@+id/task_group_name"
+            style="@style/Body1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            tools:text="Habits"
+            android:textSize="15sp"/>
+        <TextView
+            android:id="@+id/task_count_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/spacing_medium"
+            style="@style/Pill.White"
+            android:textColor="@color/gray_400"
+            tools:text="2"/>
+    </LinearLayout>
 
     <LinearLayout
         android:id="@+id/tasks_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="11dp"
         android:background="@drawable/border_1f000000"
         android:orientation="vertical">
 
diff --git a/Habitica/res/layout/dialog_challenge_detail_todo.xml b/Habitica/res/layout/dialog_challenge_detail_todo.xml
index 402ded014..86ca6f1ba 100644
--- a/Habitica/res/layout/dialog_challenge_detail_todo.xml
+++ b/Habitica/res/layout/dialog_challenge_detail_todo.xml
@@ -1,30 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:background="@drawable/border_1f000000"
-              android:orientation="horizontal"
-              android:weightSum="3"
-              android:baselineAligned="false">
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/border_1f000000_white"
+    android:orientation="horizontal"
+    android:weightSum="3"
+    android:baselineAligned="false"
+    android:minHeight="60dp">
 
+    <FrameLayout
+        android:id="@+id/lock_icon_background"
+        android:layout_width="48dp"
+        android:layout_height="match_parent"
+        android:layout_marginRight="@dimen/spacing_large"
+        android:layout_marginTop="0.5dp"
+        android:layout_marginBottom="0.5dp">
         <ImageView
-            android:layout_width="16dp"
-            android:layout_height="16dp"
-            android:layout_marginBottom="18dp"
-            android:layout_marginEnd="15.5dp"
-            android:layout_marginLeft="14.5dp"
-            android:layout_marginRight="15.5dp"
-            android:layout_marginStart="14.5dp"
-            android:layout_marginTop="18dp"
-            android:src="@drawable/todo_checkbox" />
-
-
-    </LinearLayout>
+            android:id="@+id/lock_icon"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:layout_gravity="center"
+            android:scaleType="center"/>
+    </FrameLayout>
 
 
     <LinearLayout
diff --git a/Habitica/res/layout/fragment_challenge_detail.xml b/Habitica/res/layout/fragment_challenge_detail.xml
new file mode 100644
index 000000000..e1dbd9927
--- /dev/null
+++ b/Habitica/res/layout/fragment_challenge_detail.xml
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    app:maxHeightMultiplier="0.7">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:scrollbarAlwaysDrawVerticalTrack="true"
+        android:scrollbars="vertical"
+        android:layout_marginTop="@dimen/spacing_large"
+        android:paddingBottom="?attr/actionBarSize">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp">
+            <net.pherth.android.emoji_library.EmojiTextView
+                android:id="@+id/challenge_name"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                style="@style/Title1"
+                android:textSize="18sp"
+                tools:text="Challenge name"/>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:baselineAligned="false"
+                android:layout_marginTop="@dimen/spacing_large"
+                android:layout_marginBottom="@dimen/spacing_large">
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.5"
+                    android:background="@drawable/layout_rounded_bg"
+                    android:padding="@dimen/spacing_medium"
+                    android:orientation="vertical"
+                    android:layout_marginRight="@dimen/spacing_medium">
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal">
+                        <ImageView
+                            android:id="@+id/participant_count_icon"
+                            android:layout_width="24dp"
+                            android:layout_height="24dp" />
+                        <TextView
+                            android:id="@+id/participant_count"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:textSize="17sp"
+                            android:textColor="@color/gray_100"
+                            tools:text="5"
+                            android:layout_marginLeft="@dimen/spacing_small"
+                            />
+                    </LinearLayout>
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/participants"
+                        android:gravity="center"
+                        android:textSize="12sp"
+                        android:textColor="@color/gray_200"/>
+                </LinearLayout>
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.5"
+                    android:background="@drawable/layout_rounded_bg"
+                    android:padding="@dimen/spacing_medium"
+                    android:orientation="vertical"
+                    android:layout_marginLeft="@dimen/spacing_medium">
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal">
+                        <ImageView
+                            android:id="@+id/gem_amount_icon"
+                            android:layout_width="24dp"
+                            android:layout_height="24dp" />
+                        <TextView
+                            android:id="@+id/gem_amount"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:textSize="17sp"
+                            android:textColor="@color/gray_100"
+                            tools:text="5"
+                            android:layout_marginLeft="@dimen/spacing_small"
+                            />
+                    </LinearLayout>
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/challenge_prize"
+                        android:gravity="center"
+                        android:textSize="12sp"
+                        android:textColor="@color/gray_200"/>
+                </LinearLayout>
+            </LinearLayout>
+        </LinearLayout>
+        <FrameLayout
+            android:id="@+id/join_button_wrapper"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingLeft="@dimen/spacing_large"
+            android:paddingRight="@dimen/spacing_large"
+            android:paddingTop="@dimen/spacing_medium"
+            android:paddingBottom="@dimen/spacing_medium"
+            android:background="@color/white">
+            <Button
+                android:id="@+id/join_button"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/join"
+                style="@style/HabiticaButton.Green"/>
+        </FrameLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingLeft="@dimen/spacing_large"
+            android:paddingRight="@dimen/spacing_large"
+            android:paddingTop="@dimen/spacing_medium"
+            android:paddingBottom="@dimen/spacing_medium"
+            android:background="@color/white"
+            android:orientation="horizontal">
+            <com.habitrpg.android.habitica.ui.RoundedFrameLayout
+                android:layout_width="@dimen/avatar_chat_size"
+                android:layout_height="@dimen/avatar_chat_size"
+                android:clipChildren="true"
+                android:layout_marginRight="@dimen/spacing_medium"
+                android:layout_marginEnd="@dimen/spacing_medium"
+                android:background="@drawable/rounded_avatar_bg">
+                <com.habitrpg.android.habitica.ui.AvatarView
+                    android:id="@+id/creator_avatarview"
+                    android:layout_width="60dp"
+                    android:layout_height="60dp"
+                    android:layout_gravity="center"
+                    app:showMount="false"
+                    app:showPet="false" />
+            </com.habitrpg.android.habitica.ui.RoundedFrameLayout>
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_weight="1">
+                <com.habitrpg.android.habitica.ui.views.social.UsernameLabel
+                    android:id="@+id/creator_label"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/created_challenge"
+                    android:textColor="@color/gray_200"
+                    android:textSize="12sp"/>
+            </LinearLayout>
+            <ImageButton
+                android:id="@+id/creator_message_button"
+                android:layout_width="40dp"
+                android:layout_height="match_parent"
+                style="@style/Base.Widget.AppCompat.Button.Borderless"/>
+        </LinearLayout>
+        <com.habitrpg.android.habitica.ui.views.CollapsibleSectionView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:title="@string/challenge_categories"
+            android:background="@color/white">
+            <net.pherth.android.emoji_library.EmojiTextView
+                android:id="@+id/challenge_description"
+                style="@style/Body2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="11dp"
+                android:lineSpacingExtra="4sp"
+                tools:text="There’s always more to learn! Maybe it’s a specialized topic you’re interested in, or maybe it’s the experiences of a notable contributor. Read about it and you may win 15 gems!" />
+        </com.habitrpg.android.habitica.ui.views.CollapsibleSectionView>
+
+        <LinearLayout
+            android:id="@+id/task_group_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="13dp"
+            android:orientation="vertical">
+
+        </LinearLayout>
+        <FrameLayout
+            android:id="@+id/leave_button_wrapper"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingLeft="@dimen/spacing_large"
+            android:paddingRight="@dimen/spacing_large"
+            android:paddingTop="@dimen/spacing_medium"
+            android:paddingBottom="@dimen/spacing_large">
+            <Button
+                android:id="@+id/leave_button"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/leave"
+                style="@style/HabiticaButton.Red"/>
+        </FrameLayout>
+    </LinearLayout>
+</android.support.v4.widget.NestedScrollView>
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 88b9ed287..f8e02da04 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -782,4 +782,7 @@
     <string name="report">Report</string>
     <string name="like">Like</string>
     <string name="reply">Reply</string>
+    <string name="challenge_prize">Challenge Prize</string>
+    <string name="challenge_categories">Challenge Categories</string>
+    <string name="created_challenge">Created Challenge</string>
 </resources>
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index 4f97c6a32..36aa2304a 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -224,6 +224,10 @@
         <item name="android:paddingBottom">@dimen/pill_vertical_padding</item>
     </style>
 
+    <style name="Pill.White">
+        <item name="android:background">@drawable/pill_bg_white</item>
+    </style>
+
     <style name="Pill.Selected">
         <item name="android:textColor">@color/white</item>
         <item name="android:background">@drawable/pill_bg_purple</item>
diff --git a/Habitica/src/main/assets/HelveticaNeue.ttc b/Habitica/src/main/assets/HelveticaNeue.ttc
new file mode 100644
index 000000000..5f7306b5f
Binary files /dev/null and b/Habitica/src/main/assets/HelveticaNeue.ttc differ
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java
index b185bcc8f..70e5846bb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java
@@ -16,7 +16,6 @@ import com.habitrpg.android.habitica.receivers.NotificationPublisher;
 import com.habitrpg.android.habitica.receivers.TaskAlarmBootReceiver;
 import com.habitrpg.android.habitica.receivers.TaskReceiver;
 import com.habitrpg.android.habitica.ui.activities.AboutActivity;
-import com.habitrpg.android.habitica.ui.activities.ChallengeDetailActivity;
 import com.habitrpg.android.habitica.ui.activities.ClassSelectionActivity;
 import com.habitrpg.android.habitica.ui.activities.CreateChallengeActivity;
 import com.habitrpg.android.habitica.ui.activities.FixCharacterValuesActivity;
@@ -79,9 +78,8 @@ import com.habitrpg.android.habitica.ui.fragments.social.PublicGuildsFragment;
 import com.habitrpg.android.habitica.ui.fragments.social.QuestDetailFragment;
 import com.habitrpg.android.habitica.ui.fragments.social.TavernDetailFragment;
 import com.habitrpg.android.habitica.ui.fragments.social.TavernFragment;
-import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengeDetailDialogHolder;
+import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengeDetailFragment;
 import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengeListFragment;
-import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengeTasksRecyclerViewFragment;
 import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengesOverviewFragment;
 import com.habitrpg.android.habitica.ui.fragments.social.party.PartyDetailFragment;
 import com.habitrpg.android.habitica.ui.fragments.social.party.PartyFragment;
@@ -230,8 +228,6 @@ public interface AppComponent {
 
     void inject(ChallengeListFragment challengeListFragment);
 
-    void inject(ChallengeDetailActivity challengeDetailActivity);
-
     void inject(ApiClient apiClient);
 
     void inject(TaskListWidgetProvider taskListWidgetProvider);
@@ -250,8 +246,6 @@ public interface AppComponent {
 
     void inject(ChallengeTasksRecyclerViewAdapter challengeTasksRecyclerViewAdapter);
 
-    void inject(ChallengeTasksRecyclerViewFragment challengeTasksRecyclerViewFragment);
-
     void inject(TaskListFactory taskListFactory);
 
     void inject(GemPurchaseActivity gemPurchaseActivity);
@@ -272,8 +266,6 @@ public interface AppComponent {
 
     void inject(CreateChallengeActivity createChallengeActivity);
 
-    void inject(ChallengeDetailDialogHolder challengeDetailDialogHolder);
-
     void inject(TavernDetailFragment tavernDetailFragment);
 
     void inject(PartyDetailFragment partyDetailFragment);
@@ -299,4 +291,6 @@ public interface AppComponent {
     void inject(WelcomeFragment welcomeFragment);
 
     void inject(@NotNull NavigationDrawerFragment navigationDrawerFragment);
+
+    void inject(@NotNull ChallengeDetailFragment challengeDetailFragment);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ChallengeRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ChallengeRepository.java
deleted file mode 100644
index abe1d2fa8..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ChallengeRepository.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.habitrpg.android.habitica.data;
-
-import com.habitrpg.android.habitica.models.LeaveChallengeBody;
-import com.habitrpg.android.habitica.models.social.Challenge;
-import com.habitrpg.android.habitica.models.tasks.Task;
-import com.habitrpg.android.habitica.models.tasks.TaskList;
-import com.habitrpg.android.habitica.models.user.User;
-
-import java.util.List;
-
-import io.reactivex.Flowable;
-import io.realm.RealmResults;
-
-public interface ChallengeRepository extends BaseRepository  {
-    Flowable<Challenge> getChallenge(String challengeId);
-    Flowable<TaskList> getChallengeTasks(String challengeId);
-
-    Flowable<Challenge> createChallenge(Challenge challenge, List<Task> taskList);
-
-    /**
-     *
-     * @param challenge the challenge that will be updated
-     * @param fullTaskList lists all tasks of the current challenge, to create the taskOrders
-     * @param addedTaskList only the tasks to be added online
-     * @param updatedTaskList only the updated ones
-     * @param removedTaskList tasks that has be to be removed
-     * @return Observable with the updated challenge
-     */
-    Flowable<Challenge> updateChallenge(Challenge challenge, List<Task> fullTaskList,
-                                          List<Task> addedTaskList, List<Task> updatedTaskList, List<String> removedTaskList);
-    Flowable<Void> deleteChallenge(String challengeId);
-
-    Flowable<RealmResults<Challenge>> getChallenges();
-    Flowable<RealmResults<Challenge>> getUserChallenges(String userId);
-
-    Flowable<List<Challenge>> retrieveChallenges(User user);
-
-    Flowable<Void> leaveChallenge(Challenge challenge, LeaveChallengeBody leaveChallengeBody);
-
-    Flowable<Challenge> joinChallenge(Challenge challenge);
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ChallengeRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ChallengeRepository.kt
new file mode 100644
index 000000000..b5331229b
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ChallengeRepository.kt
@@ -0,0 +1,48 @@
+package com.habitrpg.android.habitica.data
+
+import com.habitrpg.android.habitica.models.LeaveChallengeBody
+import com.habitrpg.android.habitica.models.social.Challenge
+import com.habitrpg.android.habitica.models.social.ChallengeMembership
+import com.habitrpg.android.habitica.models.social.GroupMembership
+import com.habitrpg.android.habitica.models.tasks.Task
+import com.habitrpg.android.habitica.models.tasks.TaskList
+import com.habitrpg.android.habitica.models.user.User
+
+import io.reactivex.Flowable
+import io.realm.RealmResults
+
+interface ChallengeRepository : BaseRepository {
+
+    fun retrieveChallenges(user: User): Flowable<List<Challenge>>
+    fun getChallenges(): Flowable<RealmResults<Challenge>>
+    fun getChallenge(challengeId: String): Flowable<Challenge>
+    fun getChallengeTasks(challengeId: String): Flowable<RealmResults<Task>>
+
+    fun retrieveChallenge(challengeID: String): Flowable<Challenge>
+    fun retrieveChallengeTasks(challengeID: String): Flowable<TaskList>
+    fun createChallenge(challenge: Challenge, taskList: List<Task>): Flowable<Challenge>
+
+    /**
+     *
+     * @param challenge the challenge that will be updated
+     * @param fullTaskList lists all tasks of the current challenge, to create the taskOrders
+     * @param addedTaskList only the tasks to be added online
+     * @param updatedTaskList only the updated ones
+     * @param removedTaskList tasks that has be to be removed
+     * @return Observable with the updated challenge
+     */
+    fun updateChallenge(challenge: Challenge, fullTaskList: List<Task>,
+                        addedTaskList: List<Task>, updatedTaskList: List<Task>, removedTaskList: List<String>): Flowable<Challenge>
+
+    fun deleteChallenge(challengeId: String): Flowable<Void>
+    fun getUserChallenges(userId: String): Flowable<RealmResults<Challenge>>
+
+
+    fun leaveChallenge(challenge: Challenge, leaveChallengeBody: LeaveChallengeBody): Flowable<Void>
+
+    fun joinChallenge(challenge: Challenge): Flowable<Challenge>
+
+    fun getChallengepMembership(id: String): Flowable<ChallengeMembership>
+    fun getChallengeMemberships(): Flowable<RealmResults<ChallengeMembership>>
+    fun isChallengeMember(challengeID: String): Flowable<Boolean>
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.kt
index 916bd4686..71c4426fd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.kt
@@ -7,6 +7,7 @@ import com.habitrpg.android.habitica.models.responses.PostChatMessageResult
 import com.habitrpg.android.habitica.models.social.Challenge
 import com.habitrpg.android.habitica.models.social.ChatMessage
 import com.habitrpg.android.habitica.models.social.Group
+import com.habitrpg.android.habitica.models.social.GroupMembership
 import com.habitrpg.android.habitica.models.user.User
 import io.reactivex.Flowable
 import io.reactivex.Single
@@ -72,4 +73,7 @@ interface SocialRepository : BaseRepository {
     fun forceStartQuest(party: Group): Flowable<Quest>
 
     fun getMemberAchievements(userId: String?): Flowable<AchievementResult>
+
+    fun getGroupMembership(id: String): Flowable<GroupMembership>
+    fun getGroupMemberships(): Flowable<RealmResults<GroupMembership>>
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ChallengeRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ChallengeRepositoryImpl.kt
index c891f1e7e..e9b766625 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ChallengeRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ChallengeRepositoryImpl.kt
@@ -6,25 +6,51 @@ import com.habitrpg.android.habitica.data.ChallengeRepository
 import com.habitrpg.android.habitica.data.local.ChallengeLocalRepository
 import com.habitrpg.android.habitica.models.LeaveChallengeBody
 import com.habitrpg.android.habitica.models.social.Challenge
+import com.habitrpg.android.habitica.models.social.ChallengeMembership
 import com.habitrpg.android.habitica.models.tasks.Task
 import com.habitrpg.android.habitica.models.tasks.TaskList
 import com.habitrpg.android.habitica.models.tasks.TasksOrder
 import com.habitrpg.android.habitica.models.user.User
 import io.reactivex.Flowable
 import io.realm.RealmResults
-import java.util.*
 
 
-class ChallengeRepositoryImpl(localRepository: ChallengeLocalRepository, apiClient: ApiClient) : BaseRepositoryImpl<ChallengeLocalRepository>(localRepository, apiClient), ChallengeRepository {
+class ChallengeRepositoryImpl(localRepository: ChallengeLocalRepository, apiClient: ApiClient, private val userId: String) : BaseRepositoryImpl<ChallengeLocalRepository>(localRepository, apiClient), ChallengeRepository {
+    override fun isChallengeMember(challengeID: String): Flowable<Boolean> {
+        return localRepository.isChallengeMember(userId, challengeID)
+    }
+
+    override fun getChallengepMembership(id: String): Flowable<ChallengeMembership> {
+        return localRepository.getChallengeMembership(userId, id)
+    }
+
+    override fun getChallengeMemberships(): Flowable<RealmResults<ChallengeMembership>> {
+        return localRepository.getChallengeMemberships(userId)
+    }
 
     override fun getChallenge(challengeId: String): Flowable<Challenge> {
-        return apiClient.getChallenge(challengeId)
+        return localRepository.getChallenge(challengeId)
     }
 
-    override fun getChallengeTasks(challengeId: String): Flowable<TaskList> {
-        return apiClient.getChallengeTasks(challengeId)
+    override fun getChallengeTasks(challengeId: String): Flowable<RealmResults<Task>> {
+        return localRepository.getTasks(challengeId)
     }
 
+    override fun retrieveChallenge(challengeID: String): Flowable<Challenge> {
+        return apiClient.getChallenge(challengeID).doOnNext {
+            localRepository.save(it)
+        }
+    }
+
+    override fun retrieveChallengeTasks(challengeID: String): Flowable<TaskList> {
+        return apiClient.getChallengeTasks(challengeID).doOnNext {
+            val taskList = it.tasks.values.toList()
+            taskList.forEach {
+                it.userId = challengeID
+            }
+            localRepository.save(taskList)
+        }
+    }
 
     private fun getTaskOrders(taskList: List<Task>): TasksOrder {
         val stringListMap = U.groupBy(taskList) { t -> t.type }
@@ -46,7 +72,7 @@ class ChallengeRepositoryImpl(localRepository: ChallengeLocalRepository, apiClie
     }
 
     private fun addChallengeTasks(challenge: Challenge, addedTaskList: List<Task>): Flowable<Challenge> {
-        return apiClient.createChallengeTasks(challenge.id, addedTaskList).map { challenge }
+        return apiClient.createChallengeTasks(challenge.id ?: "", addedTaskList).map { challenge }
     }
 
     override fun createChallenge(challenge: Challenge, taskList: List<Task>): Flowable<Challenge> {
@@ -95,17 +121,13 @@ class ChallengeRepositoryImpl(localRepository: ChallengeLocalRepository, apiClie
                 .doOnNext { localRepository.saveChallenges(it) }
     }
 
-    override fun leaveChallenge(challenge: Challenge?, leaveChallengeBody: LeaveChallengeBody): Flowable<Void> {
-        return if (challenge == null) {
-            Flowable.empty()
-        } else apiClient.leaveChallenge(challenge.id, leaveChallengeBody)
-                .doOnNext { localRepository.setParticipating(challenge, false) }
+    override fun leaveChallenge(challenge: Challenge, leaveChallengeBody: LeaveChallengeBody): Flowable<Void> {
+        return apiClient.leaveChallenge(challenge.id ?: "", leaveChallengeBody)
+                .doOnNext { localRepository.setParticipating(userId, challenge.id ?: "", false) }
     }
 
-    override fun joinChallenge(challenge: Challenge?): Flowable<Challenge> {
-        return if (challenge == null) {
-            Flowable.empty()
-        } else apiClient.joinChallenge(challenge.id)
-                .doOnNext { localRepository.setParticipating(challenge, true) }
+    override fun joinChallenge(challenge: Challenge): Flowable<Challenge> {
+        return apiClient.joinChallenge(challenge.id ?: "")
+                .doOnNext { localRepository.setParticipating(userId, challenge.id ?: "", false) }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt
index ef2dd0258..40cafa998 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt
@@ -12,6 +12,7 @@ import com.habitrpg.android.habitica.models.responses.PostChatMessageResult
 import com.habitrpg.android.habitica.models.social.Challenge
 import com.habitrpg.android.habitica.models.social.ChatMessage
 import com.habitrpg.android.habitica.models.social.Group
+import com.habitrpg.android.habitica.models.social.GroupMembership
 import com.habitrpg.android.habitica.models.user.User
 import io.reactivex.Flowable
 import io.reactivex.Single
@@ -22,6 +23,13 @@ import java.util.*
 
 
 class SocialRepositoryImpl(localRepository: SocialLocalRepository, apiClient: ApiClient, private val userId: String) : BaseRepositoryImpl<SocialLocalRepository>(localRepository, apiClient), SocialRepository {
+    override fun getGroupMembership(id: String): Flowable<GroupMembership> {
+        return localRepository.getGroupMembership(userId, id)
+    }
+
+    override fun getGroupMemberships(): Flowable<RealmResults<GroupMembership>> {
+        return localRepository.getGroupMemberships(userId)
+    }
 
     override fun retrieveGroupChat(groupId: String): Single<List<ChatMessage>> {
         return apiClient.listGroupChat(groupId)
@@ -83,14 +91,7 @@ class SocialRepositoryImpl(localRepository: SocialLocalRepository, apiClient: Ap
     }
 
     override fun retrieveGroup(id: String): Flowable<Group> {
-        var observable = apiClient.getGroup(id)
-        if ("party" != id && localRepository.doesGroupExist(id)) {
-            observable = observable.withLatestFrom(localRepository.getGroup(id), BiFunction<Group, Group, Group> { newGroup, oldGroup ->
-                newGroup.isMember = oldGroup.isMember
-                newGroup
-            })
-        }
-        return Flowable.zip(observable.doOnNext { localRepository.save(it) }, retrieveGroupChat(id)
+        return Flowable.zip(apiClient.getGroup(id).doOnNext { localRepository.save(it) }, retrieveGroupChat(id)
                 .map {
                     it.forEach {
                         it.groupId = id
@@ -98,7 +99,7 @@ class SocialRepositoryImpl(localRepository: SocialLocalRepository, apiClient: Ap
                     return@map it
                 }
                 .doOnSuccess { localRepository.save(it) }.toFlowable(),
-                BiFunction<Group, List<ChatMessage>, Group> { group, chat ->
+                BiFunction<Group, List<ChatMessage>, Group> { group, _ ->
                     group
                 }
         )
@@ -117,7 +118,7 @@ class SocialRepositoryImpl(localRepository: SocialLocalRepository, apiClient: Ap
         }
         return apiClient.leaveGroup(id)
                 .flatMapMaybe { localRepository.getGroup(id).firstElement() }
-                .doOnNext { group -> localRepository.executeTransaction { group.isMember = false } }
+                .doOnNext { localRepository.executeTransaction { localRepository.updateMembership(userId, id, false) } }
     }
 
     override fun joinGroup(id: String?): Flowable<Group> {
@@ -126,7 +127,7 @@ class SocialRepositoryImpl(localRepository: SocialLocalRepository, apiClient: Ap
         }
         return apiClient.joinGroup(id)
                 .doOnNext { group ->
-                    group?.isMember = true
+                    localRepository.updateMembership(userId, id, true)
                     localRepository.save(group)
                 }
     }
@@ -148,7 +149,10 @@ class SocialRepositoryImpl(localRepository: SocialLocalRepository, apiClient: Ap
         return apiClient.listGroups(type)
                 .doOnNext { groups ->
                     if ("guilds" == type) {
-                        groups.forEach { guild -> guild.isMember = true }
+                        val memberships = groups.map {
+                            return@map GroupMembership(userId, it.id)
+                        }
+                        localRepository.save(memberships)
                     }
                     localRepository.save(groups)
                 }
@@ -195,7 +199,7 @@ class SocialRepositoryImpl(localRepository: SocialLocalRepository, apiClient: Ap
                 }
     }
 
-    override fun getUserGroups(): Flowable<RealmResults<Group>> = localRepository.getUserGroups()
+    override fun getUserGroups(): Flowable<RealmResults<Group>> = localRepository.getUserGroups(userId)
 
     override fun acceptQuest(user: User?, partyId: String): Flowable<Void> {
         return apiClient.acceptQuest(partyId)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/ChallengeLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/ChallengeLocalRepository.kt
index b467518fc..7f9fb92bc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/ChallengeLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/ChallengeLocalRepository.kt
@@ -2,6 +2,8 @@ package com.habitrpg.android.habitica.data.local
 
 
 import com.habitrpg.android.habitica.models.social.Challenge
+import com.habitrpg.android.habitica.models.social.ChallengeMembership
+import com.habitrpg.android.habitica.models.social.GroupMembership
 import com.habitrpg.android.habitica.models.tasks.Task
 
 import io.reactivex.Flowable
@@ -11,11 +13,15 @@ interface ChallengeLocalRepository : BaseLocalRepository {
 
     val challenges: Flowable<RealmResults<Challenge>>
     fun getChallenge(id: String): Flowable<Challenge>
-    fun getTasks(challenge: Challenge): Flowable<List<Task>>
+    fun getTasks(challengeID: String): Flowable<RealmResults<Task>>
 
     fun getUserChallenges(userId: String): Flowable<RealmResults<Challenge>>
 
-    fun setParticipating(challenge: Challenge, isParticipating: Boolean)
+    fun setParticipating(userID: String, challengeID: String, isParticipating: Boolean)
 
     fun saveChallenges(challenges: List<Challenge>)
+    fun getChallengeMembership(userId: String, id: String): Flowable<ChallengeMembership>
+    fun getChallengeMemberships(userId: String): Flowable<RealmResults<ChallengeMembership>>
+    fun isChallengeMember(userID: String, challengeID: String): Flowable<Boolean>
+
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/SocialLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/SocialLocalRepository.kt
index 986a46965..e4e821dab 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/SocialLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/SocialLocalRepository.kt
@@ -3,14 +3,16 @@ package com.habitrpg.android.habitica.data.local
 import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.social.ChatMessage
 import com.habitrpg.android.habitica.models.social.Group
+import com.habitrpg.android.habitica.models.social.GroupMembership
 import com.habitrpg.android.habitica.models.user.User
 import io.reactivex.Flowable
+import io.realm.Realm
 import io.realm.RealmResults
 
 interface SocialLocalRepository : BaseLocalRepository {
     fun getPublicGuilds(): Flowable<RealmResults<Group>>
 
-    fun getUserGroups(): Flowable<RealmResults<Group>>
+    fun getUserGroups(userID: String): Flowable<RealmResults<Group>>
     fun getGroups(type: String): Flowable<RealmResults<Group>>
 
     fun getGroup(id: String): Flowable<Group>
@@ -34,4 +36,7 @@ interface SocialLocalRepository : BaseLocalRepository {
     fun saveChatMessages(groupId: String?, chatMessages: List<ChatMessage>)
 
     fun doesGroupExist(id: String): Boolean
+    fun updateMembership(userId: String, id: String, isMember: Boolean)
+    fun getGroupMembership(userId: String, id: String): Flowable<GroupMembership>
+    fun getGroupMemberships(userId: String): Flowable<RealmResults<GroupMembership>>
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmChallengeLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmChallengeLocalRepository.kt
index 69b9ae490..3770d3401 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmChallengeLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmChallengeLocalRepository.kt
@@ -2,18 +2,38 @@ package com.habitrpg.android.habitica.data.local.implementation
 
 import com.habitrpg.android.habitica.data.local.ChallengeLocalRepository
 import com.habitrpg.android.habitica.models.social.Challenge
+import com.habitrpg.android.habitica.models.social.ChallengeMembership
 import com.habitrpg.android.habitica.models.tasks.Task
-
-import java.util.ArrayList
-
 import io.reactivex.Flowable
-import io.realm.OrderedRealmCollectionSnapshot
 import io.realm.Realm
 import io.realm.RealmResults
 import io.realm.Sort
+import java.util.*
 
 class RealmChallengeLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm), ChallengeLocalRepository {
 
+    override fun isChallengeMember(userID: String, challengeID: String): Flowable<Boolean> = realm.where(ChallengeMembership::class.java)
+            .equalTo("userID", userID)
+            .equalTo("challengeID", challengeID)
+            .findAll()
+            .asFlowable()
+            .filter { it.isLoaded }
+            .map { it.count() > 0 }
+
+    override fun getChallengeMembership(userId: String, id: String): Flowable<ChallengeMembership> = realm.where(ChallengeMembership::class.java)
+            .equalTo("userID", userId)
+            .equalTo("challengeID", id)
+            .findAll()
+            .asFlowable()
+            .filter { it.isLoaded }
+            .map { it.first() }
+
+    override fun getChallengeMemberships(userId: String): Flowable<RealmResults<ChallengeMembership>> = realm.where(ChallengeMembership::class.java)
+            .equalTo("userID", userId)
+            .findAll()
+            .asFlowable()
+            .filter { it.isLoaded }
+
     override fun getChallenge(id: String): Flowable<Challenge> {
         return realm.where(Challenge::class.java)
                 .equalTo("id", id)
@@ -23,8 +43,12 @@ class RealmChallengeLocalRepository(realm: Realm) : RealmBaseLocalRepository(rea
                 .map { it.first() }
     }
 
-    override fun getTasks(challenge: Challenge): Flowable<List<Task>> {
-        return Flowable.empty()
+    override fun getTasks(challengeID: String): Flowable<RealmResults<Task>> {
+        return realm.where(Task::class.java)
+                .equalTo("userId", challengeID)
+                .findAll()
+                .asFlowable()
+                .filter { realmObject -> realmObject.isLoaded }
     }
 
     override val challenges: Flowable<RealmResults<Challenge>>
@@ -36,24 +60,45 @@ class RealmChallengeLocalRepository(realm: Realm) : RealmBaseLocalRepository(rea
                 .filter { it.isLoaded }
 
     override fun getUserChallenges(userId: String): Flowable<RealmResults<Challenge>> {
-        return realm.where(Challenge::class.java)
-                .isNotNull("name")
-                .equalTo("isParticipating", true)
-                .sort("official", Sort.DESCENDING, "createdAt", Sort.DESCENDING)
-                .findAllAsync()
+        return realm.where(ChallengeMembership::class.java)
+                .equalTo("userID", userId)
+                .findAll()
                 .asFlowable()
                 .filter { it.isLoaded }
+                .flatMap {
+                    val ids = it.map {
+                        return@map it.challengeID
+                    }.toTypedArray()
+                    realm.where(Challenge::class.java)
+                            .isNotNull("name")
+                            .`in`("id", ids)
+                            .sort("official", Sort.DESCENDING, "createdAt", Sort.DESCENDING)
+                            .findAll()
+                            .asFlowable()
+                            .filter { it.isLoaded }
+                }
     }
 
-    override fun setParticipating(challenge: Challenge, isParticipating: Boolean) {
-        realm.executeTransaction { challenge.isParticipating = isParticipating }
+    override fun setParticipating(userID: String, challengeID: String, isParticipating: Boolean) {
+        if (isParticipating) {
+            realm.executeTransaction {
+                realm.insertOrUpdate(ChallengeMembership(userID, challengeID))
+            }
+        } else {
+            val membership = realm.where(ChallengeMembership::class.java).equalTo("userID", userID).equalTo("challengeID", challengeID).findFirst()
+            if (membership != null) {
+                realm.executeTransaction {
+                    membership.deleteFromRealm()
+                }
+            }
+        }
     }
 
-    override fun saveChallenges(onlineChallenges: List<Challenge>) {
+    override fun saveChallenges(challenges: List<Challenge>) {
         val localChallenges = realm.where(Challenge::class.java).findAll().createSnapshot()
         val challengesToDelete = ArrayList<Challenge>()
         for (localTask in localChallenges) {
-            if (!onlineChallenges.contains(localTask)) {
+            if (!challenges.contains(localTask)) {
                 challengesToDelete.add(localTask)
             }
         }
@@ -62,6 +107,6 @@ class RealmChallengeLocalRepository(realm: Realm) : RealmBaseLocalRepository(rea
                 localTask.deleteFromRealm()
             }
         }
-        realm.executeTransaction { realm1 -> realm1.insertOrUpdate(onlineChallenges) }
+        realm.executeTransaction { realm1 -> realm1.insertOrUpdate(challenges) }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmSocialLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmSocialLocalRepository.kt
index 8e1811e7f..10a7377e6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmSocialLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmSocialLocalRepository.kt
@@ -5,6 +5,7 @@ import com.habitrpg.android.habitica.models.members.Member
 import com.habitrpg.android.habitica.models.social.ChatMessage
 import com.habitrpg.android.habitica.models.social.ChatMessageLike
 import com.habitrpg.android.habitica.models.social.Group
+import com.habitrpg.android.habitica.models.social.GroupMembership
 import com.habitrpg.android.habitica.models.user.User
 import io.reactivex.Flowable
 import io.realm.Realm
@@ -15,6 +16,35 @@ import java.util.*
 
 class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm), SocialLocalRepository {
 
+    override fun getGroupMembership(userId: String, id: String): Flowable<GroupMembership> = realm.where(GroupMembership::class.java)
+            .equalTo("userID", userId)
+            .equalTo("groupID", id)
+            .findAll()
+            .asFlowable()
+            .filter { it.isLoaded }
+            .map { it.first() }
+
+    override fun getGroupMemberships(userId: String): Flowable<RealmResults<GroupMembership>> = realm.where(GroupMembership::class.java)
+            .equalTo("userID", userId)
+            .findAll()
+            .asFlowable()
+            .filter { it.isLoaded }
+
+    override fun updateMembership(userId: String, id: String, isMember: Boolean) {
+        if (isMember) {
+            realm.executeTransaction {
+                realm.insertOrUpdate(GroupMembership(userId, id))
+            }
+        } else {
+            val membership = realm.where(GroupMembership::class.java).equalTo("userID", userId).equalTo("groupID", id).findFirst()
+            if (membership != null) {
+                realm.executeTransaction {
+                    membership.deleteFromRealm()
+                }
+            }
+        }
+    }
+
     override fun getPublicGuilds(): Flowable<RealmResults<Group>> = realm.where(Group::class.java)
                 .equalTo("type", "guild")
                 .equalTo("privacy", "public")
@@ -23,13 +53,24 @@ class RealmSocialLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm)
                 .asFlowable()
                 .filter { it.isLoaded }
 
-    override fun getUserGroups(): Flowable<RealmResults<Group>> = realm.where(Group::class.java)
-                .equalTo("type", "guild")
-                .equalTo("isMember", true)
-                .sort("memberCount", Sort.DESCENDING)
+    override fun getUserGroups(userID: String): Flowable<RealmResults<Group>> = realm.where(GroupMembership::class.java)
+            .equalTo("userID", userID)
             .findAll()
-                .asFlowable()
-                .filter { it.isLoaded }
+            .asFlowable()
+            .filter { it.isLoaded }
+            .flatMap {
+                realm.where(Group::class.java)
+                        .equalTo("type", "guild")
+                        .`in`("id", it.map {
+                            return@map it.groupID
+                        }.toTypedArray())
+                        .sort("memberCount", Sort.DESCENDING)
+                        .findAll()
+                        .asFlowable()
+                        .filter { it.isLoaded }
+            }
+
+
 
     override fun getGroups(type: String): Flowable<RealmResults<Group>> {
         return realm.where(Group::class.java)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.kt
index 89d5c4acf..fa412ed3a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.kt
@@ -4,7 +4,7 @@ import com.habitrpg.android.habitica.data.local.UserLocalRepository
 import com.habitrpg.android.habitica.models.Skill
 import com.habitrpg.android.habitica.models.Tag
 import com.habitrpg.android.habitica.models.TutorialStep
-import com.habitrpg.android.habitica.models.social.Challenge
+import com.habitrpg.android.habitica.models.social.ChallengeMembership
 import com.habitrpg.android.habitica.models.social.ChatMessage
 import com.habitrpg.android.habitica.models.user.User
 import io.reactivex.Flowable
@@ -42,7 +42,7 @@ class RealmUserLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
             removeOldTags(user.id, user.tags)
         }
         if (user.challenges != null) {
-            removeOldChallenges(user.challenges)
+            removeOldChallenges(user.id, user.challenges)
         }
     }
 
@@ -62,12 +62,12 @@ class RealmUserLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
         }
     }
 
-    private fun removeOldChallenges(onlineChallenges: List<Challenge>) {
-        val challenges = realm.where(Challenge::class.java).equalTo("isParticipating", true).findAll().createSnapshot()
-        val challengesToDelete = challenges.filterNot { onlineChallenges.contains(it) }
+    private fun removeOldChallenges(userID: String, onlineChallenges: List<ChallengeMembership>) {
+        val memberships = realm.where(ChallengeMembership::class.java).equalTo("userID", userID).findAll().createSnapshot()
+        val membershipsToDelete = memberships.filterNot { onlineChallenges.contains(it) }
         realm.executeTransaction {
-            for (challenge in challengesToDelete) {
-                challenge.isParticipating = false
+            membershipsToDelete.forEach {
+                it.deleteFromRealm()
             }
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ShowChallengeDetailActivityCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ShowChallengeDetailActivityCommand.java
deleted file mode 100644
index 47bd69ef9..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ShowChallengeDetailActivityCommand.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.habitrpg.android.habitica.events.commands;
-
-public class ShowChallengeDetailActivityCommand {
-    public String challengeId;
-
-    public ShowChallengeDetailActivityCommand(String challengeId) {
-        this.challengeId = challengeId;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ShowChallengeDetailDialogCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ShowChallengeDetailDialogCommand.java
deleted file mode 100644
index 289dc3a8b..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ShowChallengeDetailDialogCommand.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.habitrpg.android.habitica.events.commands;
-
-public class ShowChallengeDetailDialogCommand {
-    public String challengeId;
-
-    public ShowChallengeDetailDialogCommand(String challengeId) {
-        this.challengeId = challengeId;
-    }
-}
-
-
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/Member.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/Member.java
index aed774ef1..5e0d08ba9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/Member.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/members/Member.java
@@ -1,5 +1,7 @@
 package com.habitrpg.android.habitica.models.members;
 
+import android.support.annotation.Nullable;
+
 import com.google.gson.annotations.SerializedName;
 import com.habitrpg.android.habitica.models.Avatar;
 import com.habitrpg.android.habitica.models.social.UserParty;
@@ -19,10 +21,15 @@ public class Member extends RealmObject implements Avatar {
     @SerializedName("_id")
     private String id;
     private Stats stats;
+    @Nullable
     private Inbox inbox;
+    @Nullable
     private MemberPreferences preferences;
+    @Nullable
     private Profile profile;
+    @Nullable
     private UserParty party;
+    @Nullable
     private ContributorInfo contributor;
 
     private Outfit costume;
@@ -73,6 +80,7 @@ public class Member extends RealmObject implements Avatar {
         }
     }
 
+    @Nullable
     public Stats getStats() {
         return stats;
     }
@@ -84,6 +92,7 @@ public class Member extends RealmObject implements Avatar {
         }
     }
 
+    @Nullable
     public Inbox getInbox() {
         return inbox;
     }
@@ -95,6 +104,7 @@ public class Member extends RealmObject implements Avatar {
         }
     }
 
+    @Nullable
     public Profile getProfile() {
         return profile;
     }
@@ -106,6 +116,7 @@ public class Member extends RealmObject implements Avatar {
         }
     }
 
+    @Nullable
     public ContributorInfo getContributor() {
         return contributor;
     }
@@ -117,6 +128,7 @@ public class Member extends RealmObject implements Avatar {
         }
     }
 
+    @Nullable
     public UserParty getParty() {
         return party;
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Challenge.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Challenge.java
deleted file mode 100644
index c4dfeeda4..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Challenge.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.habitrpg.android.habitica.models.social;
-
-import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
-import com.habitrpg.android.habitica.models.tasks.TasksOrder;
-import com.habitrpg.android.habitica.models.user.User;
-
-import java.util.Date;
-import java.util.HashMap;
-
-import io.realm.RealmObject;
-import io.realm.annotations.Ignore;
-import io.realm.annotations.PrimaryKey;
-
-public class Challenge extends RealmObject {
-
-    public static final String TASK_ORDER_HABITS = "habits";
-    public static final String TASK_ORDER_TODOS = "todos";
-    public static final String TASK_ORDER_DAILYS = "dailys";
-    public static final String TASK_ORDER_REWARDS = "rewards";
-
-    @PrimaryKey
-    public String id;
-    public String name;
-    public String shortName;
-    public String description;
-    public String leaderName;
-    public String leaderId;
-    public String groupName;
-    public String groupId;
-    public int prize;
-    public boolean official;
-    public int memberCount;
-    public String todoList;
-    public String habitList;
-    public String dailyList;
-    public String rewardList;
-    public Date createdAt;
-    public Date updatedAt;
-
-    public Group group;
-
-    public User leader;
-    @Ignore
-    public TasksOrder tasksOrder;
-    public boolean isParticipating;
-
-    public HashMap<String, String[]> getTasksOrder() {
-        HashMap<String, String[]> map = new HashMap<>();
-
-        if (!dailyList.isEmpty()) {
-            map.put(TASK_ORDER_DAILYS, dailyList.split(","));
-        }
-
-        if (!habitList.isEmpty()) {
-            map.put(TASK_ORDER_HABITS, habitList.split(","));
-        }
-
-        if (!rewardList.isEmpty()) {
-            map.put(TASK_ORDER_REWARDS, rewardList.split(","));
-        }
-
-        if (!todoList.isEmpty()) {
-            map.put(TASK_ORDER_TODOS, todoList.split(","));
-        }
-
-        return map;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj.getClass().equals(Challenge.class) && this.id != null) {
-            return this.id.equals(((Challenge)obj).id);
-        }
-        return super.equals(obj);
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Challenge.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Challenge.kt
new file mode 100644
index 000000000..2931e9677
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Challenge.kt
@@ -0,0 +1,73 @@
+package com.habitrpg.android.habitica.models.social
+
+import com.habitrpg.android.habitica.extensions.notNull
+import com.habitrpg.android.habitica.models.tasks.TasksOrder
+import com.habitrpg.android.habitica.models.user.User
+import io.realm.RealmObject
+import io.realm.annotations.Ignore
+import io.realm.annotations.PrimaryKey
+import java.util.*
+
+open class Challenge : RealmObject() {
+
+    @PrimaryKey
+    var id: String? = null
+    var name: String? = null
+    var shortName: String? = null
+    var description: String? = null
+    var leaderName: String? = null
+    var leaderId: String? = null
+    var groupName: String? = null
+    var groupId: String? = null
+    var prize: Int = 0
+    var official: Boolean = false
+    var memberCount: Int = 0
+    var todoList: String? = null
+    var habitList: String? = null
+    var dailyList: String? = null
+    var rewardList: String? = null
+    var createdAt: Date? = null
+    var updatedAt: Date? = null
+
+    var group: Group? = null
+
+    var leader: User? = null
+    @Ignore
+    var tasksOrder: TasksOrder? = null
+
+    fun getTasksOrder(): HashMap<String, Array<String>> {
+        val map = HashMap<String, Array<String>>()
+
+        if (dailyList?.isNotEmpty() == true) {
+             dailyList?.split(",".toRegex())?.dropLastWhile { it.isEmpty() }?.toTypedArray().notNull { map[TASK_ORDER_DAILYS] }
+            }
+
+        if (habitList?.isNotEmpty() == true) {
+            habitList?.split(",".toRegex())?.dropLastWhile { it.isEmpty() }?.toTypedArray().notNull { map[TASK_ORDER_HABITS] }
+            }
+
+        if (rewardList?.isNotEmpty() == true) {
+            rewardList?.split(",".toRegex())?.dropLastWhile { it.isEmpty() }?.toTypedArray().notNull { map[TASK_ORDER_REWARDS] }
+            }
+
+        if (todoList?.isNotEmpty() == true) {
+            todoList?.split(",".toRegex())?.dropLastWhile { it.isEmpty() }?.toTypedArray().notNull { map[TASK_ORDER_TODOS] }
+        }
+
+        return map
+    }
+
+    override fun equals(other: Any?): Boolean {
+        return if (other?.javaClass == Challenge::class.java && this.id != null) {
+            this.id == (other as Challenge).id
+        } else super.equals(other)
+    }
+
+    companion object {
+
+        const val TASK_ORDER_HABITS = "habits"
+        const val TASK_ORDER_TODOS = "todos"
+        const val TASK_ORDER_DAILYS = "dailys"
+        const val TASK_ORDER_REWARDS = "rewards"
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/ChallengeMembership.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/ChallengeMembership.kt
new file mode 100644
index 000000000..0ab662e25
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/ChallengeMembership.kt
@@ -0,0 +1,40 @@
+package com.habitrpg.android.habitica.models.social
+
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+
+open class ChallengeMembership : RealmObject {
+    @PrimaryKey
+    var combinedID: String = ""
+
+    var userID: String = ""
+        set(value) {
+            field = value
+            combinedID = userID + challengeID
+        }
+    var challengeID: String = ""
+        set(value) {
+            field = value
+            combinedID = userID + challengeID
+        }
+
+    constructor(userID: String, challengeID: String) : super() {
+        this.userID = userID
+        this.challengeID = challengeID
+    }
+
+    constructor() : super()
+
+    override fun equals(other: Any?): Boolean {
+        return if (other?.javaClass == ChallengeMembership::class.java) {
+            this.combinedID == (other as ChallengeMembership).combinedID
+        } else super.equals(other)
+    }
+
+    override fun hashCode(): Int {
+        var result = combinedID.hashCode()
+        result = 31 * result + userID.hashCode()
+        result = 31 * result + challengeID.hashCode()
+        return result
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Group.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Group.kt
index 89ce7987c..3bedf55ae 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Group.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Group.kt
@@ -26,8 +26,6 @@ open class Group : RealmObject() {
 
     var memberCount: Int = 0
 
-    var isMember: Boolean = false
-
     var type: String? = null
 
     var logo: String? = null
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/GroupMembership.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/GroupMembership.kt
new file mode 100644
index 000000000..4e71f11b3
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/GroupMembership.kt
@@ -0,0 +1,27 @@
+package com.habitrpg.android.habitica.models.social
+
+import io.realm.RealmObject
+import io.realm.annotations.PrimaryKey
+
+open class GroupMembership : RealmObject {
+    @PrimaryKey
+    var combinedID: String = ""
+
+    var userID: String = ""
+        set(value) {
+            field = value
+            combinedID = userID + groupID
+        }
+    var groupID: String = ""
+        set(value) {
+            field = value
+            combinedID = userID + groupID
+        }
+
+    constructor(userID: String, groupID: String) : super() {
+        this.userID = userID
+        this.groupID = groupID
+    }
+
+    constructor() : super()
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt
index 3834440e5..ce936e0a5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt
@@ -85,6 +85,19 @@ open class Task : RealmObject, Parcelable {
     val completedChecklistCount: Int
         get() = checklist?.count { it.completed } ?: 0
 
+    val extraLightTaskColor: Int
+        get() {
+            return when {
+                this.value < -20 -> return R.color.maroon_500
+                this.value < -10 -> return R.color.red_500
+                this.value < -1 -> return R.color.orange_500
+                this.value < 1 -> return R.color.yellow_500
+                this.value < 5 -> return R.color.green_500
+                this.value < 10 -> return R.color.teal_500
+                else -> R.color.blue_500
+            }
+        }
+
     val lightTaskColor: Int
         get() {
             return when {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.java
index 0ff165e73..dda473b7f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.java
@@ -6,6 +6,7 @@ import com.habitrpg.android.habitica.models.PushDevice;
 import com.habitrpg.android.habitica.models.Tag;
 import com.habitrpg.android.habitica.models.invitations.Invitations;
 import com.habitrpg.android.habitica.models.social.Challenge;
+import com.habitrpg.android.habitica.models.social.ChallengeMembership;
 import com.habitrpg.android.habitica.models.social.UserParty;
 import com.habitrpg.android.habitica.models.tasks.TaskList;
 import com.habitrpg.android.habitica.models.tasks.TasksOrder;
@@ -51,7 +52,7 @@ public class User extends RealmObject implements Avatar {
     @Ignore
     private TasksOrder tasksOrder;
 
-    private RealmList<Challenge> challenges;
+    private RealmList<ChallengeMembership> challenges;
 
     private Date lastCron;
     private Boolean needsCron;
@@ -310,11 +311,11 @@ public class User extends RealmObject implements Avatar {
         this.tags = tags;
     }
 
-    public RealmList<Challenge> getChallenges() {
+    public RealmList<ChallengeMembership> getChallenges() {
         return challenges;
     }
 
-    public void setChallenges(RealmList<Challenge> challenges) {
+    public void setChallenges(RealmList<ChallengeMembership> challenges) {
         this.challenges = challenges;
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.java b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.java
index 9f23c2161..5d3004e70 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.java
@@ -91,8 +91,8 @@ public class RepositoryModule {
     }
 
     @Provides
-    ChallengeRepository providesChallengeRepository(ChallengeLocalRepository localRepository, ApiClient apiClient) {
-        return new ChallengeRepositoryImpl(localRepository, apiClient);
+    ChallengeRepository providesChallengeRepository(ChallengeLocalRepository localRepository, ApiClient apiClient, @Named(AppModule.NAMED_USER_ID) String userId) {
+        return new ChallengeRepositoryImpl(localRepository, apiClient, userId);
     }
 
     @Provides
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeDetailActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeDetailActivity.kt
deleted file mode 100644
index 36b0fed99..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeDetailActivity.kt
+++ /dev/null
@@ -1,397 +0,0 @@
-package com.habitrpg.android.habitica.ui.activities
-
-import android.app.AlertDialog
-import android.content.Intent
-import android.graphics.drawable.BitmapDrawable
-import android.os.Bundle
-import android.support.design.widget.TabLayout
-import android.support.v7.widget.RecyclerView
-import android.support.v7.widget.Toolbar
-import android.view.Menu
-import android.view.MenuItem
-import android.view.View
-import android.widget.Button
-import android.widget.FrameLayout
-import android.widget.TextView
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.components.AppComponent
-import com.habitrpg.android.habitica.data.ChallengeRepository
-import com.habitrpg.android.habitica.data.UserRepository
-import com.habitrpg.android.habitica.events.HabitScoreEvent
-import com.habitrpg.android.habitica.events.TaskUpdatedEvent
-import com.habitrpg.android.habitica.events.commands.BuyRewardCommand
-import com.habitrpg.android.habitica.events.commands.ChecklistCheckedCommand
-import com.habitrpg.android.habitica.events.commands.TaskCheckedCommand
-import com.habitrpg.android.habitica.extensions.notNull
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
-import com.habitrpg.android.habitica.interactors.*
-import com.habitrpg.android.habitica.models.LeaveChallengeBody
-import com.habitrpg.android.habitica.models.responses.TaskScoringResult
-import com.habitrpg.android.habitica.models.social.Challenge
-import com.habitrpg.android.habitica.models.tasks.Task
-import com.habitrpg.android.habitica.models.user.User
-import com.habitrpg.android.habitica.modules.AppModule
-import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengeDetailDialogHolder
-import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengeTasksRecyclerViewFragment
-import com.habitrpg.android.habitica.ui.helpers.MarkdownParser
-import com.habitrpg.android.habitica.ui.helpers.bindView
-import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import com.habitrpg.android.habitica.ui.views.HabiticaSnackbar
-import com.habitrpg.android.habitica.utils.Action1
-import io.reactivex.functions.Consumer
-import net.pherth.android.emoji_library.EmojiParser
-import net.pherth.android.emoji_library.EmojiTextView
-import org.greenrobot.eventbus.EventBus
-import org.greenrobot.eventbus.Subscribe
-import java.util.*
-import javax.inject.Inject
-import javax.inject.Named
-
-
-class ChallengeDetailActivity : BaseActivity() {
-
-
-    @Inject
-    internal lateinit var challengeRepository: ChallengeRepository
-    @field:[Inject Named(AppModule.NAMED_USER_ID)]
-    internal lateinit var userId: String
-    @Inject
-    internal lateinit var userRepository: UserRepository
-
-    private val floatingMenuWrapper: FrameLayout by bindView(R.id.floating_menu_wrapper)
-    private val detailTabs: TabLayout by bindView(R.id.detail_tabs)
-    private val toolbar: Toolbar by bindView(R.id.toolbar)
-    // region UseCases
-
-    @Inject
-    internal lateinit var habitScoreUseCase: HabitScoreUseCase
-
-    @Inject
-    internal lateinit var dailyCheckUseCase: DailyCheckUseCase
-
-    @Inject
-    internal lateinit var todoCheckUseCase: TodoCheckUseCase
-
-    @Inject
-    internal lateinit var buyRewardUseCase: BuyRewardUseCase
-
-    @Inject
-    internal lateinit var checklistCheckUseCase: ChecklistCheckUseCase
-
-    @Inject
-    internal lateinit var displayItemDropUseCase: DisplayItemDropUseCase
-
-    @Inject
-    internal lateinit var notifyUserUseCase: NotifyUserUseCase
-
-    // endregion
-
-    private var challenge: Challenge? = null
-    private var user: User? = null
-
-    override fun getLayoutResId(): Int {
-        return R.layout.activity_challenge_detail
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        val inflater = menuInflater
-        inflater.inflate(R.menu.menu_challenge_details, menu)
-
-        if (challenge?.leaderId != userId) {
-            menu.setGroupVisible(R.id.challenge_edit_action_group, false)
-        }
-
-        return true
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        setupToolbar(toolbar)
-
-        supportActionBar?.setTitle(R.string.challenge_details)
-        detailTabs.visibility = View.GONE
-
-        val extras = intent.extras
-
-        val challengeId = extras.getString(CHALLENGE_ID)
-
-        val fullList = ArrayList<Task>()
-
-        userRepository.getUser(userId).firstElement().subscribe(Consumer { user ->
-            this@ChallengeDetailActivity.user = user
-            createTaskRecyclerFragment(fullList)
-        }, RxErrorHandler.handleEmptyError())
-
-        if (challengeId != null) {
-            challengeRepository.getChallengeTasks(challengeId)
-                    .firstElement()
-                    .subscribe(Consumer { taskList ->
-                        val resultList = ArrayList<Task>()
-
-                        val todos = ArrayList<Task>()
-                        val habits = ArrayList<Task>()
-                        val dailies = ArrayList<Task>()
-                        val rewards = ArrayList<Task>()
-
-                        for (entry in taskList.tasks.entries) {
-                            when (entry.value.type) {
-                                Task.TYPE_TODO -> todos.add(entry.value)
-                                Task.TYPE_HABIT ->
-
-                                    habits.add(entry.value)
-                                Task.TYPE_DAILY ->
-
-                                    dailies.add(entry.value)
-                                Task.TYPE_REWARD ->
-
-                                    rewards.add(entry.value)
-                            }
-                        }
-
-
-                        if (!habits.isEmpty()) {
-                            val dividerTask = Task()
-                            dividerTask.id = "divhabits"
-                            dividerTask.type = "divider"
-                            dividerTask.text = "Challenge Habits"
-
-                            resultList.add(dividerTask)
-                            resultList.addAll(habits)
-                        }
-
-
-                        if (!dailies.isEmpty()) {
-                            val dividerTask = Task()
-                            dividerTask.id = "divdailies"
-                            dividerTask.type = "divider"
-                            dividerTask.text = "Challenge Dailies"
-
-                            resultList.add(dividerTask)
-                            resultList.addAll(dailies)
-                        }
-
-
-                        if (!todos.isEmpty()) {
-                            val dividerTask = Task()
-                            dividerTask.id = "divtodos"
-                            dividerTask.type = "divider"
-                            dividerTask.text = "Challenge To-Dos"
-
-                            resultList.add(dividerTask)
-                            resultList.addAll(todos)
-                        }
-
-                        if (!rewards.isEmpty()) {
-                            val dividerTask = Task()
-                            dividerTask.id = "divrewards"
-                            dividerTask.type = "divider"
-                            dividerTask.text = "Challenge Rewards"
-
-                            resultList.add(dividerTask)
-                            resultList.addAll(rewards)
-                        }
-
-
-                        fullList.addAll(resultList)
-                    }, RxErrorHandler.handleEmptyError())
-        }
-
-        if (challengeId != null) {
-            challengeRepository.getChallenge(challengeId).subscribe(Consumer { challenge ->
-                this@ChallengeDetailActivity.challenge = challenge
-                val challengeViewHolder = ChallengeViewHolder(findViewById(R.id.challenge_header))
-                challengeViewHolder.bind(challenge)
-            }, RxErrorHandler.handleEmptyError())
-        }
-    }
-
-    private fun createTaskRecyclerFragment(fullList: List<Task>) {
-        val fragment = ChallengeTasksRecyclerViewFragment.newInstance(user, fullList)
-
-        if (supportFragmentManager.fragments == null) {
-            supportFragmentManager.beginTransaction().add(R.id.fragment_container, fragment).commitAllowingStateLoss()
-        } else {
-            val transaction = supportFragmentManager.beginTransaction()
-            transaction.setCustomAnimations(android.R.anim.fade_in, android.R.anim.fade_out, android.R.anim.fade_in, android.R.anim.fade_out)
-            transaction.replace(R.id.fragment_container, fragment).addToBackStack(null).commitAllowingStateLoss()
-        }
-    }
-
-    override fun onDestroy() {
-        challengeRepository.close()
-        userRepository.close()
-        super.onDestroy()
-    }
-
-    override fun injectActivity(component: AppComponent?) {
-        component?.inject(this)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            R.id.action_edit -> {
-                openChallengeEditActivity()
-                return true
-            }
-            R.id.action_leave -> {
-                showChallengeLeaveDialog()
-                return true
-            }
-        }
-        return super.onOptionsItemSelected(item)
-    }
-
-    private fun openChallengeEditActivity() {
-        val intent = Intent(this, CreateChallengeActivity::class.java)
-        intent.putExtra(CreateChallengeActivity.CHALLENGE_ID_KEY, challenge?.id)
-
-        startActivity(intent)
-
-    }
-
-    private fun showChallengeLeaveDialog() {
-        AlertDialog.Builder(this)
-                .setTitle(this.getString(R.string.challenge_leave_title))
-                .setMessage(this.getString(R.string.challenge_leave_text, challenge?.name ?: ""))
-                .setPositiveButton(this.getString(R.string.yes)) { dialog, _ ->
-                    dialog.dismiss()
-
-                    showRemoveTasksDialog(object: Action1<String> {
-                        override fun call(t: String) {
-                            challengeRepository.leaveChallenge(challenge, LeaveChallengeBody(t))
-                                    .subscribe(Consumer { finish() }, RxErrorHandler.handleEmptyError())
-                        }
-                    })
-                }
-                .setNegativeButton(this.getString(R.string.no)) { dialog, _ -> dialog.dismiss() }.show()
-    }
-
-    // refactor as an UseCase later - see ChallengeDetailDialogHolder
-    private fun showRemoveTasksDialog(callback: Action1<String>) {
-        AlertDialog.Builder(this)
-                .setTitle(this.getString(R.string.challenge_remove_tasks_title))
-                .setMessage(this.getString(R.string.challenge_remove_tasks_text))
-                .setPositiveButton(this.getString(R.string.remove_tasks)) { dialog, _ ->
-                    callback.call("remove-all")
-                    dialog.dismiss()
-                }
-                .setNegativeButton(this.getString(R.string.keep_tasks)) { dialog, _ ->
-                    callback.call("keep-all")
-                    dialog.dismiss()
-                }.show()
-    }
-
-    override fun onSupportNavigateUp(): Boolean {
-        finish()
-        return true
-    }
-
-    override fun onBackPressed() {
-        finish()
-    }
-
-    internal inner class ChallengeViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        private val challengeName: EmojiTextView by bindView(itemView, R.id.challenge_name)
-        private val challengeDescription: EmojiTextView by bindView(itemView, R.id.challenge_description)
-        private val memberCountTextView: TextView by bindView(itemView, R.id.challenge_member_count)
-        private val gemPrizeTextView: TextView by bindView(itemView, R.id.gem_amount)
-        private val showMoreButton: Button by bindView(itemView, R.id.btn_show_more)
-
-        private var challenge: Challenge? = null
-
-        init {
-            showMoreButton.setOnClickListener { onShowMore() }
-
-            val gemDrawable = BitmapDrawable(itemView.resources, HabiticaIconsHelper.imageOfGem())
-            gemPrizeTextView.setCompoundDrawablesWithIntrinsicBounds(gemDrawable, null, null, null)
-        }
-
-        fun bind(challenge: Challenge) {
-            this.challenge = challenge
-
-            challengeName.text = EmojiParser.parseEmojis(challenge.name)
-            challengeDescription.text = MarkdownParser.parseMarkdown(challenge.description)
-
-            memberCountTextView.text = challenge.memberCount.toString()
-
-            if (challenge.prize == 0) {
-                gemPrizeTextView.visibility = View.GONE
-            } else {
-                gemPrizeTextView.visibility = View.VISIBLE
-                gemPrizeTextView.text = challenge.prize.toString()
-            }
-        }
-
-        fun onShowMore() {
-            challenge.notNull {
-                ChallengeDetailDialogHolder.showDialog(this@ChallengeDetailActivity,
-                        this@ChallengeDetailActivity.challengeRepository,
-                        it,
-                        object: Action1<Challenge> {
-                            override fun call(t: Challenge) {
-                                onBackPressed()
-                            }
-                        })
-            }
-
-        }
-    }
-
-    @Subscribe
-    fun onEvent(event: TaskCheckedCommand) {
-        when (event.Task.type) {
-            Task.TYPE_DAILY -> {
-                dailyCheckUseCase.observable(DailyCheckUseCase.RequestValues(user, event.Task, !event.Task.completed))
-                        .subscribe(Consumer { this.onTaskDataReceived(it) }, RxErrorHandler.handleEmptyError())
-            }
-            Task.TYPE_TODO -> {
-                todoCheckUseCase.observable(TodoCheckUseCase.RequestValues(user, event.Task, !event.Task.completed))
-                        .subscribe(Consumer { this.onTaskDataReceived(it) }, RxErrorHandler.handleEmptyError())
-            }
-        }
-    }
-
-    @Subscribe
-    fun onEvent(event: ChecklistCheckedCommand) {
-        checklistCheckUseCase.observable(ChecklistCheckUseCase.RequestValues(event.task.id, event.item.id))
-                .subscribe(Consumer { EventBus.getDefault().post(TaskUpdatedEvent(event.task)) }, RxErrorHandler.handleEmptyError())
-    }
-
-    @Subscribe
-    fun onEvent(event: HabitScoreEvent) {
-        habitScoreUseCase.observable(HabitScoreUseCase.RequestValues(user, event.habit, event.Up))
-                .subscribe(Consumer { this.onTaskDataReceived(it) }, RxErrorHandler.handleEmptyError())
-    }
-
-    @Subscribe
-    fun onEvent(event: BuyRewardCommand) {
-        if ((user?.stats?.gp ?: 0.toDouble()) < event.Reward.value) {
-            HabiticaSnackbar.showSnackbar(floatingMenuWrapper, getString(R.string.no_gold), HabiticaSnackbar.SnackbarDisplayType.FAILURE)
-            return
-        }
-
-
-        if (event.Reward.specialTag == null || event.Reward.specialTag != "item") {
-
-            buyRewardUseCase.observable(BuyRewardUseCase.RequestValues(user, event.Reward))
-                    .subscribe(Consumer { HabiticaSnackbar.showSnackbar(floatingMenuWrapper, getString(R.string.notification_purchase_reward), HabiticaSnackbar.SnackbarDisplayType.NORMAL) }, RxErrorHandler.handleEmptyError())
-        }
-
-    }
-
-    private fun onTaskDataReceived(data: TaskScoringResult) {
-        if (user != null) {
-            notifyUserUseCase.observable(NotifyUserUseCase.RequestValues(this, floatingMenuWrapper,
-                    user, data.experienceDelta, data.healthDelta, data.goldDelta, data.manaDelta, data.questDamage, data.hasLeveledUp))
-        }
-
-        displayItemDropUseCase.observable(DisplayItemDropUseCase.RequestValues(data, this, floatingMenuWrapper))
-                .subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
-    }
-
-    companion object {
-
-        var CHALLENGE_ID = "CHALLENGE_ID"
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/CreateChallengeActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/CreateChallengeActivity.kt
index 018f3931c..5c0483d70 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/CreateChallengeActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/CreateChallengeActivity.kt
@@ -360,7 +360,7 @@ class CreateChallengeActivity : BaseActivity() {
     }
 
     private fun fillControlsByChallenge() {
-        challengeRepository.getChallenge(challengeId).subscribe(Consumer { challenge ->
+        /*challengeRepository.getChallenge(challengeId).subscribe(Consumer { challenge ->
 
             createChallengeTitle.setText(challenge.name)
             createChallengeDescription.setText(challenge.description)
@@ -377,13 +377,7 @@ class CreateChallengeActivity : BaseActivity() {
             }
 
             checkPrizeAndMinimumForTavern()
-
-            challengeRepository.getChallengeTasks(challengeId).doOnComplete { editMode = true }.subscribe(Consumer { tasks ->
-                for (task in tasks.tasks.values) {
-                    addOrUpdateTaskInList(task)
-                }
-            }, RxErrorHandler.handleEmptyError())
-        }, RxErrorHandler.handleEmptyError())
+        }, RxErrorHandler.handleEmptyError())*/
     }
 
     private fun openNewTaskActivity(type: String?, task: Task?) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt
index 0ac451739..58dc83cbc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt
@@ -156,6 +156,10 @@ class FullProfileActivity : BaseActivity() {
     private fun updateView(user: Member) {
         val profile = user.profile
 
+        if (profile == null) {
+            return
+        }
+
         userName = profile.name
 
         title = profile.name
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.kt
index ec3945f7f..b9e6a10a8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChallengesListViewAdapter.kt
@@ -8,14 +8,16 @@ import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
 import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.events.commands.ShowChallengeDetailActivityCommand
-import com.habitrpg.android.habitica.events.commands.ShowChallengeDetailDialogCommand
 import com.habitrpg.android.habitica.extensions.inflate
 import com.habitrpg.android.habitica.extensions.notNull
 import com.habitrpg.android.habitica.models.social.Challenge
 import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengeFilterOptions
 import com.habitrpg.android.habitica.ui.helpers.bindView
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+import com.playseeds.android.sdk.inappmessaging.Log
+import io.reactivex.BackpressureStrategy
+import io.reactivex.Flowable
+import io.reactivex.subjects.PublishSubject
 import io.realm.OrderedRealmCollection
 import io.realm.RealmRecyclerViewAdapter
 import net.pherth.android.emoji_library.EmojiParser
@@ -25,13 +27,22 @@ import org.greenrobot.eventbus.EventBus
 class ChallengesListViewAdapter(data: OrderedRealmCollection<Challenge>?, autoUpdate: Boolean, private val viewUserChallengesOnly: Boolean, private val userId: String) : RealmRecyclerViewAdapter<Challenge, ChallengesListViewAdapter.ChallengeViewHolder>(data, autoUpdate) {
     private var unfilteredData: OrderedRealmCollection<Challenge>? = null
 
+    private val openChallengeFragmentEvents = PublishSubject.create<String>()
+
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ChallengeViewHolder {
         return ChallengeViewHolder(parent.inflate(R.layout.challenge_item), viewUserChallengesOnly)
     }
 
     override fun onBindViewHolder(holder: ChallengeViewHolder, position: Int) {
-        data.notNull {
-            holder.bind(it[position])
+        data?.get(position).notNull { challenge ->
+            holder.bind(challenge)
+            holder.itemView.setOnClickListener {
+                if (challenge.isManaged) {
+                    challenge.id.notNull {
+                        openChallengeFragmentEvents.onNext(it)
+                    }
+                }
+            }
         }
     }
 
@@ -70,7 +81,11 @@ class ChallengesListViewAdapter(data: OrderedRealmCollection<Challenge>?, autoUp
         }
     }
 
-    class ChallengeViewHolder internal constructor(itemView: View, private val viewUserChallengesOnly: Boolean) : RecyclerView.ViewHolder(itemView), View.OnClickListener {
+    fun getOpenDetailFragmentFlowable(): Flowable<String> {
+        return openChallengeFragmentEvents.toFlowable(BackpressureStrategy.DROP)
+    }
+
+    class ChallengeViewHolder internal constructor(itemView: View, private val viewUserChallengesOnly: Boolean) : RecyclerView.ViewHolder(itemView) {
 
         private val challengeName: EmojiTextView by bindView(R.id.challenge_name)
         private val challengeDescription: TextView by bindView(R.id.challenge_group_name)
@@ -87,8 +102,6 @@ class ChallengesListViewAdapter(data: OrderedRealmCollection<Challenge>?, autoUp
         private var challenge: Challenge? = null
 
         init {
-            itemView.setOnClickListener(this)
-
             gemIconView.setImageBitmap(HabiticaIconsHelper.imageOfGem())
 
             if (!viewUserChallengesOnly) {
@@ -99,7 +112,8 @@ class ChallengesListViewAdapter(data: OrderedRealmCollection<Challenge>?, autoUp
         fun bind(challenge: Challenge) {
             this.challenge = challenge
 
-            challengeName.text = EmojiParser.parseEmojis(challenge.name.trim { it <= ' ' })
+            Log.e(challenge.id + challenge.name)
+            challengeName.text = EmojiParser.parseEmojis(challenge.name?.trim { it <= ' ' })
             challengeDescription.text = challenge.groupName
 
             officialChallengeLayout.visibility = if (challenge.official) View.VISIBLE else View.GONE
@@ -109,7 +123,7 @@ class ChallengesListViewAdapter(data: OrderedRealmCollection<Challenge>?, autoUp
                 challengeParticipatingTextView.visibility = View.GONE
                 arrowImage.visibility = View.VISIBLE
             } else {
-                challengeParticipatingTextView.visibility = if (challenge.isParticipating) View.VISIBLE else View.GONE
+                //challengeParticipatingTextView.visibility = if (challenge.isParticipating) View.VISIBLE else View.GONE
 
                 leaderName.text = itemView.context.getString(R.string.byLeader, challenge.leaderName)
                 participantCount.text = challenge.memberCount.toString()
@@ -119,15 +133,5 @@ class ChallengesListViewAdapter(data: OrderedRealmCollection<Challenge>?, autoUp
 
             gemPrizeTextView.text = challenge.prize.toString()
         }
-
-        override fun onClick(view: View) {
-            if (challenge != null && challenge!!.isManaged && challenge!!.isManaged) {
-                if (viewUserChallengesOnly) {
-                    EventBus.getDefault().post(ShowChallengeDetailActivityCommand(challenge!!.id))
-                } else {
-                    EventBus.getDefault().post(ShowChallengeDetailDialogCommand(challenge!!.id))
-                }
-            }
-        }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.kt
index 93b5a64ea..9948d5f5b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.kt
@@ -79,7 +79,7 @@ class PartyMemberRecyclerViewAdapter(data: OrderedRealmCollection<Member>?, auto
                 else -> R.color.task_gray
             }
             ViewHelper.SetBackgroundTint(classBackground, ContextCompat.getColor(itemView.context, colorResourceID))
-            userName.text = user.profile.name
+            userName.text = user.profile?.name
 
             itemView.isClickable = true
             itemView.setOnClickListener { userClickedEvents.onNext(user.id) }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt
index 6c7741753..8cc3863bb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt
@@ -82,9 +82,12 @@ class StatsFragment: BaseMainFragment() {
 
         leftSparklesView.setImageBitmap(HabiticaIconsHelper.imageOfAttributeSparklesLeft())
         rightSparklesView.setImageBitmap(HabiticaIconsHelper.imageOfAttributeSparklesRight())
-        distributeEvenlyHelpButton.setImageBitmap(HabiticaIconsHelper.imageOfInfoIcon())
-        distributeClassHelpButton.setImageBitmap(HabiticaIconsHelper.imageOfInfoIcon())
-        distributeTaskHelpButton.setImageBitmap(HabiticaIconsHelper.imageOfInfoIcon())
+        context.notNull {
+            val color = ContextCompat.getColor(it, R.color.brand_200)
+            distributeEvenlyHelpButton.setImageBitmap(HabiticaIconsHelper.imageOfInfoIcon(color))
+            distributeClassHelpButton.setImageBitmap(HabiticaIconsHelper.imageOfInfoIcon(color))
+            distributeTaskHelpButton.setImageBitmap(HabiticaIconsHelper.imageOfInfoIcon(color))
+        }
 
         compositeSubscription.add(userRepository.getUser(userId).subscribe(Consumer {
             user = it
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailDialogHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailDialogHolder.kt
deleted file mode 100644
index 5839f2dc3..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailDialogHolder.kt
+++ /dev/null
@@ -1,307 +0,0 @@
-package com.habitrpg.android.habitica.ui.fragments.social.challenges
-
-import android.app.Activity
-import android.app.AlertDialog
-import android.content.Intent
-import android.os.Bundle
-import android.view.View
-import android.widget.Button
-import android.widget.ImageView
-import android.widget.LinearLayout
-import android.widget.TextView
-import com.habitrpg.android.habitica.R
-import com.habitrpg.android.habitica.data.ChallengeRepository
-import com.habitrpg.android.habitica.extensions.notNull
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
-import com.habitrpg.android.habitica.models.LeaveChallengeBody
-import com.habitrpg.android.habitica.models.social.Challenge
-import com.habitrpg.android.habitica.models.tasks.Task
-import com.habitrpg.android.habitica.ui.activities.ChallengeDetailActivity
-import com.habitrpg.android.habitica.ui.activities.FullProfileActivity
-import com.habitrpg.android.habitica.ui.helpers.MarkdownParser
-import com.habitrpg.android.habitica.ui.helpers.bindView
-import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
-import com.habitrpg.android.habitica.utils.Action1
-import io.reactivex.functions.Consumer
-import net.pherth.android.emoji_library.EmojiParser
-import net.pherth.android.emoji_library.EmojiTextView
-import java.util.*
-
-class ChallengeDetailDialogHolder private constructor(view: View, private val context: Activity) {
-
-    private val notJoinedHeader: LinearLayout? by bindView(view, R.id.challenge_not_joined_header)
-    private val joinedHeader: LinearLayout? by bindView(view, R.id.challenge_joined_header)
-    private val joinButton: Button? by bindView(view, R.id.challenge_join_btn)
-    private val leaveButton: Button? by bindView(view, R.id.challenge_leave_btn)
-    private val challengeName: EmojiTextView? by bindView(view, R.id.challenge_name)
-    private val challengeDescription: EmojiTextView? by bindView(view, R.id.challenge_description)
-    private val challengeLeader: TextView? by bindView(view, R.id.challenge_leader)
-    private val gemAmountView: TextView? by bindView(view, R.id.gem_amount)
-    private val memberCountView: TextView? by bindView(view, R.id.challenge_member_count)
-    private val taskGrouplayout: LinearLayout? by bindView(view, R.id.task_group_layout)
-    private val openChallengeButton: Button? by bindView(view, R.id.challenge_go_to_btn)
-
-    private var dialog: AlertDialog? = null
-    lateinit var challengeRepository: ChallengeRepository
-    private var challenge: Challenge? = null
-    private var challengeLeftAction: Action1<Challenge>? = null
-
-    init {
-        joinButton?.setOnClickListener { joinChallenge() }
-        leaveButton?.setOnClickListener { leaveChallenge() }
-        challengeLeader?.setOnClickListener { openLeaderProfile() }
-        openChallengeButton?.setOnClickListener { openChallengeActivity() }
-    }
-
-    fun bind(dialog: AlertDialog, challengeRepository: ChallengeRepository, challenge: Challenge,
-             challengeLeftAction: Action1<Challenge>) {
-        this.dialog = dialog
-        this.challengeRepository = challengeRepository
-        this.challenge = challenge
-        this.challengeLeftAction = challengeLeftAction
-
-        changeViewsByChallenge(challenge)
-    }
-
-    private fun changeViewsByChallenge(challenge: Challenge) {
-        setJoined(challenge.isParticipating)
-
-        challengeName?.text = EmojiParser.parseEmojis(challenge.name)
-        challengeDescription?.text = MarkdownParser.parseMarkdown(challenge.description)
-        challengeLeader?.text = challenge.leaderName
-
-        gemAmountView?.text = challenge.prize.toString()
-        memberCountView?.text = challenge.memberCount.toString()
-
-        challengeRepository.getChallengeTasks(challenge.id)
-                .subscribe(Consumer { taskList ->
-                    val todos = ArrayList<Task>()
-                    val habits = ArrayList<Task>()
-                    val dailies = ArrayList<Task>()
-                    val rewards = ArrayList<Task>()
-
-                    for (entry in taskList.tasks.entries) {
-                        when (entry.value.type) {
-                            Task.TYPE_TODO -> todos.add(entry.value)
-                            Task.TYPE_HABIT ->
-
-                                habits.add(entry.value)
-                            Task.TYPE_DAILY ->
-
-                                dailies.add(entry.value)
-                            Task.TYPE_REWARD ->
-
-                                rewards.add(entry.value)
-                        }
-                    }
-
-                    if (habits.size > 0) {
-                        addHabits(habits)
-                    }
-
-                    if (dailies.size > 0) {
-                        addDailys(dailies)
-                    }
-
-                    if (todos.size > 0) {
-                        addTodos(todos)
-                    }
-
-                    if (rewards.size > 0) {
-                        addRewards(rewards)
-                    }
-                }, RxErrorHandler.handleEmptyError())
-    }
-
-    private fun addHabits(habits: ArrayList<Task>) {
-        val taskGroup = context.layoutInflater.inflate(R.layout.dialog_challenge_detail_task_group, taskGrouplayout, false) as LinearLayout
-        val groupName = taskGroup.findViewById<View>(R.id.task_group_name) as TextView
-
-        val tasksLayout = taskGroup.findViewById<View>(R.id.tasks_layout) as LinearLayout
-
-        groupName.text = habits.size.toString() + " " + getLabelByTypeAndCount(Challenge.TASK_ORDER_HABITS, habits.size)
-
-        val size = habits.size
-        for (i in 0 until size) {
-            val task = habits[i]
-
-            val entry = context.layoutInflater.inflate(R.layout.dialog_challenge_detail_habit, tasksLayout, false)
-            val habitTitle = entry.findViewById<View>(R.id.habit_title) as TextView
-            val plusImg = entry.findViewById<View>(if (task.up == true) R.id.plus_img_tinted else R.id.plus_img) as ImageView
-            val minusImg = entry.findViewById<View>(if (task.down == true) R.id.minus_img_tinted else R.id.minus_img) as ImageView
-
-            plusImg.visibility = View.VISIBLE
-            minusImg.visibility = View.VISIBLE
-
-            habitTitle.text = EmojiParser.parseEmojis(task.text)
-            tasksLayout.addView(entry)
-        }
-        taskGrouplayout?.addView(taskGroup)
-    }
-
-    private fun addDailys(dailies: ArrayList<Task>) {
-        val taskGroup = context.layoutInflater.inflate(R.layout.dialog_challenge_detail_task_group, taskGrouplayout, false) as LinearLayout
-        val groupName = taskGroup.findViewById<View>(R.id.task_group_name) as TextView
-
-        val tasksLayout = taskGroup.findViewById<View>(R.id.tasks_layout) as LinearLayout
-
-        val size = dailies.size
-        groupName.text = dailies.size.toString() + " " + getLabelByTypeAndCount(Challenge.TASK_ORDER_DAILYS, size)
-
-        for (i in 0 until size) {
-            val task = dailies[i]
-
-            val entry = context.layoutInflater.inflate(R.layout.dialog_challenge_detail_daily, tasksLayout, false)
-            val title = entry.findViewById<View>(R.id.daily_title) as TextView
-            title.text = EmojiParser.parseEmojis(task.text)
-
-            if (task.checklist != null && task.checklist?.isEmpty() == false) {
-                val checklistIndicatorWrapper = entry.findViewById<View>(R.id.checklistIndicatorWrapper)
-
-                checklistIndicatorWrapper.visibility = View.VISIBLE
-
-                val checkListAllTextView = entry.findViewById<View>(R.id.checkListAllTextView) as TextView
-                checkListAllTextView.text = task.checklist?.size.toString()
-            }
-            tasksLayout.addView(entry)
-        }
-        taskGrouplayout?.addView(taskGroup)
-    }
-
-    private fun addTodos(todos: ArrayList<Task>) {
-        val taskGroup = context.layoutInflater.inflate(R.layout.dialog_challenge_detail_task_group, taskGrouplayout, false) as LinearLayout
-        val groupName = taskGroup.findViewById<View>(R.id.task_group_name) as TextView
-
-        val tasksLayout = taskGroup.findViewById<View>(R.id.tasks_layout) as LinearLayout
-
-        val size = todos.size
-        groupName.text = todos.size.toString() + " " + getLabelByTypeAndCount(Challenge.TASK_ORDER_TODOS, size)
-
-        for (i in 0 until size) {
-            val task = todos[i]
-
-            val entry = context.layoutInflater.inflate(R.layout.dialog_challenge_detail_todo, tasksLayout, false)
-            val title = entry.findViewById<View>(R.id.todo_title) as TextView
-            title.text = EmojiParser.parseEmojis(task.text)
-
-            if (task.checklist != null && task.checklist?.isEmpty() == false) {
-                val checklistIndicatorWrapper = entry.findViewById<View>(R.id.checklistIndicatorWrapper)
-
-                checklistIndicatorWrapper.visibility = View.VISIBLE
-
-                val checkListAllTextView = entry.findViewById<View>(R.id.checkListAllTextView) as TextView
-                checkListAllTextView.text = task.checklist?.size.toString()
-            }
-            tasksLayout.addView(entry)
-        }
-        taskGrouplayout?.addView(taskGroup)
-    }
-
-    private fun addRewards(rewards: ArrayList<Task>) {
-        val taskGroup = context.layoutInflater.inflate(R.layout.dialog_challenge_detail_task_group, taskGrouplayout, false) as LinearLayout
-        val groupName = taskGroup.findViewById<View>(R.id.task_group_name) as TextView
-
-        val tasksLayout = taskGroup.findViewById<View>(R.id.tasks_layout) as LinearLayout
-
-        val size = rewards.size
-        groupName.text = rewards.size.toString() + " " + getLabelByTypeAndCount(Challenge.TASK_ORDER_REWARDS, size)
-
-        for (i in 0 until size) {
-            val task = rewards[i]
-
-            val entry = context.layoutInflater.inflate(R.layout.dialog_challenge_detail_reward, tasksLayout, false)
-            (entry.findViewById<View>(R.id.gold_icon) as ImageView).setImageBitmap(HabiticaIconsHelper.imageOfGold())
-            val title = entry.findViewById<View>(R.id.reward_title) as TextView
-            title.text = EmojiParser.parseEmojis(task.text)
-            tasksLayout.addView(entry)
-        }
-        taskGrouplayout?.addView(taskGroup)
-    }
-
-    private fun getLabelByTypeAndCount(type: String, count: Int): String {
-        return when (type) {
-            Challenge.TASK_ORDER_DAILYS -> context.getString(if (count == 1) R.string.daily else R.string.dailies)
-            Challenge.TASK_ORDER_HABITS -> context.getString(if (count == 1) R.string.habit else R.string.habits)
-            Challenge.TASK_ORDER_REWARDS -> context.getString(if (count == 1) R.string.reward else R.string.rewards)
-            else -> context.getString(if (count == 1) R.string.todo else R.string.todos)
-        }
-    }
-
-    private fun setJoined(joined: Boolean) {
-        joinedHeader?.visibility = if (joined) View.VISIBLE else View.GONE
-        leaveButton?.visibility = if (joined) View.VISIBLE else View.GONE
-
-        notJoinedHeader?.visibility = if (joined) View.GONE else View.VISIBLE
-        joinButton?.visibility = if (joined) View.GONE else View.VISIBLE
-    }
-
-    private fun openLeaderProfile() {
-        FullProfileActivity.open(context, challenge?.leaderId ?: "")
-    }
-
-    private fun openChallengeActivity() {
-        val bundle = Bundle()
-        bundle.putString(ChallengeDetailActivity.CHALLENGE_ID, challenge?.id)
-
-        val intent = Intent(context, ChallengeDetailActivity::class.java)
-        intent.putExtras(bundle)
-        context.startActivity(intent)
-        this.dialog?.dismiss()
-    }
-
-    private fun joinChallenge() {
-        this.challengeRepository.joinChallenge(challenge).subscribe(Consumer<Challenge> { this.changeViewsByChallenge(it) }, RxErrorHandler.handleEmptyError())
-    }
-
-    private fun leaveChallenge() {
-        AlertDialog.Builder(context)
-                .setTitle(context.getString(R.string.challenge_leave_title))
-                .setMessage(context.getString(R.string.challenge_leave_text, challenge?.name))
-                .setPositiveButton(context.getString(R.string.yes)) { dialog, _ ->
-                    showRemoveTasksDialog(object : Action1<String> {
-                        override fun call(t: String) {
-                            challengeRepository.leaveChallenge(challenge, LeaveChallengeBody(t))
-                                    .subscribe(Consumer {
-                                        challenge.notNull {
-                                            challengeLeftAction?.call(it)
-                                        }
-                                        dialog.dismiss()
-                                    }, RxErrorHandler.handleEmptyError())
-                        }
-                    })
-                }
-                .setNegativeButton(context.getString(R.string.no)) { dialog, _ -> dialog.dismiss() }.show()
-    }
-
-    // refactor as an UseCase later - see ChallengeDetailActivity
-    private fun showRemoveTasksDialog(callback: Action1<String>) {
-        AlertDialog.Builder(context)
-                .setTitle(context.getString(R.string.challenge_remove_tasks_title))
-                .setMessage(context.getString(R.string.challenge_remove_tasks_text))
-                .setPositiveButton(context.getString(R.string.remove_tasks)) { dialog, _ ->
-                    callback.call("remove-all")
-                    dialog.dismiss()
-                }
-                .setNegativeButton(context.getString(R.string.keep_tasks)) { dialog, _ ->
-                    callback.call("keep-all")
-                    dialog.dismiss()
-                }.show()
-    }
-
-    companion object {
-
-        fun showDialog(activity: Activity?, challengeRepository: ChallengeRepository, challenge: Challenge, challengeLeftAction: Action1<Challenge>) {
-            if (activity == null) {
-                return
-            }
-            val dialogLayout = activity.layoutInflater.inflate(R.layout.dialog_challenge_detail, null)
-
-            val challengeDetailDialogHolder = ChallengeDetailDialogHolder(dialogLayout, activity)
-
-            val builder = AlertDialog.Builder(activity)
-                    .setView(dialogLayout)
-
-            challengeDetailDialogHolder.bind(builder.show(), challengeRepository, challenge, challengeLeftAction)
-        }
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailFragment.kt
new file mode 100644
index 000000000..5abff4c0c
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailFragment.kt
@@ -0,0 +1,299 @@
+package com.habitrpg.android.habitica.ui.fragments.social.challenges
+
+import android.graphics.Color
+import android.os.Bundle
+import android.support.v4.content.ContextCompat
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
+import com.habitrpg.android.habitica.R
+import com.habitrpg.android.habitica.components.AppComponent
+import com.habitrpg.android.habitica.data.ChallengeRepository
+import com.habitrpg.android.habitica.extensions.inflate
+import com.habitrpg.android.habitica.extensions.notNull
+import com.habitrpg.android.habitica.helpers.RxErrorHandler
+import com.habitrpg.android.habitica.models.social.Challenge
+import com.habitrpg.android.habitica.models.tasks.Task
+import com.habitrpg.android.habitica.ui.AvatarView
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
+import com.habitrpg.android.habitica.ui.helpers.MarkdownParser
+import com.habitrpg.android.habitica.ui.helpers.bindView
+import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
+import com.habitrpg.android.habitica.ui.views.social.UsernameLabel
+import io.reactivex.functions.Action
+import io.reactivex.functions.Consumer
+import net.pherth.android.emoji_library.EmojiParser
+import net.pherth.android.emoji_library.EmojiTextView
+import java.util.*
+import javax.inject.Inject
+import android.graphics.PorterDuff
+import android.graphics.PorterDuffColorFilter
+import com.habitrpg.android.habitica.data.SocialRepository
+import com.habitrpg.android.habitica.models.members.Member
+
+
+class ChallengeDetailFragment: BaseMainFragment() {
+
+    @Inject
+    lateinit var challengeRepository: ChallengeRepository
+    @Inject
+    lateinit var socialRepository: SocialRepository
+
+    private val joinButtonWrapper: ViewGroup? by bindView(R.id.join_button_wrapper)
+    private val joinButton: Button? by bindView(R.id.join_button)
+    private val leaveButonWrapper: ViewGroup? by bindView(R.id.leave_button_wrapper)
+    private val leaveButton: Button? by bindView(R.id.leave_button)
+    private val challengeName: EmojiTextView? by bindView(R.id.challenge_name)
+    private val challengeDescription: EmojiTextView? by bindView(R.id.challenge_description)
+    private val challengeLeaderAvatarView: AvatarView? by bindView(R.id.creator_avatarview)
+    private val challengeLeaderLabel: UsernameLabel? by bindView(R.id.creator_label)
+    private val gemAmountView: TextView? by bindView(R.id.gem_amount)
+    private val gemAmountIconView: ImageView? by bindView(R.id.gem_amount_icon)
+    private val memberCountView: TextView? by bindView(R.id.participant_count)
+    private val memberCountIconView: ImageView? by bindView(R.id.participant_count_icon)
+    private val taskGrouplayout: LinearLayout? by bindView(R.id.task_group_layout)
+
+    var challengeID: String? = null
+
+    override fun injectFragment(component: AppComponent) {
+        component.inject(this)
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        super.onCreateView(inflater, container, savedInstanceState)
+        return container?.inflate(R.layout.fragment_challenge_detail)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        gemAmountIconView?.setImageBitmap(HabiticaIconsHelper.imageOfGem_36())
+        memberCountIconView?.setImageBitmap(HabiticaIconsHelper.imageOfParticipantIcon())
+
+        challengeID.notNull {
+            compositeSubscription.add(challengeRepository.getChallenge(it)
+                    .doOnNext {
+                        set(it)
+                    }
+                    .map {
+                        return@map (it.leaderId ?: "")
+                    }
+                    .flatMap { creatorID ->
+                        return@flatMap socialRepository.getMember(creatorID)
+                    }
+                    .subscribe(Consumer { set(it)}, RxErrorHandler.handleEmptyError()))
+            compositeSubscription.add(challengeRepository.getChallengeTasks(it).subscribe(Consumer { taskList ->
+                taskGrouplayout?.removeAllViewsInLayout()
+
+                val todos = ArrayList<Task>()
+                val habits = ArrayList<Task>()
+                val dailies = ArrayList<Task>()
+                val rewards = ArrayList<Task>()
+
+                for (entry in taskList) {
+                    when (entry.type) {
+                        Task.TYPE_TODO -> todos.add(entry)
+                        Task.TYPE_HABIT -> habits.add(entry)
+                        Task.TYPE_DAILY -> dailies.add(entry)
+                        Task.TYPE_REWARD -> rewards.add(entry)
+                    }
+                }
+
+                if (habits.size > 0) {
+                    addHabits(habits)
+                }
+
+                if (dailies.size > 0) {
+                    addDailys(dailies)
+                }
+
+                if (todos.size > 0) {
+                    addTodos(todos)
+                }
+
+                if (rewards.size > 0) {
+                    addRewards(rewards)
+                }
+            }, RxErrorHandler.handleEmptyError()))
+
+            compositeSubscription.add(challengeRepository.isChallengeMember(it).subscribe(Consumer { isMember ->
+                setJoined(isMember)
+            }, RxErrorHandler.handleEmptyError()))
+        }
+
+        refresh()
+    }
+
+    private fun refresh() {
+        challengeID.notNull {id ->
+            challengeRepository.retrieveChallenge(id)
+                    .flatMap { challengeRepository.retrieveChallengeTasks(id) }
+                    .subscribe(Consumer {  }, RxErrorHandler.handleEmptyError(), Action {  })
+        }
+    }
+
+    private fun set(challenge: Challenge) {
+        challengeName?.text = EmojiParser.parseEmojis(challenge.name)
+        challengeDescription?.text = MarkdownParser.parseMarkdown(challenge.description)
+        challengeLeaderLabel?.username = challenge.leaderName
+
+        gemAmountView?.text = challenge.prize.toString()
+        memberCountView?.text = challenge.memberCount.toString()
+    }
+
+    private fun set(creator: Member) {
+        challengeLeaderAvatarView?.setAvatar(creator)
+        challengeLeaderLabel?.tier = creator.contributor?.level ?: 0
+        challengeLeaderLabel?.username = creator.displayName
+    }
+
+    private fun setJoined(joined: Boolean) {
+        joinButton?.visibility = if (!joined) View.VISIBLE else View.GONE
+        joinButtonWrapper?.visibility = if (!joined) View.VISIBLE else View.GONE
+        leaveButton?.visibility = if (joined) View.VISIBLE else View.GONE
+        leaveButonWrapper?.visibility = if (joined) View.VISIBLE else View.GONE
+    }
+
+    private fun addHabits(habits: ArrayList<Task>) {
+        val taskGroup = taskGrouplayout?.inflate(R.layout.dialog_challenge_detail_task_group)
+        val groupName = taskGroup?.findViewById(R.id.task_group_name) as TextView?
+        val tasksLayout = taskGroup?.findViewById(R.id.tasks_layout) as LinearLayout?
+
+        groupName?.text = getLabelByTypeAndCount(Challenge.TASK_ORDER_HABITS, habits.size)
+        taskGroup?.findViewById<TextView>(R.id.task_count_view)?.text = habits.size.toString()
+
+        val size = habits.size
+        for (i in 0 until size) {
+            val task = habits[i]
+            val entry = tasksLayout?.inflate(R.layout.dialog_challenge_detail_habit)
+            val habitTitle = entry?.findViewById(R.id.habit_title) as TextView?
+
+            entry?.findViewById<ImageView>(R.id.lock_icon_plus)?.setImageBitmap(HabiticaIconsHelper.imageOfLocked(Color.parseColor("#DFDEDF")))
+            entry?.findViewById<ImageView>(R.id.lock_icon_minus)?.setImageBitmap(HabiticaIconsHelper.imageOfLocked(Color.parseColor("#DFDEDF")))
+            context.notNull {
+                if (task.up == true) {
+                    entry?.findViewById<ImageView>(R.id.lock_icon_plus)?.setImageBitmap(HabiticaIconsHelper.imageOfLocked(Color.parseColor("#B3FFFFFF")))
+                    entry?.findViewById<View>(R.id.lock_icon_background_plus)?.setBackgroundColor(ContextCompat.getColor(it, task.mediumTaskColor))
+                    val drawable = ContextCompat.getDrawable(it, R.drawable.circle_white)
+                    drawable?.colorFilter = PorterDuffColorFilter(ContextCompat.getColor(it, task.darkTaskColor), PorterDuff.Mode.MULTIPLY)
+                    entry?.findViewById<View>(R.id.lock_icon_plus)?.setBackgroundDrawable(drawable)
+                }
+                if (task.down == true) {
+                    entry?.findViewById<ImageView>(R.id.lock_icon_minus)?.setImageBitmap(HabiticaIconsHelper.imageOfLocked(Color.parseColor("#B3FFFFFF")))
+                    entry?.findViewById<View>(R.id.lock_icon_background_minus)?.setBackgroundColor(ContextCompat.getColor(it, task.mediumTaskColor))
+                    val drawable = ContextCompat.getDrawable(it, R.drawable.circle_white)
+                    drawable?.colorFilter = PorterDuffColorFilter(ContextCompat.getColor(it, task.darkTaskColor), PorterDuff.Mode.MULTIPLY)
+                    entry?.findViewById<View>(R.id.lock_icon_plus)?.setBackgroundDrawable(drawable)
+                }
+            }
+
+            habitTitle?.text = EmojiParser.parseEmojis(task.text)
+            tasksLayout?.addView(entry)
+        }
+        taskGrouplayout?.addView(taskGroup)
+    }
+
+    private fun addDailys(dailies: ArrayList<Task>) {
+        val taskGroup = taskGrouplayout?.inflate(R.layout.dialog_challenge_detail_task_group)
+        val groupName = taskGroup?.findViewById(R.id.task_group_name) as TextView?
+        val tasksLayout = taskGroup?.findViewById(R.id.tasks_layout) as LinearLayout?
+
+        val size = dailies.size
+        groupName?.text = getLabelByTypeAndCount(Challenge.TASK_ORDER_DAILYS, size)
+        taskGroup?.findViewById<TextView>(R.id.task_count_view)?.text = dailies.size.toString()
+
+        for (i in 0 until size) {
+            val task = dailies[i]
+            val entry = tasksLayout?.inflate(R.layout.dialog_challenge_detail_daily)
+            val title = entry?.findViewById(R.id.daily_title) as TextView?
+            title?.text = EmojiParser.parseEmojis(task.text)
+            entry?.findViewById<ImageView>(R.id.lock_icon)?.setImageBitmap(HabiticaIconsHelper.imageOfLocked(Color.parseColor("#949494")))
+            context.notNull {
+                entry?.findViewById<View>(R.id.lock_icon_background)?.setBackgroundColor(ContextCompat.getColor(it, task.mediumTaskColor))
+                val drawable = ContextCompat.getDrawable(it, R.drawable.circle_white)
+                drawable?.colorFilter = PorterDuffColorFilter(ContextCompat.getColor(it, task.extraLightTaskColor), PorterDuff.Mode.MULTIPLY)
+                entry?.findViewById<View>(R.id.lock_icon)?.setBackgroundDrawable(drawable)
+            }
+            if (task.checklist != null && task.checklist?.isEmpty() == false) {
+                val checklistIndicatorWrapper = entry?.findViewById<View>(R.id.checklistIndicatorWrapper)
+
+                checklistIndicatorWrapper?.visibility = View.VISIBLE
+
+                val checkListAllTextView = entry?.findViewById<View>(R.id.checkListAllTextView) as TextView?
+                checkListAllTextView?.text = task.checklist?.size.toString()
+            }
+            tasksLayout?.addView(entry)
+        }
+        taskGrouplayout?.addView(taskGroup)
+    }
+
+    private fun addTodos(todos: ArrayList<Task>) {
+        val taskGroup = taskGrouplayout?.inflate(R.layout.dialog_challenge_detail_task_group)
+        val groupName = taskGroup?.findViewById(R.id.task_group_name) as TextView?
+        val tasksLayout = taskGroup?.findViewById(R.id.tasks_layout) as LinearLayout?
+
+        val size = todos.size
+        groupName?.text = getLabelByTypeAndCount(Challenge.TASK_ORDER_TODOS, size)
+        taskGroup?.findViewById<TextView>(R.id.task_count_view)?.text = todos.size.toString()
+
+        for (i in 0 until size) {
+            val task = todos[i]
+            val entry = tasksLayout?.inflate(R.layout.dialog_challenge_detail_todo)
+            val title = entry?.findViewById(R.id.todo_title) as TextView?
+            title?.text = EmojiParser.parseEmojis(task.text)
+            entry?.findViewById<ImageView>(R.id.lock_icon)?.setImageBitmap(HabiticaIconsHelper.imageOfLocked(Color.parseColor("#949494")))
+            context.notNull {
+                entry?.findViewById<View>(R.id.lock_icon_background)?.setBackgroundColor(ContextCompat.getColor(it, task.mediumTaskColor))
+                val drawable = ContextCompat.getDrawable(it, R.drawable.circle_white)
+                drawable?.colorFilter = PorterDuffColorFilter(ContextCompat.getColor(it, task.extraLightTaskColor), PorterDuff.Mode.MULTIPLY)
+                entry?.findViewById<View>(R.id.lock_icon)?.setBackgroundDrawable(drawable)
+            }
+
+            if (task.checklist != null && task.checklist?.isEmpty() == false) {
+                val checklistIndicatorWrapper = entry?.findViewById<View>(R.id.checklistIndicatorWrapper)
+
+                checklistIndicatorWrapper?.visibility = View.VISIBLE
+
+                val checkListAllTextView = entry?.findViewById<View>(R.id.checkListAllTextView) as TextView?
+                checkListAllTextView?.text = task.checklist?.size.toString()
+            }
+            tasksLayout?.addView(entry)
+        }
+        taskGrouplayout?.addView(taskGroup)
+    }
+
+    private fun addRewards(rewards: ArrayList<Task>) {
+        val taskGroup = taskGrouplayout?.inflate(R.layout.dialog_challenge_detail_task_group)
+        val groupName = taskGroup?.findViewById(R.id.task_group_name) as TextView?
+
+        val tasksLayout = taskGroup?.findViewById(R.id.tasks_layout) as LinearLayout?
+
+        val size = rewards.size
+        groupName?.text =  getLabelByTypeAndCount(Challenge.TASK_ORDER_REWARDS, size)
+        taskGroup?.findViewById<TextView>(R.id.task_count_view)?.text = rewards.size.toString()
+
+        for (i in 0 until size) {
+            val task = rewards[i]
+
+            val entry = tasksLayout?.inflate(R.layout.dialog_challenge_detail_reward)
+            (entry?.findViewById<View>(R.id.gold_icon) as ImageView?)?.setImageBitmap(HabiticaIconsHelper.imageOfGold())
+            val title = entry?.findViewById<View>(R.id.reward_title) as TextView?
+            title?.text = EmojiParser.parseEmojis(task.text)
+            tasksLayout?.addView(entry)
+        }
+        taskGrouplayout?.addView(taskGroup)
+    }
+
+    private fun getLabelByTypeAndCount(type: String, count: Int): String {
+        return when (type) {
+            Challenge.TASK_ORDER_DAILYS -> context?.getString(if (count == 1) R.string.daily else R.string.dailies)
+            Challenge.TASK_ORDER_HABITS -> context?.getString(if (count == 1) R.string.habit else R.string.habits)
+            Challenge.TASK_ORDER_REWARDS -> context?.getString(if (count == 1) R.string.reward else R.string.rewards)
+            else -> context?.getString(if (count == 1) R.string.todo else R.string.todos)
+        } ?: ""
+    }
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeFilterDialogHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeFilterDialogHolder.kt
index 41cdec231..a4233b791 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeFilterDialogHolder.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeFilterDialogHolder.kt
@@ -71,10 +71,10 @@ internal class ChallengeFilterDialogHolder private constructor(view: View, priva
                     continue
                 }
                 val group = Group()
-                group.id = challenge.groupId
+                group.id = challenge.groupId ?: ""
                 group.name = challenge.groupName
 
-                groupMap[challenge.groupName] = group
+                groupMap[challenge.groupName ?: ""] = group
             }
         }
 
@@ -92,11 +92,11 @@ internal class ChallengeFilterDialogHolder private constructor(view: View, priva
     }
 
 
-    fun allClicked() {
+    private fun allClicked() {
         this.adapter?.selectAll()
     }
 
-    fun noneClicked() {
+    private fun noneClicked() {
         this.adapter?.deSelectAll()
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt
index 405958762..7e7084617 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.kt
@@ -12,6 +12,7 @@ import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.AppComponent
 import com.habitrpg.android.habitica.data.ChallengeRepository
 import com.habitrpg.android.habitica.extensions.inflate
+import com.habitrpg.android.habitica.extensions.notNull
 import com.habitrpg.android.habitica.helpers.RxErrorHandler
 import com.habitrpg.android.habitica.models.social.Challenge
 import com.habitrpg.android.habitica.modules.AppModule
@@ -69,6 +70,8 @@ class ChallengeListFragment : BaseMainFragment(), SwipeRefreshLayout.OnRefreshLi
         resetViews()
 
         challengeAdapter = ChallengesListViewAdapter(null, true, viewUserChallengesOnly, userId)
+        challengeAdapter?.getOpenDetailFragmentFlowable()?.subscribe(Consumer { openDetailFragment(it) }, RxErrorHandler.handleEmptyError())
+                .notNull { compositeSubscription.add(it) }
 
         swipeRefreshLayout?.setOnRefreshListener(this)
 
@@ -81,9 +84,16 @@ class ChallengeListFragment : BaseMainFragment(), SwipeRefreshLayout.OnRefreshLi
         recyclerView?.setEmptyView(emptyView)
         recyclerView?.itemAnimator = SafeDefaultItemAnimator()
 
+        challengeAdapter?.updateUnfilteredData(challenges)
         loadLocalChallenges()
     }
 
+    private fun openDetailFragment(challengeID: String) {
+        val detailFragment = ChallengeDetailFragment()
+        detailFragment.challengeID = challengeID
+        this.activity?.displayFragment(detailFragment)
+    }
+
     override fun injectFragment(component: AppComponent) {
         component.inject(this)
     }
@@ -93,32 +103,32 @@ class ChallengeListFragment : BaseMainFragment(), SwipeRefreshLayout.OnRefreshLi
     }
 
     private fun setRefreshing(state: Boolean) {
-        if (swipeRefreshLayout != null && swipeRefreshLayout!!.visibility == View.VISIBLE) {
-            swipeRefreshLayout!!.isRefreshing = state
-        }
+        swipeRefreshLayout?.isRefreshing = state
     }
 
     private fun loadLocalChallenges() {
         val observable: Flowable<RealmResults<Challenge>> = if (viewUserChallengesOnly && user != null) {
-            challengeRepository.getUserChallenges(user?.id)
+            challengeRepository.getUserChallenges(user?.id ?: "")
         } else {
-            challengeRepository.challenges
+            challengeRepository.getChallenges()
         }
 
-        observable.firstElement().subscribe(Consumer { challenges ->
+        compositeSubscription.add(observable.firstElement().subscribe(Consumer { challenges ->
             if (challenges.size == 0) {
                 fetchOnlineChallenges()
             }
             this.challenges = challenges
-            challengeAdapter!!.updateUnfilteredData(challenges)
-        }, RxErrorHandler.handleEmptyError())
+            challengeAdapter?.updateUnfilteredData(challenges)
+        }, RxErrorHandler.handleEmptyError()))
     }
 
     private fun fetchOnlineChallenges() {
         setRefreshing(true)
-        challengeRepository.retrieveChallenges(user).doOnComplete {
-            setRefreshing(false)
-        } .subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+        user.notNull {
+            challengeRepository.retrieveChallenges(it).doOnComplete {
+                setRefreshing(false)
+            } .subscribe(Consumer { }, RxErrorHandler.handleEmptyError())
+        }
     }
 
     override fun customTitle(): String {
@@ -141,13 +151,15 @@ class ChallengeListFragment : BaseMainFragment(), SwipeRefreshLayout.OnRefreshLi
     }
 
     private fun showFilterDialog() {
-        ChallengeFilterDialogHolder.showDialog(getActivity()!!,
-                challenges ?: emptyList(),
-                filterOptions, object : Action1<ChallengeFilterOptions> {
-            override fun call(t: ChallengeFilterOptions) {
-                changeFilter(t)
-            }
-        })
+        activity.notNull {
+            ChallengeFilterDialogHolder.showDialog(it,
+                    challenges ?: emptyList(),
+                    filterOptions, object : Action1<ChallengeFilterOptions> {
+                override fun call(t: ChallengeFilterOptions) {
+                    changeFilter(t)
+                }
+            })
+        }
     }
 
     private fun changeFilter(challengeFilterOptions: ChallengeFilterOptions) {
@@ -159,7 +171,7 @@ class ChallengeListFragment : BaseMainFragment(), SwipeRefreshLayout.OnRefreshLi
         // Handle action bar item clicks here. The action bar will
         // automatically handle clicks on the Home/Up button, so long
         // as you specify a parent activity in AndroidManifest.xml.
-        val id = item!!.itemId
+        val id = item?.itemId
 
         when (id) {
             R.id.action_create_challenge -> {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeTasksRecyclerViewFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeTasksRecyclerViewFragment.java
deleted file mode 100644
index 44e0b017d..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeTasksRecyclerViewFragment.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package com.habitrpg.android.habitica.ui.fragments.social.challenges;
-
-
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-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.models.tasks.Task;
-import com.habitrpg.android.habitica.models.user.User;
-import com.habitrpg.android.habitica.modules.AppModule;
-import com.habitrpg.android.habitica.ui.adapter.social.challenges.ChallengeTasksRecyclerViewAdapter;
-import com.habitrpg.android.habitica.ui.adapter.tasks.BaseTasksRecyclerViewAdapter;
-import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
-import com.habitrpg.android.habitica.ui.helpers.SafeDefaultItemAnimator;
-
-import java.util.List;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-
-public class ChallengeTasksRecyclerViewFragment extends BaseFragment {
-    public RecyclerView recyclerView;
-    public BaseTasksRecyclerViewAdapter recyclerAdapter;
-    @Inject
-    @Named(AppModule.NAMED_USER_ID)
-    String userID;
-
-    List<Task> tasksOnInitialize;
-
-    LinearLayoutManager layoutManager = null;
-    private User user;
-    private View view;
-
-    public static ChallengeTasksRecyclerViewFragment newInstance(User user, List<Task> tasks) {
-        ChallengeTasksRecyclerViewFragment fragment = new ChallengeTasksRecyclerViewFragment();
-        fragment.setRetainInstance(true);
-        fragment.user = user;
-        fragment.tasksOnInitialize = tasks;
-
-        if (tasks.size() != 0 && fragment.recyclerAdapter != null) {
-            fragment.recyclerAdapter.setTasks(tasks);
-        }
-
-        return fragment;
-    }
-
-    public void setInnerAdapter() {
-        this.recyclerAdapter = new ChallengeTasksRecyclerViewAdapter(null, 0, getContext(), userID, null, true, true);
-
-        if (user != null && user.getPreferences() != null) {
-            this.recyclerAdapter.setDailyResetOffset(user.getPreferences().getDayStart());
-        }
-
-        if (tasksOnInitialize != null && tasksOnInitialize.size() != 0 && recyclerAdapter != null && recyclerAdapter.getItemCount() == 0) {
-            recyclerAdapter.setTasks(tasksOnInitialize);
-        }
-    }
-
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        view = inflater.inflate(R.layout.fragment_recyclerview, container, false);
-
-        recyclerView = (RecyclerView) view.findViewById(R.id.recyclerView);
-
-        android.support.v4.app.FragmentActivity context = getActivity();
-
-        layoutManager = (LinearLayoutManager) recyclerView.getLayoutManager();
-
-        if (layoutManager == null) {
-            layoutManager = new LinearLayoutManager(context);
-
-            recyclerView.setLayoutManager(layoutManager);
-        }
-        if (recyclerView.getAdapter() == null) {
-            this.setInnerAdapter();
-        }
-        recyclerView.setItemAnimator(new SafeDefaultItemAnimator());
-
-        return view;
-    }
-
-    @Override
-    public void injectFragment(AppComponent component) {
-        component.inject(this);
-    }
-
-    @Override
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        recyclerView.setAdapter(recyclerAdapter);
-    }
-
-    @Override
-    public String getDisplayedClassName() {
-        return "ChallengeTasks" + super.getDisplayedClassName();
-    }
-
-
-    // region Challenge specific RecyclerViewAdapters
-    // endregion
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengesOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengesOverviewFragment.kt
index 4ea46cad7..3c98cd4d8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengesOverviewFragment.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengesOverviewFragment.kt
@@ -1,6 +1,5 @@
 package com.habitrpg.android.habitica.ui.fragments.social.challenges
 
-import android.content.Intent
 import android.os.Bundle
 import android.support.v4.app.Fragment
 import android.support.v4.app.FragmentStatePagerAdapter
@@ -12,17 +11,9 @@ import android.view.ViewGroup
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.components.AppComponent
 import com.habitrpg.android.habitica.data.ChallengeRepository
-import com.habitrpg.android.habitica.events.commands.ShowChallengeDetailActivityCommand
-import com.habitrpg.android.habitica.events.commands.ShowChallengeDetailDialogCommand
-import com.habitrpg.android.habitica.helpers.RxErrorHandler
-import com.habitrpg.android.habitica.models.social.Challenge
-import com.habitrpg.android.habitica.ui.activities.ChallengeDetailActivity
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment
 import com.habitrpg.android.habitica.ui.helpers.bindView
-import com.habitrpg.android.habitica.utils.Action1
-import io.reactivex.functions.Consumer
-
-import org.greenrobot.eventbus.Subscribe
+import com.habitrpg.android.habitica.ui.helpers.resetViews
 
 import javax.inject.Inject
 
@@ -33,30 +24,27 @@ class ChallengesOverviewFragment : BaseMainFragment() {
 
     private val viewPager: ViewPager? by bindView(R.id.viewPager)
     var statePagerAdapter: FragmentStatePagerAdapter? = null
-    private var userChallengesFragment: ChallengeListFragment? = null
-    private var availableChallengesFragment: ChallengeListFragment? = null
+    private var userChallengesFragment: ChallengeListFragment? = ChallengeListFragment()
+    private var availableChallengesFragment: ChallengeListFragment? = ChallengeListFragment()
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
         this.usesTabLayout = true
         super.onCreateView(inflater, container, savedInstanceState)
-        val v = inflater.inflate(R.layout.fragment_viewpager, container, false)
-
-        return v
+        return inflater.inflate(R.layout.fragment_viewpager, container, false)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        setViewPagerAdapter()
+        resetViews()
 
-        userChallengesFragment = ChallengeListFragment()
         userChallengesFragment?.user = this.user
         userChallengesFragment?.setViewUserChallengesOnly(true)
 
-        availableChallengesFragment = ChallengeListFragment()
         availableChallengesFragment?.user = this.user
         availableChallengesFragment?.setViewUserChallengesOnly(false)
+        setViewPagerAdapter()
     }
 
     override fun onDestroy() {
@@ -98,28 +86,7 @@ class ChallengesOverviewFragment : BaseMainFragment() {
         }
         viewPager?.adapter = statePagerAdapter
         tabLayout?.setupWithViewPager(viewPager)
-    }
-
-    @Subscribe
-    fun onEvent(cmd: ShowChallengeDetailDialogCommand) {
-        challengeRepository.getChallenge(cmd.challengeId).firstElement().subscribe(Consumer { challenge ->
-            ChallengeDetailDialogHolder.showDialog(activity, challengeRepository, challenge,
-                    object: Action1<Challenge> {
-                        override fun call(t: Challenge) {
-
-                        }
-                    })
-        }, RxErrorHandler.handleEmptyError())
-    }
-
-    @Subscribe
-    fun onEvent(cmd: ShowChallengeDetailActivityCommand) {
-        val bundle = Bundle()
-        bundle.putString(ChallengeDetailActivity.CHALLENGE_ID, cmd.challengeId)
-
-        val intent = Intent(activity, ChallengeDetailActivity::class.java)
-        intent.putExtras(bundle)
-        activity?.startActivity(intent)
+        statePagerAdapter?.notifyDataSetChanged()
     }
 
     override fun customTitle(): String {
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
index 7535fe024..dec909c70 100644
--- 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
@@ -19,7 +19,7 @@ class CollapsibleSectionView(context: Context?, attrs: AttributeSet?) : LinearLa
     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)
-    public val infoIconView: ImageView by bindView(R.id.infoIconView)
+    val infoIconView: ImageView by bindView(R.id.infoIconView)
     private var preferences: SharedPreferences? = null
     private val padding = context?.resources?.getDimension(R.dimen.spacing_large)?.toInt() ?: 0
 
@@ -31,7 +31,7 @@ class CollapsibleSectionView(context: Context?, attrs: AttributeSet?) : LinearLa
         titleLabel.text = value
     }
 
-    var isCollapsed = false
+    private var isCollapsed = false
     set(value) {
         field = value
         if (value) {
@@ -128,7 +128,7 @@ class CollapsibleSectionView(context: Context?, attrs: AttributeSet?) : LinearLa
         }
 
         if (attributes?.getBoolean(R.styleable.CollapsibleSectionView_hasAdditionalInfo, false) == true) {
-            infoIconView.setImageBitmap(HabiticaIconsHelper.imageOfInfoIcon())
+            infoIconView.setImageBitmap(HabiticaIconsHelper.imageOfInfoIcon(ContextCompat.getColor(context, R.color.brand_200)))
         } else {
             infoIconView.visibility = View.GONE
         }
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 5f1c4685c..4ec01b0bb 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
@@ -16,13 +16,17 @@ import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Path;
 import android.graphics.DashPathEffect;
+import android.graphics.Typeface;
+import android.text.Layout;
+import android.text.StaticLayout;
+import android.text.TextPaint;
 import java.util.Stack;
 import java.lang.ref.WeakReference;
 
 
 
 /**
- * Created by Phillip Thelen on 1. Feb 2018.
+ * Created by Phillip Thelen on 17. Jul 2018.
  * Copyright © 2018 HabitRPG Inc.. All rights reserved.
  *
  * Generated by PaintCode
@@ -84,13 +88,13 @@ public class HabiticaIcons {
         Paint paint = CacheForHeart.paint;
         
         // Local Colors
-        int fillColor4 = Color.argb(89, 181, 36, 40);
+        int fillColor5 = Color.argb(64, 255, 255, 255);
         int heartDarkBackground = Color.argb(178, 255, 255, 255);
-        int fillColor6 = Color.argb(128, 181, 36, 40);
+        int fillColor4 = Color.argb(89, 181, 36, 40);
         int fillColor2 = Color.argb(255, 255, 97, 101);
+        int fillColor6 = Color.argb(128, 181, 36, 40);
         int fillColor3 = Color.argb(128, 255, 255, 255);
         int heartLightBackground = Color.argb(255, 247, 78, 82);
-        int fillColor5 = Color.argb(64, 255, 255, 255);
         
         // Local Variables
         int expression = darkBackground ? heartDarkBackground : heartLightBackground;
@@ -364,11 +368,11 @@ public class HabiticaIcons {
         Paint paint = CacheForExperience.paint;
         
         // Local Colors
-        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);
-        int fillColor3 = Color.argb(128, 255, 255, 255);
+        int fillColor12 = Color.argb(128, 191, 125, 26);
         
         // Resize to Target Frame
         canvas.save();
@@ -595,11 +599,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 fillColor3 = Color.argb(128, 255, 255, 255);
+        int fillColor5 = Color.argb(64, 255, 255, 255);
         
         // Resize to Target Frame
         canvas.save();
@@ -746,11 +750,11 @@ public class HabiticaIcons {
         Paint paint = CacheForGold.paint;
         
         // Local Colors
-        int fillColor13 = Color.argb(191, 191, 125, 26);
         int fillColor12 = Color.argb(128, 191, 125, 26);
         int fillColor5 = Color.argb(64, 255, 255, 255);
         int fillColor3 = Color.argb(128, 255, 255, 255);
         int fillColor10 = Color.argb(255, 255, 166, 35);
+        int fillColor13 = Color.argb(191, 191, 125, 26);
         
         // Resize to Target Frame
         canvas.save();
@@ -900,10 +904,10 @@ public class HabiticaIcons {
         Paint paint = CacheForGem.paint;
         
         // Local Colors
-        int fillColor3 = Color.argb(128, 255, 255, 255);
+        int fillColor5 = Color.argb(64, 255, 255, 255);
         int fillColor15 = Color.argb(89, 27, 153, 107);
         int fillColor14 = Color.argb(255, 36, 204, 143);
-        int fillColor5 = Color.argb(64, 255, 255, 255);
+        int fillColor3 = Color.argb(128, 255, 255, 255);
         
         // Resize to Target Frame
         canvas.save();
@@ -1110,9 +1114,9 @@ public class HabiticaIcons {
         
         // Local Colors
         int fillColor18 = Color.argb(255, 154, 98, 255);
-        int fillColor19 = Color.argb(255, 79, 42, 147);
         int fillColor17 = Color.argb(230, 255, 255, 255);
         int fillColor16 = Color.argb(204, 169, 220, 246);
+        int fillColor19 = Color.argb(255, 79, 42, 147);
         
         // Resize to Target Frame
         canvas.save();
@@ -1527,14 +1531,14 @@ public class HabiticaIcons {
         Paint paint = CacheForWarrior.paint;
         
         // Local Colors
-        int fillColor21 = Color.argb(255, 255, 182, 184);
-        int fillColor41 = Color.argb(255, 255, 149, 152);
-        int fillColor43 = Color.argb(255, 200, 43, 43);
-        int fillColor22 = Color.argb(255, 242, 123, 134);
-        int fillColor = Color.argb(255, 240, 97, 102);
-        int fillColor42 = Color.argb(255, 255, 149, 152);
         int fillColor23 = Color.argb(255, 229, 65, 77);
         int fillColor20 = Color.argb(255, 255, 181, 183);
+        int fillColor43 = Color.argb(255, 200, 43, 43);
+        int fillColor21 = Color.argb(255, 255, 182, 184);
+        int fillColor22 = Color.argb(255, 242, 123, 134);
+        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
         boolean lightBackground = !darkBackground;
@@ -2701,10 +2705,10 @@ 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 _4StarDifficulty = difficulty >= 4f ? 1f : (difficulty >= 3.5f ? 0.5f : 0f);
         
         // Resize to Target Frame
         canvas.save();
@@ -2781,12 +2785,12 @@ public class HabiticaIcons {
         Paint paint = CacheForDifficultyStar.paint;
         
         // Local Colors
-        int fillColor24 = Color.argb(255, 255, 166, 36);
         int fillColor25 = Color.argb(255, 225, 224, 227);
+        int fillColor24 = Color.argb(255, 255, 166, 36);
         
         // Local Variables
-        boolean isFull = singleDifficulty == 1f;
         boolean isHalf = singleDifficulty == 0.5f;
+        boolean isFull = singleDifficulty == 1f;
         
         // Resize to Target Frame
         canvas.save();
@@ -3955,26 +3959,25 @@ public class HabiticaIcons {
         private static Path bezierPath = new Path();
         private static RectF bezier2Rect = new RectF();
         private static Path bezier2Path = new Path();
-        private static RectF bezier3Rect = new RectF();
-        private static Path bezier3Path = new Path();
+        private static RectF symbolRect = new RectF();
+        private static RectF symbolTargetRect = new RectF();
     }
     
-    public static void drawItemIndicator(Canvas canvas, boolean isLocked, boolean isLimited) {
-        HabiticaIcons.drawItemIndicator(canvas, new RectF(0f, 0f, 28f, 28f), ResizingBehavior.AspectFit, isLocked, isLimited);
+    public static void drawItemIndicator(Canvas canvas, int lockColor, boolean isLocked, boolean isLimited) {
+        HabiticaIcons.drawItemIndicator(canvas, new RectF(0f, 0f, 28f, 28f), ResizingBehavior.AspectFit, lockColor, isLocked, isLimited);
     }
     
-    public static void drawItemIndicator(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, boolean isLocked, boolean isLimited) {
+    public static void drawItemIndicator(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, int lockColor, boolean isLocked, boolean isLimited) {
         // General Declarations
         Paint paint = CacheForItemIndicator.paint;
         
         // Local Colors
-        int strokeColor2 = Color.argb(255, 189, 168, 255);
-        int fillColor39 = Color.argb(255, 189, 168, 255);
-        int strokeColor = Color.argb(255, 97, 51, 180);
         int shadowTint = Color.argb(255, 26, 24, 29);
         int fillColor38 = Color.argb(255, 165, 161, 172);
-        int fillColor40 = Color.argb(255, 165, 161, 172);
+        int fillColor39 = Color.argb(255, 189, 168, 255);
+        int strokeColor = Color.argb(255, 97, 51, 180);
         int indicatorLocked = Color.argb(255, 237, 236, 238);
+        int strokeColor2 = Color.argb(255, 189, 168, 255);
         
         // Local Shadows
         PaintCodeShadow shadow = CacheForItemIndicator.shadow.get(PaintCodeColor.colorByChangingAlpha(shadowTint, (int) (Color.alpha(shadowTint) * 0.12f * 255f)), 0f, 1f, 1f);
@@ -4066,53 +4069,17 @@ public class HabiticaIcons {
             canvas.restore();
         }
         
-        // Bezier 3
+        // Symbol
         if (isLocked) {
-            RectF bezier3Rect = CacheForItemIndicator.bezier3Rect;
-            bezier3Rect.set(9f, 7f, 19f, 19f);
-            Path bezier3Path = CacheForItemIndicator.bezier3Path;
-            bezier3Path.reset();
-            bezier3Path.moveTo(13f, 16f);
-            bezier3Path.lineTo(15f, 16f);
-            bezier3Path.lineTo(15f, 14f);
-            bezier3Path.lineTo(13f, 14f);
-            bezier3Path.lineTo(13f, 16f);
-            bezier3Path.close();
-            bezier3Path.moveTo(17f, 17f);
-            bezier3Path.lineTo(11f, 17f);
-            bezier3Path.lineTo(11f, 13f);
-            bezier3Path.lineTo(12f, 13f);
-            bezier3Path.lineTo(16f, 13f);
-            bezier3Path.lineTo(17f, 13f);
-            bezier3Path.lineTo(17f, 17f);
-            bezier3Path.close();
-            bezier3Path.moveTo(14f, 9f);
-            bezier3Path.cubicTo(15.1f, 9f, 16f, 9.9f, 16f, 11f);
-            bezier3Path.lineTo(12f, 11f);
-            bezier3Path.cubicTo(12f, 9.9f, 12.9f, 9f, 14f, 9f);
-            bezier3Path.lineTo(14f, 9f);
-            bezier3Path.close();
-            bezier3Path.moveTo(18f, 11.28f);
-            bezier3Path.lineTo(18f, 11f);
-            bezier3Path.cubicTo(18f, 8.79f, 16.21f, 7f, 14f, 7f);
-            bezier3Path.cubicTo(11.79f, 7f, 10f, 8.79f, 10f, 11f);
-            bezier3Path.lineTo(10f, 11.28f);
-            bezier3Path.cubicTo(9.4f, 11.62f, 9f, 12.26f, 9f, 13f);
-            bezier3Path.lineTo(9f, 17f);
-            bezier3Path.cubicTo(9f, 18.11f, 9.89f, 19f, 11f, 19f);
-            bezier3Path.lineTo(17f, 19f);
-            bezier3Path.cubicTo(18.11f, 19f, 19f, 18.11f, 19f, 17f);
-            bezier3Path.lineTo(19f, 13f);
-            bezier3Path.cubicTo(19f, 12.26f, 18.59f, 11.62f, 18f, 11.28f);
-            bezier3Path.lineTo(18f, 11.28f);
-            bezier3Path.close();
-            
-            paint.reset();
-            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-            bezier3Path.setFillType(Path.FillType.EVEN_ODD);
-            paint.setStyle(Paint.Style.FILL);
-            paint.setColor(fillColor40);
-            canvas.drawPath(bezier3Path, paint);
+            RectF symbolRect = CacheForItemIndicator.symbolRect;
+            symbolRect.set(9f, 7f, 19f, 19f);
+            canvas.save();
+            canvas.clipRect(symbolRect);
+            canvas.translate(symbolRect.left, symbolRect.top);
+            RectF symbolTargetRect = CacheForItemIndicator.symbolTargetRect;
+            symbolTargetRect.set(0f, 0f, symbolRect.width(), symbolRect.height());
+            HabiticaIcons.drawLocked(canvas, symbolTargetRect, ResizingBehavior.Stretch, lockColor);
+            canvas.restore();
         }
         
         canvas.restore();
@@ -4125,11 +4092,11 @@ public class HabiticaIcons {
         private static RectF symbolTargetRect = new RectF();
     }
     
-    private static void drawItemIndicatorNumber(Canvas canvas) {
-        HabiticaIcons.drawItemIndicatorNumber(canvas, new RectF(0f, 0f, 28f, 28f), ResizingBehavior.AspectFit);
+    private static void drawItemIndicatorNumber(Canvas canvas, int lockColor) {
+        HabiticaIcons.drawItemIndicatorNumber(canvas, new RectF(0f, 0f, 28f, 28f), ResizingBehavior.AspectFit, lockColor);
     }
     
-    private static void drawItemIndicatorNumber(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
+    private static void drawItemIndicatorNumber(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, int lockColor) {
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForItemIndicatorNumber.resizedFrame;
@@ -4145,7 +4112,7 @@ public class HabiticaIcons {
         canvas.translate(symbolRect.left, symbolRect.top);
         RectF symbolTargetRect = CacheForItemIndicatorNumber.symbolTargetRect;
         symbolTargetRect.set(0f, 0f, symbolRect.width(), symbolRect.height());
-        HabiticaIcons.drawItemIndicator(canvas, symbolTargetRect, ResizingBehavior.Stretch, false, false);
+        HabiticaIcons.drawItemIndicator(canvas, symbolTargetRect, ResizingBehavior.Stretch, lockColor, false, false);
         canvas.restore();
         
         canvas.restore();
@@ -4158,11 +4125,11 @@ public class HabiticaIcons {
         private static RectF symbolTargetRect = new RectF();
     }
     
-    private static void drawItemIndicatorLocked(Canvas canvas) {
-        HabiticaIcons.drawItemIndicatorLocked(canvas, new RectF(0f, 0f, 28f, 28f), ResizingBehavior.AspectFit);
+    private static void drawItemIndicatorLocked(Canvas canvas, int lockColor) {
+        HabiticaIcons.drawItemIndicatorLocked(canvas, new RectF(0f, 0f, 28f, 28f), ResizingBehavior.AspectFit, lockColor);
     }
     
-    private static void drawItemIndicatorLocked(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
+    private static void drawItemIndicatorLocked(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, int lockColor) {
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForItemIndicatorLocked.resizedFrame;
@@ -4178,7 +4145,7 @@ public class HabiticaIcons {
         canvas.translate(symbolRect.left, symbolRect.top);
         RectF symbolTargetRect = CacheForItemIndicatorLocked.symbolTargetRect;
         symbolTargetRect.set(0f, 0f, symbolRect.width(), symbolRect.height());
-        HabiticaIcons.drawItemIndicator(canvas, symbolTargetRect, ResizingBehavior.Stretch, true, false);
+        HabiticaIcons.drawItemIndicator(canvas, symbolTargetRect, ResizingBehavior.Stretch, lockColor, true, false);
         canvas.restore();
         
         canvas.restore();
@@ -4191,11 +4158,11 @@ public class HabiticaIcons {
         private static RectF symbolTargetRect = new RectF();
     }
     
-    private static void drawItemIndicatorLimited(Canvas canvas) {
-        HabiticaIcons.drawItemIndicatorLimited(canvas, new RectF(0f, 0f, 28f, 28f), ResizingBehavior.AspectFit);
+    private static void drawItemIndicatorLimited(Canvas canvas, int lockColor) {
+        HabiticaIcons.drawItemIndicatorLimited(canvas, new RectF(0f, 0f, 28f, 28f), ResizingBehavior.AspectFit, lockColor);
     }
     
-    private static void drawItemIndicatorLimited(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
+    private static void drawItemIndicatorLimited(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, int lockColor) {
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForItemIndicatorLimited.resizedFrame;
@@ -4211,7 +4178,7 @@ public class HabiticaIcons {
         canvas.translate(symbolRect.left, symbolRect.top);
         RectF symbolTargetRect = CacheForItemIndicatorLimited.symbolTargetRect;
         symbolTargetRect.set(0f, 0f, symbolRect.width(), symbolRect.height());
-        HabiticaIcons.drawItemIndicator(canvas, symbolTargetRect, ResizingBehavior.Stretch, false, true);
+        HabiticaIcons.drawItemIndicator(canvas, symbolTargetRect, ResizingBehavior.Stretch, lockColor, false, true);
         canvas.restore();
         
         canvas.restore();
@@ -4393,13 +4360,13 @@ public class HabiticaIcons {
         Paint paint = CacheForRogue.paint;
         
         // Local Colors
-        int fillColor19 = Color.argb(255, 79, 42, 147);
-        int fillColor45 = Color.argb(255, 155, 129, 226);
-        int fillColor46 = Color.argb(255, 122, 84, 192);
-        int fillColor44 = Color.argb(255, 204, 190, 237);
-        int fillColor47 = Color.argb(255, 198, 182, 228);
         int fillColor36 = Color.argb(255, 97, 51, 180);
+        int fillColor47 = Color.argb(255, 198, 182, 228);
+        int fillColor46 = Color.argb(255, 122, 84, 192);
         int fillColor48 = Color.argb(255, 137, 102, 199);
+        int fillColor19 = Color.argb(255, 79, 42, 147);
+        int fillColor44 = Color.argb(255, 204, 190, 237);
+        int fillColor45 = Color.argb(255, 155, 129, 226);
         
         // Local Variables
         boolean lightBackground = !darkBackground;
@@ -5190,18 +5157,18 @@ public class HabiticaIcons {
         Paint paint = CacheForHealer.paint;
         
         // Local Colors
-        int fillColor59 = Color.argb(255, 255, 228, 201);
-        int fillColor57 = Color.argb(255, 255, 221, 181);
-        int fillColor58 = Color.argb(255, 229, 144, 37);
-        int fillColor56 = Color.argb(255, 255, 166, 35);
-        int fillColor51 = Color.argb(255, 229, 144, 37);
-        int fillColor50 = Color.argb(255, 226, 158, 69);
-        int fillColor52 = Color.argb(255, 253, 198, 126);
-        int fillColor54 = Color.argb(255, 207, 130, 41);
-        int fillColor53 = Color.argb(255, 206, 129, 41);
-        int fillColor49 = Color.argb(255, 255, 215, 168);
-        int fillColor55 = Color.argb(255, 253, 198, 126);
         int fillColor10 = Color.argb(255, 255, 166, 35);
+        int fillColor58 = Color.argb(255, 229, 144, 37);
+        int fillColor49 = Color.argb(255, 255, 215, 168);
+        int fillColor59 = Color.argb(255, 255, 228, 201);
+        int fillColor52 = Color.argb(255, 253, 198, 126);
+        int fillColor57 = Color.argb(255, 255, 221, 181);
+        int fillColor51 = Color.argb(255, 229, 144, 37);
+        int fillColor56 = Color.argb(255, 255, 166, 35);
+        int fillColor54 = Color.argb(255, 207, 130, 41);
+        int fillColor55 = Color.argb(255, 253, 198, 126);
+        int fillColor53 = Color.argb(255, 206, 129, 41);
+        int fillColor50 = Color.argb(255, 226, 158, 69);
         
         // Local Variables
         boolean lightBackground = !darkBackground;
@@ -6027,17 +5994,17 @@ public class HabiticaIcons {
         Paint paint = CacheForMage.paint;
         
         // Local Colors
-        int fillColor70 = Color.argb(255, 132, 207, 242);
-        int fillColor68 = Color.argb(255, 31, 110, 162);
-        int fillColor60 = Color.argb(255, 182, 225, 247);
-        int fillColor67 = Color.argb(255, 83, 180, 229);
-        int fillColor69 = Color.argb(255, 169, 219, 245);
-        int fillColor63 = Color.argb(255, 42, 160, 207);
         int fillColor65 = Color.argb(255, 107, 196, 233);
-        int fillColor64 = Color.argb(255, 77, 178, 214);
-        int fillColor61 = Color.argb(255, 39, 138, 191);
+        int fillColor70 = Color.argb(255, 132, 207, 242);
         int fillColor62 = Color.argb(255, 83, 180, 229);
+        int fillColor67 = Color.argb(255, 83, 180, 229);
+        int fillColor60 = Color.argb(255, 182, 225, 247);
+        int fillColor64 = Color.argb(255, 77, 178, 214);
+        int fillColor69 = Color.argb(255, 169, 219, 245);
+        int fillColor61 = Color.argb(255, 39, 138, 191);
         int fillColor66 = Color.argb(255, 107, 196, 233);
+        int fillColor63 = Color.argb(255, 42, 160, 207);
+        int fillColor68 = Color.argb(255, 31, 110, 162);
         
         // Local Variables
         boolean lightBackground = !darkBackground;
@@ -6598,9 +6565,9 @@ public class HabiticaIcons {
         
         // Local Colors
         int fillColor18 = Color.argb(255, 154, 98, 255);
-        int fillColor19 = Color.argb(255, 79, 42, 147);
         int fillColor17 = Color.argb(230, 255, 255, 255);
         int fillColor16 = Color.argb(204, 169, 220, 246);
+        int fillColor19 = Color.argb(255, 79, 42, 147);
         
         // Resize to Target Frame
         canvas.save();
@@ -6848,10 +6815,10 @@ public class HabiticaIcons {
         Paint paint = CacheForAttributeSparklesLeft.paint;
         
         // Local Colors
-        int fillColor72 = Color.argb(255, 255, 97, 101);
         int fillColor73 = Color.argb(255, 255, 180, 69);
-        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 fillColor18 = Color.argb(255, 154, 98, 255);
         
         // Resize to Target Frame
         canvas.save();
@@ -6974,10 +6941,10 @@ public class HabiticaIcons {
         Paint paint = CacheForAttributeSparklesRight.paint;
         
         // Local Colors
-        int fillColor18 = Color.argb(255, 154, 98, 255);
         int fillColor71 = Color.argb(255, 80, 181, 233);
         int fillColor74 = Color.argb(255, 255, 190, 93);
         int fillColor72 = Color.argb(255, 255, 97, 101);
+        int fillColor18 = Color.argb(255, 154, 98, 255);
         
         // Resize to Target Frame
         canvas.save();
@@ -7132,17 +7099,14 @@ public class HabiticaIcons {
         private static Path bezierPath = new Path();
     }
     
-    public static void drawInfoIcon(Canvas canvas) {
-        HabiticaIcons.drawInfoIcon(canvas, new RectF(0f, 0f, 20f, 20f), ResizingBehavior.AspectFit);
+    public static void drawInfoIcon(Canvas canvas, int infoIconColor) {
+        HabiticaIcons.drawInfoIcon(canvas, new RectF(0f, 0f, 20f, 20f), ResizingBehavior.AspectFit, infoIconColor);
     }
     
-    public static void drawInfoIcon(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
+    public static void drawInfoIcon(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, int infoIconColor) {
         // General Declarations
         Paint paint = CacheForInfoIcon.paint;
         
-        // Local Colors
-        int fillColor18 = Color.argb(255, 154, 98, 255);
-        
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForInfoIcon.resizedFrame;
@@ -7186,7 +7150,7 @@ public class HabiticaIcons {
         paint.setFlags(Paint.ANTI_ALIAS_FLAG);
         bezierPath.setFillType(Path.FillType.EVEN_ODD);
         paint.setStyle(Paint.Style.FILL);
-        paint.setColor(fillColor18);
+        paint.setColor(infoIconColor);
         canvas.drawPath(bezierPath, paint);
         
         canvas.restore();
@@ -7229,35 +7193,35 @@ public class HabiticaIcons {
         Paint paint = CacheForContributorBadge.paint;
         
         // Local Colors
-        int fillColor78 = Color.argb(255, 255, 148, 76);
-        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 strokeColor9 = Color.argb(255, 52, 181, 193);
         int fillColor80 = Color.argb(255, 63, 218, 162);
+        int fillColor78 = Color.argb(255, 255, 148, 76);
         int strokeColor3 = Color.argb(255, 253, 124, 127);
-        int strokeColor11 = Color.argb(255, 106, 52, 204);
-        int fillColor76 = Color.argb(255, 255, 182, 184);
-        int strokeColor6 = Color.argb(255, 236, 109, 23);
-        int strokeColor4 = Color.argb(255, 136, 10, 10);
-        int fillColor82 = Color.argb(255, 154, 98, 255);
-        int fillColor81 = Color.argb(255, 94, 221, 233);
-        int strokeColor5 = Color.argb(255, 225, 22, 27);
-        int strokeColor12 = Color.argb(255, 0, 87, 55);
-        int fillColor7 = Color.argb(255, 41, 149, 205);
-        int strokeColor10 = Color.argb(255, 5, 112, 168);
-        int strokeColor7 = Color.argb(255, 238, 145, 9);
-        int strokeColor8 = Color.argb(255, 28, 163, 114);
         int fillColor2 = Color.argb(255, 255, 97, 101);
+        int strokeColor12 = Color.argb(255, 0, 87, 55);
+        int strokeColor9 = Color.argb(255, 52, 181, 193);
+        int strokeColor7 = Color.argb(255, 238, 145, 9);
+        int strokeColor11 = Color.argb(255, 106, 52, 204);
+        int strokeColor5 = Color.argb(255, 225, 22, 27);
+        int fillColor76 = Color.argb(255, 255, 182, 184);
+        int fillColor81 = Color.argb(255, 94, 221, 233);
+        int fillColor79 = Color.argb(255, 255, 190, 93);
+        int fillColor7 = Color.argb(255, 41, 149, 205);
+        int strokeColor4 = Color.argb(255, 136, 10, 10);
+        int fillColor83 = Color.argb(255, 119, 244, 199);
+        int strokeColor8 = Color.argb(255, 28, 163, 114);
+        int strokeColor6 = Color.argb(255, 236, 109, 23);
+        int fillColor77 = Color.argb(255, 201, 43, 43);
+        int fillColor82 = Color.argb(255, 154, 98, 255);
+        int strokeColor10 = Color.argb(255, 5, 112, 168);
         
         // Local Variables
-        boolean isTier6 = contributorTier == 6f && !isNPC;
-        boolean isTier8 = contributorTier == 8f && !isNPC;
-        boolean isTier7 = contributorTier == 7f && !isNPC;
         boolean isTier5 = contributorTier == 5f && !isNPC;
-        boolean isTier9 = contributorTier == 9f && !isNPC;
         boolean isTier4 = contributorTier == 4f && !isNPC;
+        boolean isTier7 = contributorTier == 7f && !isNPC;
+        boolean isTier6 = contributorTier == 6f && !isNPC;
         boolean isTier3 = contributorTier == 3f && !isNPC;
+        boolean isTier8 = contributorTier == 8f && !isNPC;
+        boolean isTier9 = contributorTier == 9f && !isNPC;
         boolean isTier2 = contributorTier == 2f && !isNPC;
         boolean isTier1 = contributorTier == 1f && !isNPC;
         
@@ -7602,8 +7566,8 @@ public class HabiticaIcons {
         Paint paint = CacheForChatLikeIcon.paint;
         
         // Local Colors
-        int fillColor25 = Color.argb(255, 225, 224, 227);
         int fillColor82 = Color.argb(255, 154, 98, 255);
+        int fillColor25 = Color.argb(255, 225, 224, 227);
         
         // Local Variables
         int expression2 = wasLiked ? fillColor82 : fillColor25;
@@ -8100,18 +8064,18 @@ public class HabiticaIcons {
         Paint paint = CacheForDamage.paint;
         
         // Local Colors
-        int fillColor25 = Color.argb(255, 225, 224, 227);
-        int fillColor85 = Color.argb(255, 237, 236, 238);
-        int fillColor90 = Color.argb(179, 78, 74, 87);
-        int fillColor89 = Color.argb(255, 227, 143, 61);
-        int fillColor35 = Color.argb(255, 195, 192, 199);
-        int fillColor37 = Color.argb(255, 255, 255, 255);
         int fillColor84 = Color.argb(255, 240, 97, 102);
+        int fillColor35 = Color.argb(255, 195, 192, 199);
+        int fillColor85 = Color.argb(255, 237, 236, 238);
         int fillColor40 = Color.argb(255, 165, 161, 172);
         int fillColor75 = Color.argb(255, 135, 129, 144);
-        int fillColor88 = Color.argb(255, 179, 98, 19);
         int fillColor86 = Color.argb(255, 213, 200, 255);
+        int fillColor90 = Color.argb(179, 78, 74, 87);
         int fillColor87 = Color.argb(255, 189, 168, 255);
+        int fillColor37 = Color.argb(255, 255, 255, 255);
+        int fillColor88 = Color.argb(255, 179, 98, 19);
+        int fillColor89 = Color.argb(255, 227, 143, 61);
+        int fillColor25 = Color.argb(255, 225, 224, 227);
         
         // Resize to Target Frame
         canvas.save();
@@ -8684,10 +8648,10 @@ public class HabiticaIcons {
         Paint paint = CacheForRageStrikeInactive.paint;
         
         // Local Colors
-        int strokeColor14 = Color.argb(255, 255, 148, 76);
-        int strokeColor13 = Color.argb(255, 244, 120, 37);
         int textForeground = Color.argb(255, 183, 90, 28);
         int fillColor91 = Color.argb(255, 255, 200, 167);
+        int strokeColor14 = Color.argb(255, 255, 148, 76);
+        int strokeColor13 = Color.argb(255, 244, 120, 37);
         
         // Resize to Target Frame
         canvas.save();
@@ -8850,8 +8814,8 @@ public class HabiticaIcons {
         Paint paint = CacheForRageStrikeActive.paint;
         
         // Local Colors
-        int strokeColor14 = Color.argb(255, 255, 148, 76);
         int strokeColor13 = Color.argb(255, 244, 120, 37);
+        int strokeColor14 = Color.argb(255, 255, 148, 76);
         
         // Local Images
         PaintCodeBitmap pc_rageStrikeNPC = GlobalCache.rageStrikeNPC.get(rageStrikeNPC);
@@ -8945,7 +8909,7 @@ public class HabiticaIcons {
         
         canvas.restore();
     }
-
+    
     private static class CacheForRage {
         private static Paint paint = new Paint();
         private static RectF originalFrame = new RectF(0f, 0f, 18f, 18f);
@@ -8979,31 +8943,31 @@ public class HabiticaIcons {
         private static RectF bezier14Rect = new RectF();
         private static Path bezier14Path = new Path();
     }
-
+    
     public static void drawRage(Canvas canvas) {
         HabiticaIcons.drawRage(canvas, new RectF(0f, 0f, 18f, 18f), ResizingBehavior.AspectFit);
     }
-
+    
     public static void drawRage(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
         // General Declarations
         Paint paint = CacheForRage.paint;
-
+        
         // Local Colors
-        int fillColor94 = Color.argb(89, 180, 89, 27);
-        int fillColor3 = Color.argb(128, 255, 255, 255);
-        int fillColor92 = Color.argb(255, 90, 228, 178);
-        int fillColor15 = Color.argb(89, 27, 153, 107);
         int fillColor5 = Color.argb(64, 255, 255, 255);
-        int fillColor93 = Color.argb(255, 244, 120, 37);
+        int fillColor15 = Color.argb(89, 27, 153, 107);
+        int fillColor92 = Color.argb(255, 90, 228, 178);
+        int fillColor94 = Color.argb(89, 180, 89, 27);
         int fillColor14 = Color.argb(255, 36, 204, 143);
-
+        int fillColor3 = Color.argb(128, 255, 255, 255);
+        int fillColor93 = Color.argb(255, 244, 120, 37);
+        
         // Resize to Target Frame
         canvas.save();
         RectF resizedFrame = CacheForRage.resizedFrame;
         HabiticaIcons.resizingBehaviorApply(resizing, CacheForRage.originalFrame, targetFrame, resizedFrame);
         canvas.translate(resizedFrame.left, resizedFrame.top);
         canvas.scale(resizedFrame.width() / 18f, resizedFrame.height() / 18f);
-
+        
         // Group
         {
             // Bezier
@@ -9017,13 +8981,13 @@ public class HabiticaIcons {
             bezierPath.lineTo(8.67f, 17f);
             bezierPath.lineTo(2f, 7f);
             bezierPath.close();
-
+            
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor14);
             canvas.drawPath(bezierPath, paint);
-
+            
             // Bezier 2
             RectF bezier2Rect = CacheForRage.bezier2Rect;
             bezier2Rect.set(2f, 1f, 15.33f, 17f);
@@ -9035,13 +8999,13 @@ public class HabiticaIcons {
             bezier2Path.lineTo(8.67f, 17f);
             bezier2Path.lineTo(2f, 7f);
             bezier2Path.close();
-
+            
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor14);
             canvas.drawPath(bezier2Path, paint);
-
+            
             // Bezier 3
             RectF bezier3Rect = CacheForRage.bezier3Rect;
             bezier3Rect.set(8.67f, 2.8f, 13.6f, 7.2f);
@@ -9052,13 +9016,13 @@ public class HabiticaIcons {
             bezier3Path.lineTo(8.67f, 2.8f);
             bezier3Path.lineTo(13.6f, 7.2f);
             bezier3Path.close();
-
+            
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor5);
             canvas.drawPath(bezier3Path, paint);
-
+            
             // Bezier 4
             RectF bezier4Rect = CacheForRage.bezier4Rect;
             bezier4Rect.set(3.73f, 2.8f, 8.67f, 7.2f);
@@ -9069,13 +9033,13 @@ public class HabiticaIcons {
             bezier4Path.lineTo(8.67f, 2.8f);
             bezier4Path.lineTo(8.67f, 6.2f);
             bezier4Path.close();
-
+            
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor3);
             canvas.drawPath(bezier4Path, paint);
-
+            
             // Bezier 5
             RectF bezier5Rect = CacheForRage.bezier5Rect;
             bezier5Rect.set(3.73f, 6.2f, 8.67f, 14.6f);
@@ -9086,13 +9050,13 @@ public class HabiticaIcons {
             bezier5Path.lineTo(3.73f, 7.2f);
             bezier5Path.lineTo(8.67f, 6.2f);
             bezier5Path.close();
-
+            
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor92);
             canvas.drawPath(bezier5Path, paint);
-
+            
             // Bezier 6
             RectF bezier6Rect = CacheForRage.bezier6Rect;
             bezier6Rect.set(8.67f, 6.2f, 13.6f, 14.6f);
@@ -9103,13 +9067,13 @@ public class HabiticaIcons {
             bezier6Path.lineTo(8.67f, 6.2f);
             bezier6Path.lineTo(13.6f, 7.2f);
             bezier6Path.close();
-
+            
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor15);
             canvas.drawPath(bezier6Path, paint);
-
+            
             // Bezier 7
             RectF bezier7Rect = CacheForRage.bezier7Rect;
             bezier7Rect.set(2f, 1f, 15.33f, 17f);
@@ -9125,13 +9089,13 @@ public class HabiticaIcons {
             bezier7Path.lineTo(14f, 9f);
             bezier7Path.lineTo(15.33f, 7f);
             bezier7Path.close();
-
+            
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor93);
             canvas.drawPath(bezier7Path, paint);
-
+            
             // Bezier 8
             RectF bezier8Rect = CacheForRage.bezier8Rect;
             bezier8Rect.set(8.67f, 2.8f, 13.6f, 7.2f);
@@ -9142,13 +9106,13 @@ public class HabiticaIcons {
             bezier8Path.lineTo(8.67f, 2.8f);
             bezier8Path.lineTo(13.6f, 7.2f);
             bezier8Path.close();
-
+            
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor5);
             canvas.drawPath(bezier8Path, paint);
-
+            
             // Bezier 9
             RectF bezier9Rect = CacheForRage.bezier9Rect;
             bezier9Rect.set(3.73f, 2.8f, 8.67f, 7.2f);
@@ -9159,13 +9123,13 @@ public class HabiticaIcons {
             bezier9Path.lineTo(8.67f, 2.8f);
             bezier9Path.lineTo(8.67f, 6.2f);
             bezier9Path.close();
-
+            
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor3);
             canvas.drawPath(bezier9Path, paint);
-
+            
             // Bezier 10
             RectF bezier10Rect = CacheForRage.bezier10Rect;
             bezier10Rect.set(3.73f, 3.4f, 13.6f, 14.6f);
@@ -9183,13 +9147,13 @@ public class HabiticaIcons {
             bezier10Path.lineTo(13.6f, 10.8f);
             bezier10Path.lineTo(8.67f, 11.8f);
             bezier10Path.close();
-
+            
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor5);
             canvas.drawPath(bezier10Path, paint);
-
+            
             // Bezier 11
             RectF bezier11Rect = CacheForRage.bezier11Rect;
             bezier11Rect.set(3.73f, 6.2f, 13.6f, 15.2f);
@@ -9205,13 +9169,13 @@ public class HabiticaIcons {
             bezier11Path.lineTo(8.67f, 15.2f);
             bezier11Path.lineTo(3.73f, 10.8f);
             bezier11Path.close();
-
+            
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor94);
             canvas.drawPath(bezier11Path, paint);
-
+            
             // Bezier 12
             RectF bezier12Rect = CacheForRage.bezier12Rect;
             bezier12Rect.set(8.67f, 10.8f, 13.6f, 15.2f);
@@ -9222,13 +9186,13 @@ public class HabiticaIcons {
             bezier12Path.lineTo(8.67f, 15.2f);
             bezier12Path.lineTo(8.67f, 11.8f);
             bezier12Path.close();
-
+            
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor3);
             canvas.drawPath(bezier12Path, paint);
-
+            
             // Bezier 13
             RectF bezier13Rect = CacheForRage.bezier13Rect;
             bezier13Rect.set(3.73f, 3.4f, 8.67f, 11.8f);
@@ -9239,13 +9203,13 @@ public class HabiticaIcons {
             bezier13Path.lineTo(8.67f, 11.8f);
             bezier13Path.lineTo(3.73f, 10.8f);
             bezier13Path.close();
-
+            
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor5);
             canvas.drawPath(bezier13Path, paint);
-
+            
             // Bezier 14
             RectF bezier14Rect = CacheForRage.bezier14Rect;
             bezier14Rect.set(5.5f, 4.67f, 11.83f, 13.33f);
@@ -9261,19 +9225,2888 @@ public class HabiticaIcons {
             bezier14Path.lineTo(8.67f, 13.33f);
             bezier14Path.lineTo(5.5f, 10.53f);
             bezier14Path.close();
-
+            
             paint.reset();
             paint.setFlags(Paint.ANTI_ALIAS_FLAG);
             paint.setStyle(Paint.Style.FILL);
             paint.setColor(fillColor3);
             canvas.drawPath(bezier14Path, paint);
         }
-
+        
         canvas.restore();
     }
-
-
-
+    
+    private static class CacheForTaskDifficultyStars {
+        private static RectF originalFrame = new RectF(0f, 0f, 36f, 36f);
+        private static RectF resizedFrame = new RectF();
+        private static RectF symbol2Rect = new RectF();
+        private static RectF symbol2TargetRect = new RectF();
+        private static RectF symbol3Rect = new RectF();
+        private static RectF symbol3TargetRect = new RectF();
+        private static RectF symbol4Rect = new RectF();
+        private static RectF symbol4TargetRect = new RectF();
+        private static RectF symbol5Rect = new RectF();
+        private static RectF symbol5TargetRect = new RectF();
+        private static RectF symbol6Rect = new RectF();
+        private static RectF symbol6TargetRect = new RectF();
+        private static RectF symbol7Rect = new RectF();
+        private static RectF symbol7TargetRect = new RectF();
+        private static RectF symbol8Rect = new RectF();
+        private static RectF symbol8TargetRect = new RectF();
+        private static RectF symbol9Rect = new RectF();
+        private static RectF symbol9TargetRect = new RectF();
+        private static RectF symbol10Rect = new RectF();
+        private static RectF symbol10TargetRect = new RectF();
+        private static RectF symbolRect = new RectF();
+        private static RectF symbolTargetRect = new RectF();
+    }
+    
+    public static void drawTaskDifficultyStars(Canvas canvas, int taskTintColor, float difficulty, boolean isActive) {
+        HabiticaIcons.drawTaskDifficultyStars(canvas, new RectF(0f, 0f, 36f, 36f), ResizingBehavior.AspectFit, taskTintColor, difficulty, isActive);
+    }
+    
+    public static void drawTaskDifficultyStars(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, int taskTintColor, float difficulty, boolean isActive) {
+        // Local Variables
+        boolean isEasy = difficulty == 1f;
+        boolean isHard = difficulty == 2f;
+        boolean isMedium = difficulty == 1.5f;
+        boolean isTrivial = difficulty == 0.1f;
+        
+        // Resize to Target Frame
+        canvas.save();
+        RectF resizedFrame = CacheForTaskDifficultyStars.resizedFrame;
+        HabiticaIcons.resizingBehaviorApply(resizing, CacheForTaskDifficultyStars.originalFrame, targetFrame, resizedFrame);
+        canvas.translate(resizedFrame.left, resizedFrame.top);
+        canvas.scale(resizedFrame.width() / 36f, resizedFrame.height() / 36f);
+        
+        // Group
+        if (isEasy) {
+            // Symbol 2
+            RectF symbol2Rect = CacheForTaskDifficultyStars.symbol2Rect;
+            symbol2Rect.set(0f, 9f, 16f, 25f);
+            canvas.save();
+            canvas.clipRect(symbol2Rect);
+            canvas.translate(symbol2Rect.left, symbol2Rect.top);
+            RectF symbol2TargetRect = CacheForTaskDifficultyStars.symbol2TargetRect;
+            symbol2TargetRect.set(0f, 0f, symbol2Rect.width(), symbol2Rect.height());
+            HabiticaIcons.drawTaskFormDifficultyStar(canvas, symbol2TargetRect, ResizingBehavior.Stretch, taskTintColor, isActive);
+            canvas.restore();
+            
+            // Symbol 3
+            RectF symbol3Rect = CacheForTaskDifficultyStars.symbol3Rect;
+            symbol3Rect.set(20f, 9f, 36f, 25f);
+            canvas.save();
+            canvas.clipRect(symbol3Rect);
+            canvas.translate(symbol3Rect.left, symbol3Rect.top);
+            RectF symbol3TargetRect = CacheForTaskDifficultyStars.symbol3TargetRect;
+            symbol3TargetRect.set(0f, 0f, symbol3Rect.width(), symbol3Rect.height());
+            HabiticaIcons.drawTaskFormDifficultyStar(canvas, symbol3TargetRect, ResizingBehavior.Stretch, taskTintColor, isActive);
+            canvas.restore();
+        }
+        
+        // Group 2
+        if (isMedium) {
+            // Symbol 4
+            RectF symbol4Rect = CacheForTaskDifficultyStars.symbol4Rect;
+            symbol4Rect.set(10f, 0f, 26f, 16f);
+            canvas.save();
+            canvas.clipRect(symbol4Rect);
+            canvas.translate(symbol4Rect.left, symbol4Rect.top);
+            RectF symbol4TargetRect = CacheForTaskDifficultyStars.symbol4TargetRect;
+            symbol4TargetRect.set(0f, 0f, symbol4Rect.width(), symbol4Rect.height());
+            HabiticaIcons.drawTaskFormDifficultyStar(canvas, symbol4TargetRect, ResizingBehavior.Stretch, taskTintColor, isActive);
+            canvas.restore();
+            
+            // Symbol 5
+            RectF symbol5Rect = CacheForTaskDifficultyStars.symbol5Rect;
+            symbol5Rect.set(20f, 13f, 36f, 29f);
+            canvas.save();
+            canvas.clipRect(symbol5Rect);
+            canvas.translate(symbol5Rect.left, symbol5Rect.top);
+            RectF symbol5TargetRect = CacheForTaskDifficultyStars.symbol5TargetRect;
+            symbol5TargetRect.set(0f, 0f, symbol5Rect.width(), symbol5Rect.height());
+            HabiticaIcons.drawTaskFormDifficultyStar(canvas, symbol5TargetRect, ResizingBehavior.Stretch, taskTintColor, isActive);
+            canvas.restore();
+            
+            // Symbol 6
+            RectF symbol6Rect = CacheForTaskDifficultyStars.symbol6Rect;
+            symbol6Rect.set(0f, 13f, 16f, 29f);
+            canvas.save();
+            canvas.clipRect(symbol6Rect);
+            canvas.translate(symbol6Rect.left, symbol6Rect.top);
+            RectF symbol6TargetRect = CacheForTaskDifficultyStars.symbol6TargetRect;
+            symbol6TargetRect.set(0f, 0f, symbol6Rect.width(), symbol6Rect.height());
+            HabiticaIcons.drawTaskFormDifficultyStar(canvas, symbol6TargetRect, ResizingBehavior.Stretch, taskTintColor, isActive);
+            canvas.restore();
+        }
+        
+        // Group 3
+        if (isHard) {
+            // Symbol 7
+            RectF symbol7Rect = CacheForTaskDifficultyStars.symbol7Rect;
+            symbol7Rect.set(0f, 0f, 16f, 16f);
+            canvas.save();
+            canvas.clipRect(symbol7Rect);
+            canvas.translate(symbol7Rect.left, symbol7Rect.top);
+            RectF symbol7TargetRect = CacheForTaskDifficultyStars.symbol7TargetRect;
+            symbol7TargetRect.set(0f, 0f, symbol7Rect.width(), symbol7Rect.height());
+            HabiticaIcons.drawTaskFormDifficultyStar(canvas, symbol7TargetRect, ResizingBehavior.Stretch, taskTintColor, isActive);
+            canvas.restore();
+            
+            // Symbol 8
+            RectF symbol8Rect = CacheForTaskDifficultyStars.symbol8Rect;
+            symbol8Rect.set(20f, 0f, 36f, 16f);
+            canvas.save();
+            canvas.clipRect(symbol8Rect);
+            canvas.translate(symbol8Rect.left, symbol8Rect.top);
+            RectF symbol8TargetRect = CacheForTaskDifficultyStars.symbol8TargetRect;
+            symbol8TargetRect.set(0f, 0f, symbol8Rect.width(), symbol8Rect.height());
+            HabiticaIcons.drawTaskFormDifficultyStar(canvas, symbol8TargetRect, ResizingBehavior.Stretch, taskTintColor, isActive);
+            canvas.restore();
+            
+            // Symbol 9
+            RectF symbol9Rect = CacheForTaskDifficultyStars.symbol9Rect;
+            symbol9Rect.set(0f, 20f, 16f, 36f);
+            canvas.save();
+            canvas.clipRect(symbol9Rect);
+            canvas.translate(symbol9Rect.left, symbol9Rect.top);
+            RectF symbol9TargetRect = CacheForTaskDifficultyStars.symbol9TargetRect;
+            symbol9TargetRect.set(0f, 0f, symbol9Rect.width(), symbol9Rect.height());
+            HabiticaIcons.drawTaskFormDifficultyStar(canvas, symbol9TargetRect, ResizingBehavior.Stretch, taskTintColor, isActive);
+            canvas.restore();
+            
+            // Symbol 10
+            RectF symbol10Rect = CacheForTaskDifficultyStars.symbol10Rect;
+            symbol10Rect.set(20f, 20f, 36f, 36f);
+            canvas.save();
+            canvas.clipRect(symbol10Rect);
+            canvas.translate(symbol10Rect.left, symbol10Rect.top);
+            RectF symbol10TargetRect = CacheForTaskDifficultyStars.symbol10TargetRect;
+            symbol10TargetRect.set(0f, 0f, symbol10Rect.width(), symbol10Rect.height());
+            HabiticaIcons.drawTaskFormDifficultyStar(canvas, symbol10TargetRect, ResizingBehavior.Stretch, taskTintColor, isActive);
+            canvas.restore();
+        }
+        
+        // Symbol
+        if (isTrivial) {
+            RectF symbolRect = CacheForTaskDifficultyStars.symbolRect;
+            symbolRect.set(10f, 9f, 26f, 25f);
+            canvas.save();
+            canvas.clipRect(symbolRect);
+            canvas.translate(symbolRect.left, symbolRect.top);
+            RectF symbolTargetRect = CacheForTaskDifficultyStars.symbolTargetRect;
+            symbolTargetRect.set(0f, 0f, symbolRect.width(), symbolRect.height());
+            HabiticaIcons.drawTaskFormDifficultyStar(canvas, symbolTargetRect, ResizingBehavior.Stretch, taskTintColor, isActive);
+            canvas.restore();
+        }
+        
+        canvas.restore();
+    }
+    
+    private static class CacheForTaskFormDifficultyStar {
+        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 star3Rect = new RectF();
+        private static Path star3Path = new Path();
+    }
+    
+    public static void drawTaskFormDifficultyStar(Canvas canvas, int taskTintColor, boolean isActive) {
+        HabiticaIcons.drawTaskFormDifficultyStar(canvas, new RectF(0f, 0f, 16f, 16f), ResizingBehavior.AspectFit, taskTintColor, isActive);
+    }
+    
+    public static void drawTaskFormDifficultyStar(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, int taskTintColor, boolean isActive) {
+        // General Declarations
+        Paint paint = CacheForTaskFormDifficultyStar.paint;
+        
+        // Local Colors
+        int strokeColor15 = Color.argb(255, 195, 192, 199);
+        int transparent = Color.argb(0, 204, 82, 82);
+        
+        // Local Variables
+        int starFillColor = isActive ? taskTintColor : transparent;
+        int borderColor = isActive ? taskTintColor : strokeColor15;
+        
+        // Resize to Target Frame
+        canvas.save();
+        RectF resizedFrame = CacheForTaskFormDifficultyStar.resizedFrame;
+        HabiticaIcons.resizingBehaviorApply(resizing, CacheForTaskFormDifficultyStar.originalFrame, targetFrame, resizedFrame);
+        canvas.translate(resizedFrame.left, resizedFrame.top);
+        canvas.scale(resizedFrame.width() / 16f, resizedFrame.height() / 16f);
+        
+        // Star 3
+        RectF star3Rect = CacheForTaskFormDifficultyStar.star3Rect;
+        star3Rect.set(1f, 1f, 15f, 15f);
+        Path star3Path = CacheForTaskFormDifficultyStar.star3Path;
+        star3Path.reset();
+        star3Path.moveTo(8f, 1f);
+        star3Path.lineTo(10.33f, 5.67f);
+        star3Path.lineTo(15f, 8f);
+        star3Path.lineTo(10.33f, 10.33f);
+        star3Path.lineTo(8f, 15f);
+        star3Path.lineTo(5.67f, 10.33f);
+        star3Path.lineTo(1f, 8f);
+        star3Path.lineTo(5.67f, 5.67f);
+        star3Path.lineTo(8f, 1f);
+        star3Path.close();
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(starFillColor);
+        canvas.drawPath(star3Path, paint);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStrokeWidth(1f);
+        paint.setStrokeMiter(10f);
+        canvas.save();
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setColor(borderColor);
+        canvas.drawPath(star3Path, paint);
+        canvas.restore();
+        
+        canvas.restore();
+    }
+    
+    private static class CacheForHabitControlPlus {
+        private static Paint paint = new Paint();
+        private static RectF originalFrame = new RectF(0f, 0f, 34f, 34f);
+        private static RectF resizedFrame = new RectF();
+        private static RectF ovalRect = new RectF();
+        private static Path ovalPath = new Path();
+        private static RectF bezierRect = new RectF();
+        private static Path bezierPath = new Path();
+    }
+    
+    public static void drawHabitControlPlus(Canvas canvas, int taskTintColor, boolean isActive) {
+        HabiticaIcons.drawHabitControlPlus(canvas, new RectF(0f, 0f, 34f, 34f), ResizingBehavior.AspectFit, taskTintColor, isActive);
+    }
+    
+    public static void drawHabitControlPlus(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, int taskTintColor, boolean isActive) {
+        // General Declarations
+        Paint paint = CacheForHabitControlPlus.paint;
+        
+        // Local Colors
+        int fillColor37 = Color.argb(255, 255, 255, 255);
+        int strokeColor15 = Color.argb(255, 195, 192, 199);
+        int transparent = Color.argb(0, 204, 82, 82);
+        
+        // Local Variables
+        int starFillColor = isActive ? taskTintColor : transparent;
+        int borderColor = isActive ? taskTintColor : strokeColor15;
+        int controlFillColor = isActive ? fillColor37 : strokeColor15;
+        
+        // Resize to Target Frame
+        canvas.save();
+        RectF resizedFrame = CacheForHabitControlPlus.resizedFrame;
+        HabiticaIcons.resizingBehaviorApply(resizing, CacheForHabitControlPlus.originalFrame, targetFrame, resizedFrame);
+        canvas.translate(resizedFrame.left, resizedFrame.top);
+        canvas.scale(resizedFrame.width() / 34f, resizedFrame.height() / 34f);
+        
+        // Oval
+        RectF ovalRect = CacheForHabitControlPlus.ovalRect;
+        ovalRect.set(1f, 1f, 33f, 33f);
+        Path ovalPath = CacheForHabitControlPlus.ovalPath;
+        ovalPath.reset();
+        ovalPath.addOval(ovalRect, Path.Direction.CW);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(starFillColor);
+        canvas.drawPath(ovalPath, paint);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStrokeWidth(1f);
+        paint.setStrokeMiter(10f);
+        canvas.save();
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setColor(borderColor);
+        canvas.drawPath(ovalPath, paint);
+        canvas.restore();
+        
+        // Bezier
+        RectF bezierRect = CacheForHabitControlPlus.bezierRect;
+        bezierRect.set(10f, 10f, 24f, 24f);
+        Path bezierPath = CacheForHabitControlPlus.bezierPath;
+        bezierPath.reset();
+        bezierPath.moveTo(16f, 16f);
+        bezierPath.lineTo(16f, 10f);
+        bezierPath.lineTo(18f, 10f);
+        bezierPath.lineTo(18f, 16f);
+        bezierPath.lineTo(24f, 16f);
+        bezierPath.lineTo(24f, 18f);
+        bezierPath.lineTo(18f, 18f);
+        bezierPath.lineTo(18f, 24f);
+        bezierPath.lineTo(16f, 24f);
+        bezierPath.lineTo(16f, 18f);
+        bezierPath.lineTo(10f, 18f);
+        bezierPath.lineTo(10f, 16f);
+        bezierPath.lineTo(16f, 16f);
+        bezierPath.close();
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        bezierPath.setFillType(Path.FillType.EVEN_ODD);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(controlFillColor);
+        canvas.drawPath(bezierPath, paint);
+        
+        canvas.restore();
+    }
+    
+    private static class CacheForHabitControlMinus {
+        private static Paint paint = new Paint();
+        private static RectF originalFrame = new RectF(0f, 0f, 34f, 34f);
+        private static RectF resizedFrame = new RectF();
+        private static RectF ovalRect = new RectF();
+        private static Path ovalPath = new Path();
+        private static RectF bezier2Rect = new RectF();
+        private static Path bezier2Path = new Path();
+    }
+    
+    public static void drawHabitControlMinus(Canvas canvas, int taskTintColor, boolean isActive) {
+        HabiticaIcons.drawHabitControlMinus(canvas, new RectF(0f, 0f, 34f, 34f), ResizingBehavior.AspectFit, taskTintColor, isActive);
+    }
+    
+    public static void drawHabitControlMinus(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, int taskTintColor, boolean isActive) {
+        // General Declarations
+        Paint paint = CacheForHabitControlMinus.paint;
+        
+        // Local Colors
+        int fillColor37 = Color.argb(255, 255, 255, 255);
+        int strokeColor15 = Color.argb(255, 195, 192, 199);
+        int transparent = Color.argb(0, 204, 82, 82);
+        
+        // Local Variables
+        int starFillColor = isActive ? taskTintColor : transparent;
+        int borderColor = isActive ? taskTintColor : strokeColor15;
+        int controlFillColor = isActive ? fillColor37 : strokeColor15;
+        
+        // Resize to Target Frame
+        canvas.save();
+        RectF resizedFrame = CacheForHabitControlMinus.resizedFrame;
+        HabiticaIcons.resizingBehaviorApply(resizing, CacheForHabitControlMinus.originalFrame, targetFrame, resizedFrame);
+        canvas.translate(resizedFrame.left, resizedFrame.top);
+        canvas.scale(resizedFrame.width() / 34f, resizedFrame.height() / 34f);
+        
+        // Oval
+        RectF ovalRect = CacheForHabitControlMinus.ovalRect;
+        ovalRect.set(1f, 1f, 33f, 33f);
+        Path ovalPath = CacheForHabitControlMinus.ovalPath;
+        ovalPath.reset();
+        ovalPath.addOval(ovalRect, Path.Direction.CW);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(starFillColor);
+        canvas.drawPath(ovalPath, paint);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStrokeWidth(1f);
+        paint.setStrokeMiter(10f);
+        canvas.save();
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setColor(borderColor);
+        canvas.drawPath(ovalPath, paint);
+        canvas.restore();
+        
+        // Bezier 2
+        RectF bezier2Rect = CacheForHabitControlMinus.bezier2Rect;
+        bezier2Rect.set(10f, 16f, 24f, 17.96f);
+        Path bezier2Path = CacheForHabitControlMinus.bezier2Path;
+        bezier2Path.reset();
+        bezier2Path.moveTo(10f, 17.96f);
+        bezier2Path.lineTo(24f, 17.96f);
+        bezier2Path.lineTo(24f, 16f);
+        bezier2Path.lineTo(10f, 16f);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        bezier2Path.setFillType(Path.FillType.EVEN_ODD);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(controlFillColor);
+        canvas.drawPath(bezier2Path, paint);
+        
+        canvas.restore();
+    }
+    
+    private static class CacheForLocked {
+        private static Paint paint = new Paint();
+        private static RectF originalFrame = new RectF(0f, 0f, 15f, 17f);
+        private static RectF resizedFrame = new RectF();
+        private static RectF rectangleRect = new RectF();
+        private static Path rectanglePath = new Path();
+        private static RectF group = new RectF();
+        private static Path clipPath = new Path();
+        private static RectF bezierRect = new RectF();
+        private static Path bezierPath = new Path();
+        private static RectF group2 = new RectF();
+        private static Path clip2Path = new Path();
+        private static RectF bezier3Rect = new RectF();
+        private static Path bezier3Path = new Path();
+    }
+    
+    public static void drawLocked(Canvas canvas, int lockColor) {
+        HabiticaIcons.drawLocked(canvas, new RectF(0f, 0f, 15f, 17f), ResizingBehavior.AspectFit, lockColor);
+    }
+    
+    public static void drawLocked(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, int lockColor) {
+        // General Declarations
+        Paint paint = CacheForLocked.paint;
+        
+        // Resize to Target Frame
+        canvas.save();
+        RectF resizedFrame = CacheForLocked.resizedFrame;
+        HabiticaIcons.resizingBehaviorApply(resizing, CacheForLocked.originalFrame, targetFrame, resizedFrame);
+        canvas.translate(resizedFrame.left, resizedFrame.top);
+        canvas.scale(resizedFrame.width() / 15f, resizedFrame.height() / 17f);
+        
+        // Group 3
+        {
+            // Rectangle
+            RectF rectangleRect = CacheForLocked.rectangleRect;
+            rectangleRect.set(6f, 10f, 9f, 13f);
+            Path rectanglePath = CacheForLocked.rectanglePath;
+            rectanglePath.reset();
+            rectanglePath.addRect(rectangleRect, Path.Direction.CW);
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(lockColor);
+            canvas.drawPath(rectanglePath, paint);
+            
+            // Group
+            {
+                RectF group = CacheForLocked.group;
+                group.set(0f, 6f, 15f, 17f);
+                canvas.save();
+                
+                // Clip
+                Path clipPath = CacheForLocked.clipPath;
+                clipPath.reset();
+                clipPath.moveTo(2f, 6f);
+                clipPath.lineTo(13f, 6f);
+                clipPath.cubicTo(14.1f, 6f, 15f, 6.9f, 15f, 8f);
+                clipPath.lineTo(15f, 15f);
+                clipPath.cubicTo(15f, 16.1f, 14.1f, 17f, 13f, 17f);
+                clipPath.lineTo(2f, 17f);
+                clipPath.cubicTo(0.9f, 17f, 0f, 16.1f, 0f, 15f);
+                clipPath.lineTo(0f, 8f);
+                clipPath.cubicTo(0f, 6.9f, 0.9f, 6f, 2f, 6f);
+                clipPath.close();
+                canvas.clipPath(clipPath);
+                
+                // Bezier
+                RectF bezierRect = CacheForLocked.bezierRect;
+                bezierRect.set(0f, 6f, 15f, 17f);
+                Path bezierPath = CacheForLocked.bezierPath;
+                bezierPath.reset();
+                bezierPath.moveTo(2f, 6f);
+                bezierPath.lineTo(13f, 6f);
+                bezierPath.cubicTo(14.1f, 6f, 15f, 6.9f, 15f, 8f);
+                bezierPath.lineTo(15f, 15f);
+                bezierPath.cubicTo(15f, 16.1f, 14.1f, 17f, 13f, 17f);
+                bezierPath.lineTo(2f, 17f);
+                bezierPath.cubicTo(0.9f, 17f, 0f, 16.1f, 0f, 15f);
+                bezierPath.lineTo(0f, 8f);
+                bezierPath.cubicTo(0f, 6.9f, 0.9f, 6f, 2f, 6f);
+                bezierPath.close();
+                
+                paint.reset();
+                paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+                paint.setStrokeWidth(4f);
+                paint.setStrokeMiter(10f);
+                canvas.save();
+                paint.setStyle(Paint.Style.STROKE);
+                paint.setColor(lockColor);
+                canvas.drawPath(bezierPath, paint);
+                canvas.restore();
+                
+                canvas.restore();
+            }
+            
+            // Group 2
+            {
+                RectF group2 = CacheForLocked.group2;
+                group2.set(2f, 0f, 13f, 8f);
+                canvas.save();
+                
+                // Clip 2
+                Path clip2Path = CacheForLocked.clip2Path;
+                clip2Path.reset();
+                clip2Path.moveTo(7.5f, 0f);
+                clip2Path.lineTo(7.5f, 0f);
+                clip2Path.cubicTo(10.54f, 0f, 13f, 2.46f, 13f, 5.5f);
+                clip2Path.lineTo(13f, 8f);
+                clip2Path.lineTo(2f, 8f);
+                clip2Path.lineTo(2f, 5.5f);
+                clip2Path.cubicTo(2f, 2.46f, 4.46f, 0f, 7.5f, 0f);
+                clip2Path.close();
+                canvas.clipPath(clip2Path);
+                
+                // Bezier 3
+                RectF bezier3Rect = CacheForLocked.bezier3Rect;
+                bezier3Rect.set(2f, 0f, 13f, 8f);
+                Path bezier3Path = CacheForLocked.bezier3Path;
+                bezier3Path.reset();
+                bezier3Path.moveTo(7.5f, 0f);
+                bezier3Path.lineTo(7.5f, 0f);
+                bezier3Path.cubicTo(10.54f, 0f, 13f, 2.46f, 13f, 5.5f);
+                bezier3Path.lineTo(13f, 8f);
+                bezier3Path.lineTo(2f, 8f);
+                bezier3Path.lineTo(2f, 5.5f);
+                bezier3Path.cubicTo(2f, 2.46f, 4.46f, 0f, 7.5f, 0f);
+                bezier3Path.close();
+                
+                paint.reset();
+                paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+                paint.setStrokeWidth(4f);
+                paint.setStrokeMiter(10f);
+                canvas.save();
+                paint.setStyle(Paint.Style.STROKE);
+                paint.setColor(lockColor);
+                canvas.drawPath(bezier3Path, paint);
+                canvas.restore();
+                
+                canvas.restore();
+            }
+        }
+        
+        canvas.restore();
+    }
+    
+    private static class CacheForGuildCrest {
+        private static Paint paint = new Paint();
+        private static RectF originalFrame = new RectF(0f, 0f, 40f, 38f);
+        private static RectF resizedFrame = new RectF();
+        private static RectF group = new RectF();
+        private static Path clip5Path = new Path();
+        private static RectF rectangleRect = new RectF();
+        private static Path rectanglePath = new Path();
+        private static RectF rectangle2Rect = new RectF();
+        private static Path rectangle2Path = new Path();
+        private static RectF rectangle4Rect = new RectF();
+        private static Path rectangle4Path = new Path();
+        private static RectF bezier2Rect = new RectF();
+        private static Path bezier2Path = new Path();
+        private static RectF bezier4Rect = new RectF();
+        private static Path bezier4Path = 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 group8 = new RectF();
+        private static Path clip14Path = new Path();
+        private static RectF rectangle3Rect = new RectF();
+        private static Path rectangle3Path = new Path();
+        private static RectF rectangle8Rect = new RectF();
+        private static Path rectangle8Path = new Path();
+        private static RectF rectangle5Rect = new RectF();
+        private static Path rectangle5Path = new Path();
+        private static RectF bezier3Rect = new RectF();
+        private static Path bezier3Path = new Path();
+        private static RectF bezier6Rect = new RectF();
+        private static Path bezier6Path = 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 bezier13Rect = new RectF();
+        private static Path bezier13Path = 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 labelRect = new RectF();
+        private static TextPaint labelTextPaint = new TextPaint();
+        private static PaintCodeStaticLayout labelStaticLayout = new PaintCodeStaticLayout();
+    }
+    
+    public static void drawGuildCrest(Canvas canvas, Context context, boolean isOwner, boolean isPublic, float memberCount, String memberCountLabel) {
+        HabiticaIcons.drawGuildCrest(canvas, context, new RectF(0f, 0f, 40f, 38f), ResizingBehavior.AspectFit, isOwner, isPublic, memberCount, memberCountLabel);
+    }
+    
+    public static void drawGuildCrest(Canvas canvas, Context context, RectF targetFrame, ResizingBehavior resizing, boolean isOwner, boolean isPublic, float memberCount, String memberCountLabel) {
+        // General Declarations
+        Stack<Matrix> currentTransformation = new Stack<Matrix>();
+        currentTransformation.push(new Matrix());
+        Paint paint = CacheForGuildCrest.paint;
+        
+        // Local Colors
+        int crestGold2 = Color.argb(255, 255, 210, 145);
+        int crestBronze6 = Color.argb(255, 179, 98, 19);
+        int crestGold1 = Color.argb(255, 255, 188, 90);
+        int crestBronze5 = Color.argb(255, 179, 98, 19);
+        int crestSilver2 = Color.argb(255, 217, 217, 217);
+        int crestBronze4 = Color.argb(255, 215, 122, 32);
+        int crestSilver5 = Color.argb(255, 141, 141, 141);
+        int crestBronze3 = Color.argb(255, 179, 98, 19);
+        int crestGold5 = Color.argb(255, 223, 145, 30);
+        int crestSilver6 = Color.argb(255, 141, 141, 141);
+        int crestBronze2 = Color.argb(255, 244, 165, 89);
+        int crestGold6 = Color.argb(255, 223, 145, 30);
+        int crestSilver4 = Color.argb(255, 175, 175, 175);
+        int crestGold4 = Color.argb(255, 255, 166, 35);
+        int crestSilver3 = Color.argb(255, 141, 141, 141);
+        int crestBronze1 = Color.argb(255, 234, 140, 49);
+        int crestGold3 = Color.argb(255, 223, 145, 30);
+        int crestSilver1 = Color.argb(255, 194, 194, 194);
+        
+        // Local Variables
+        boolean isPrivate = !isPublic;
+        int crestColor1 = memberCount < 100f ? crestBronze1 : (memberCount < 1000f ? crestSilver1 : crestGold1);
+        int crestColor6 = memberCount < 100f ? crestBronze6 : (memberCount < 1000f ? crestSilver6 : crestGold6);
+        int crestColor3 = memberCount < 100f ? crestBronze3 : (memberCount < 1000f ? crestSilver3 : crestGold3);
+        int crestColor4 = memberCount < 100f ? crestBronze4 : (memberCount < 1000f ? crestSilver4 : crestGold4);
+        int crestColor2 = memberCount < 100f ? crestBronze2 : (memberCount < 1000f ? crestSilver2 : crestGold2);
+        int crestColor5 = memberCount < 100f ? crestBronze5 : (memberCount < 1000f ? crestSilver5 : crestGold5);
+        
+        // Resize to Target Frame
+        canvas.save();
+        RectF resizedFrame = CacheForGuildCrest.resizedFrame;
+        HabiticaIcons.resizingBehaviorApply(resizing, CacheForGuildCrest.originalFrame, targetFrame, resizedFrame);
+        canvas.translate(resizedFrame.left, resizedFrame.top);
+        canvas.scale(resizedFrame.width() / 40f, resizedFrame.height() / 38f);
+        
+        // Group
+        if (isPublic) {
+            RectF group = CacheForGuildCrest.group;
+            group.set(0f, 0f, 40f, 38f);
+            canvas.save();
+            
+            // Clip 5
+            Path clip5Path = CacheForGuildCrest.clip5Path;
+            clip5Path.reset();
+            clip5Path.moveTo(20.5f, 38f);
+            clip5Path.lineTo(33.14f, 30.6f);
+            clip5Path.cubicTo(33.01f, 22.28f, 33.81f, 13.48f, 40f, 4.93f);
+            clip5Path.cubicTo(29.47f, 3.77f, 26.58f, 0f, 20.5f, 0f);
+            clip5Path.cubicTo(14.6f, 0f, 10.53f, 3.77f, 0f, 4.93f);
+            clip5Path.cubicTo(6.19f, 13.48f, 6.99f, 22.28f, 6.86f, 30.6f);
+            clip5Path.lineTo(20.5f, 38f);
+            clip5Path.close();
+            canvas.clipPath(clip5Path);
+            
+            // Rectangle
+            RectF rectangleRect = CacheForGuildCrest.rectangleRect;
+            rectangleRect.set(-5f, -5f, 45f, 43f);
+            Path rectanglePath = CacheForGuildCrest.rectanglePath;
+            rectanglePath.reset();
+            rectanglePath.addRect(rectangleRect, Path.Direction.CW);
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(crestColor1);
+            canvas.drawPath(rectanglePath, paint);
+            
+            // Rectangle 2
+            canvas.save();
+            canvas.translate(23.03f, 23.53f);
+            currentTransformation.peek().postTranslate(23.03f, 23.53f);
+            canvas.rotate(-45f);
+            currentTransformation.peek().postRotate(-45f);
+            RectF rectangle2Rect = CacheForGuildCrest.rectangle2Rect;
+            rectangle2Rect.set(-6.01f, -38f, 6.01f, 38f);
+            Path rectangle2Path = CacheForGuildCrest.rectangle2Path;
+            rectangle2Path.reset();
+            rectangle2Path.moveTo(rectangle2Rect.left, rectangle2Rect.top);
+            rectangle2Path.lineTo(rectangle2Rect.right, rectangle2Rect.top);
+            rectangle2Path.lineTo(rectangle2Rect.right, rectangle2Rect.bottom);
+            rectangle2Path.lineTo(rectangle2Rect.left, rectangle2Rect.bottom);
+            rectangle2Path.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(crestColor2);
+            canvas.drawPath(rectangle2Path, paint);
+            canvas.restore();
+            
+            // Rectangle 4
+            canvas.save();
+            canvas.translate(35f, 22f);
+            currentTransformation.peek().postTranslate(35f, 22f);
+            canvas.rotate(-45f);
+            currentTransformation.peek().postRotate(-45f);
+            RectF rectangle4Rect = CacheForGuildCrest.rectangle4Rect;
+            rectangle4Rect.set(-1f, -38f, 1f, 38f);
+            Path rectangle4Path = CacheForGuildCrest.rectangle4Path;
+            rectangle4Path.reset();
+            rectangle4Path.addRect(rectangle4Rect, Path.Direction.CW);
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(crestColor2);
+            canvas.drawPath(rectangle4Path, paint);
+            canvas.restore();
+            
+            // Bezier 2
+            RectF bezier2Rect = CacheForGuildCrest.bezier2Rect;
+            bezier2Rect.set(0f, 0f, 40f, 38f);
+            Path bezier2Path = CacheForGuildCrest.bezier2Path;
+            bezier2Path.reset();
+            bezier2Path.moveTo(20.5f, 38f);
+            bezier2Path.lineTo(33.14f, 30.6f);
+            bezier2Path.cubicTo(33.01f, 22.28f, 33.81f, 13.48f, 40f, 4.93f);
+            bezier2Path.cubicTo(29.47f, 3.77f, 26.58f, 0f, 20.5f, 0f);
+            bezier2Path.cubicTo(14.6f, 0f, 10.53f, 3.77f, 0f, 4.93f);
+            bezier2Path.cubicTo(6.19f, 13.48f, 6.99f, 22.28f, 6.86f, 30.6f);
+            bezier2Path.lineTo(20.5f, 38f);
+            bezier2Path.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStrokeWidth(10f);
+            paint.setStrokeMiter(10f);
+            canvas.save();
+            paint.setStyle(Paint.Style.STROKE);
+            paint.setColor(crestColor3);
+            canvas.drawPath(bezier2Path, paint);
+            canvas.restore();
+            
+            // Bezier 4
+            RectF bezier4Rect = CacheForGuildCrest.bezier4Rect;
+            bezier4Rect.set(0f, -0f, 40f, 38f);
+            Path bezier4Path = CacheForGuildCrest.bezier4Path;
+            bezier4Path.reset();
+            bezier4Path.moveTo(20.5f, 38f);
+            bezier4Path.lineTo(33.14f, 30.6f);
+            bezier4Path.cubicTo(33.01f, 22.28f, 33.81f, 13.48f, 40f, 4.93f);
+            bezier4Path.cubicTo(29.47f, 3.77f, 26.58f, -0f, 20.5f, -0f);
+            bezier4Path.cubicTo(14.6f, -0f, 10.53f, 3.77f, 0f, 4.93f);
+            bezier4Path.cubicTo(6.19f, 13.48f, 6.99f, 22.28f, 6.86f, 30.6f);
+            bezier4Path.lineTo(20.5f, 38f);
+            bezier4Path.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStrokeWidth(6f);
+            paint.setStrokeMiter(10f);
+            canvas.save();
+            paint.setStyle(Paint.Style.STROKE);
+            paint.setColor(crestColor4);
+            canvas.drawPath(bezier4Path, paint);
+            canvas.restore();
+            
+            // Bezier 7
+            if (isOwner) {
+                RectF bezier7Rect = CacheForGuildCrest.bezier7Rect;
+                bezier7Rect.set(10.85f, 8.25f, 15.75f, 13.16f);
+                Path bezier7Path = CacheForGuildCrest.bezier7Path;
+                bezier7Path.reset();
+                bezier7Path.moveTo(13.3f, 12.54f);
+                bezier7Path.lineTo(12.37f, 13.05f);
+                bezier7Path.cubicTo(11.89f, 13.31f, 11.57f, 13.08f, 11.65f, 12.55f);
+                bezier7Path.lineTo(11.84f, 11.43f);
+                bezier7Path.lineTo(11.07f, 10.65f);
+                bezier7Path.cubicTo(10.69f, 10.26f, 10.82f, 9.87f, 11.36f, 9.79f);
+                bezier7Path.lineTo(12.4f, 9.63f);
+                bezier7Path.lineTo(12.87f, 8.63f);
+                bezier7Path.cubicTo(13.11f, 8.13f, 13.49f, 8.12f, 13.73f, 8.63f);
+                bezier7Path.lineTo(14.2f, 9.63f);
+                bezier7Path.lineTo(15.24f, 9.79f);
+                bezier7Path.cubicTo(15.78f, 9.87f, 15.92f, 10.25f, 15.53f, 10.65f);
+                bezier7Path.lineTo(14.76f, 11.43f);
+                bezier7Path.lineTo(14.95f, 12.55f);
+                bezier7Path.cubicTo(15.04f, 13.09f, 14.72f, 13.32f, 14.23f, 13.05f);
+                bezier7Path.lineTo(13.3f, 12.54f);
+                bezier7Path.close();
+                
+                paint.reset();
+                paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+                bezier7Path.setFillType(Path.FillType.EVEN_ODD);
+                paint.setStyle(Paint.Style.FILL);
+                paint.setColor(crestColor6);
+                canvas.drawPath(bezier7Path, paint);
+            }
+            
+            // Bezier 8
+            if (isOwner) {
+                RectF bezier8Rect = CacheForGuildCrest.bezier8Rect;
+                bezier8Rect.set(24.25f, 8.25f, 29.15f, 13.16f);
+                Path bezier8Path = CacheForGuildCrest.bezier8Path;
+                bezier8Path.reset();
+                bezier8Path.moveTo(26.7f, 12.54f);
+                bezier8Path.lineTo(25.77f, 13.05f);
+                bezier8Path.cubicTo(25.29f, 13.31f, 24.97f, 13.08f, 25.05f, 12.55f);
+                bezier8Path.lineTo(25.24f, 11.43f);
+                bezier8Path.lineTo(24.47f, 10.65f);
+                bezier8Path.cubicTo(24.09f, 10.26f, 24.22f, 9.87f, 24.76f, 9.79f);
+                bezier8Path.lineTo(25.8f, 9.63f);
+                bezier8Path.lineTo(26.27f, 8.63f);
+                bezier8Path.cubicTo(26.51f, 8.13f, 26.89f, 8.12f, 27.13f, 8.63f);
+                bezier8Path.lineTo(27.6f, 9.63f);
+                bezier8Path.lineTo(28.64f, 9.79f);
+                bezier8Path.cubicTo(29.18f, 9.87f, 29.32f, 10.25f, 28.93f, 10.65f);
+                bezier8Path.lineTo(28.16f, 11.43f);
+                bezier8Path.lineTo(28.35f, 12.55f);
+                bezier8Path.cubicTo(28.44f, 13.09f, 28.12f, 13.32f, 27.63f, 13.05f);
+                bezier8Path.lineTo(26.7f, 12.54f);
+                bezier8Path.close();
+                
+                paint.reset();
+                paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+                bezier8Path.setFillType(Path.FillType.EVEN_ODD);
+                paint.setStyle(Paint.Style.FILL);
+                paint.setColor(crestColor6);
+                canvas.drawPath(bezier8Path, paint);
+            }
+            
+            canvas.restore();
+        }
+        
+        // Group 8
+        if (isPrivate) {
+            RectF group8 = CacheForGuildCrest.group8;
+            group8.set(3f, 0f, 37f, 38f);
+            canvas.save();
+            
+            // Clip 14
+            Path clip14Path = CacheForGuildCrest.clip14Path;
+            clip14Path.reset();
+            clip14Path.moveTo(20f, 0f);
+            clip14Path.lineTo(3f, 7.62f);
+            clip14Path.cubicTo(3f, 22.85f, 5.07f, 31.47f, 20f, 38f);
+            clip14Path.cubicTo(34.93f, 31.47f, 37f, 22.85f, 37f, 7.62f);
+            clip14Path.lineTo(20f, 0f);
+            clip14Path.close();
+            canvas.clipPath(clip14Path);
+            
+            // Rectangle 3
+            RectF rectangle3Rect = CacheForGuildCrest.rectangle3Rect;
+            rectangle3Rect.set(2f, 0f, 37f, 38f);
+            Path rectangle3Path = CacheForGuildCrest.rectangle3Path;
+            rectangle3Path.reset();
+            rectangle3Path.addRect(rectangle3Rect, Path.Direction.CW);
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(crestColor1);
+            canvas.drawPath(rectangle3Path, paint);
+            
+            // Rectangle 8
+            canvas.save();
+            canvas.translate(23.7f, 10.7f);
+            currentTransformation.peek().postTranslate(23.7f, 10.7f);
+            canvas.rotate(-45f);
+            currentTransformation.peek().postRotate(-45f);
+            RectF rectangle8Rect = CacheForGuildCrest.rectangle8Rect;
+            rectangle8Rect.set(-1f, -11f, 1f, 11f);
+            Path rectangle8Path = CacheForGuildCrest.rectangle8Path;
+            rectangle8Path.reset();
+            rectangle8Path.addRect(rectangle8Rect, Path.Direction.CW);
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(crestColor2);
+            canvas.drawPath(rectangle8Path, paint);
+            canvas.restore();
+            
+            // Rectangle 5
+            canvas.save();
+            canvas.translate(17.73f, 24f);
+            currentTransformation.peek().postTranslate(17.73f, 24f);
+            canvas.rotate(45f);
+            currentTransformation.peek().postRotate(45f);
+            RectF rectangle5Rect = CacheForGuildCrest.rectangle5Rect;
+            rectangle5Rect.set(-19f, -10f, 19f, 10f);
+            Path rectangle5Path = CacheForGuildCrest.rectangle5Path;
+            rectangle5Path.reset();
+            rectangle5Path.addRect(rectangle5Rect, Path.Direction.CW);
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(crestColor2);
+            canvas.drawPath(rectangle5Path, paint);
+            canvas.restore();
+            
+            // Bezier 3
+            RectF bezier3Rect = CacheForGuildCrest.bezier3Rect;
+            bezier3Rect.set(3f, 0f, 37f, 38f);
+            Path bezier3Path = CacheForGuildCrest.bezier3Path;
+            bezier3Path.reset();
+            bezier3Path.moveTo(20f, 0f);
+            bezier3Path.lineTo(3f, 7.62f);
+            bezier3Path.cubicTo(3f, 22.85f, 5.07f, 31.47f, 20f, 38f);
+            bezier3Path.cubicTo(34.93f, 31.47f, 37f, 22.85f, 37f, 7.62f);
+            bezier3Path.lineTo(20f, 0f);
+            bezier3Path.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStrokeWidth(10f);
+            paint.setStrokeMiter(10f);
+            canvas.save();
+            paint.setStyle(Paint.Style.STROKE);
+            paint.setColor(crestColor3);
+            canvas.drawPath(bezier3Path, paint);
+            canvas.restore();
+            
+            // Bezier 6
+            RectF bezier6Rect = CacheForGuildCrest.bezier6Rect;
+            bezier6Rect.set(3f, 0f, 37f, 38f);
+            Path bezier6Path = CacheForGuildCrest.bezier6Path;
+            bezier6Path.reset();
+            bezier6Path.moveTo(20f, 0f);
+            bezier6Path.lineTo(3f, 7.62f);
+            bezier6Path.cubicTo(3f, 22.85f, 5.07f, 31.47f, 20f, 38f);
+            bezier6Path.cubicTo(34.93f, 31.47f, 37f, 22.85f, 37f, 7.62f);
+            bezier6Path.lineTo(20f, 0f);
+            bezier6Path.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStrokeWidth(6f);
+            paint.setStrokeMiter(10f);
+            canvas.save();
+            paint.setStyle(Paint.Style.STROKE);
+            paint.setColor(crestColor4);
+            canvas.drawPath(bezier6Path, paint);
+            canvas.restore();
+            
+            // Bezier 14
+            if (isOwner) {
+                RectF bezier14Rect = CacheForGuildCrest.bezier14Rect;
+                bezier14Rect.set(25.85f, 10.85f, 30.75f, 15.76f);
+                Path bezier14Path = CacheForGuildCrest.bezier14Path;
+                bezier14Path.reset();
+                bezier14Path.moveTo(28.3f, 15.14f);
+                bezier14Path.lineTo(27.37f, 15.65f);
+                bezier14Path.cubicTo(26.89f, 15.91f, 26.57f, 15.69f, 26.65f, 15.15f);
+                bezier14Path.lineTo(26.84f, 14.03f);
+                bezier14Path.lineTo(26.07f, 13.25f);
+                bezier14Path.cubicTo(25.69f, 12.86f, 25.82f, 12.47f, 26.36f, 12.39f);
+                bezier14Path.lineTo(27.4f, 12.23f);
+                bezier14Path.lineTo(27.87f, 11.23f);
+                bezier14Path.cubicTo(28.11f, 10.73f, 28.49f, 10.72f, 28.73f, 11.23f);
+                bezier14Path.lineTo(29.2f, 12.23f);
+                bezier14Path.lineTo(30.24f, 12.39f);
+                bezier14Path.cubicTo(30.78f, 12.47f, 30.92f, 12.85f, 30.53f, 13.25f);
+                bezier14Path.lineTo(29.76f, 14.03f);
+                bezier14Path.lineTo(29.95f, 15.15f);
+                bezier14Path.cubicTo(30.04f, 15.69f, 29.72f, 15.92f, 29.23f, 15.65f);
+                bezier14Path.lineTo(28.3f, 15.14f);
+                bezier14Path.close();
+                
+                paint.reset();
+                paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+                bezier14Path.setFillType(Path.FillType.EVEN_ODD);
+                paint.setStyle(Paint.Style.FILL);
+                paint.setColor(crestColor6);
+                canvas.drawPath(bezier14Path, paint);
+            }
+            
+            // Bezier 15
+            if (isOwner) {
+                RectF bezier15Rect = CacheForGuildCrest.bezier15Rect;
+                bezier15Rect.set(9.25f, 10.85f, 14.15f, 15.76f);
+                Path bezier15Path = CacheForGuildCrest.bezier15Path;
+                bezier15Path.reset();
+                bezier15Path.moveTo(11.7f, 15.14f);
+                bezier15Path.lineTo(10.77f, 15.65f);
+                bezier15Path.cubicTo(10.29f, 15.91f, 9.97f, 15.69f, 10.05f, 15.15f);
+                bezier15Path.lineTo(10.24f, 14.03f);
+                bezier15Path.lineTo(9.47f, 13.25f);
+                bezier15Path.cubicTo(9.09f, 12.86f, 9.22f, 12.47f, 9.76f, 12.39f);
+                bezier15Path.lineTo(10.8f, 12.23f);
+                bezier15Path.lineTo(11.27f, 11.23f);
+                bezier15Path.cubicTo(11.51f, 10.73f, 11.89f, 10.72f, 12.13f, 11.23f);
+                bezier15Path.lineTo(12.6f, 12.23f);
+                bezier15Path.lineTo(13.64f, 12.39f);
+                bezier15Path.cubicTo(14.18f, 12.47f, 14.32f, 12.85f, 13.93f, 13.25f);
+                bezier15Path.lineTo(13.16f, 14.03f);
+                bezier15Path.lineTo(13.35f, 15.15f);
+                bezier15Path.cubicTo(13.44f, 15.69f, 13.12f, 15.92f, 12.63f, 15.65f);
+                bezier15Path.lineTo(11.7f, 15.14f);
+                bezier15Path.close();
+                
+                paint.reset();
+                paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+                bezier15Path.setFillType(Path.FillType.EVEN_ODD);
+                paint.setStyle(Paint.Style.FILL);
+                paint.setColor(crestColor6);
+                canvas.drawPath(bezier15Path, paint);
+            }
+            
+            canvas.restore();
+        }
+        
+        // Bezier 13
+        RectF bezier13Rect = CacheForGuildCrest.bezier13Rect;
+        bezier13Rect.set(15f, 7f, 25f, 17f);
+        Path bezier13Path = CacheForGuildCrest.bezier13Path;
+        bezier13Path.reset();
+        bezier13Path.moveTo(20f, 12.72f);
+        bezier13Path.cubicTo(18.33f, 12.72f, 15f, 13.55f, 15f, 15.22f);
+        bezier13Path.lineTo(15f, 17f);
+        bezier13Path.lineTo(25f, 17f);
+        bezier13Path.lineTo(25f, 15.22f);
+        bezier13Path.cubicTo(25f, 13.55f, 21.67f, 12.72f, 20f, 12.72f);
+        bezier13Path.close();
+        bezier13Path.moveTo(20f, 7f);
+        bezier13Path.cubicTo(18.82f, 7f, 17.86f, 7.96f, 17.86f, 9.14f);
+        bezier13Path.cubicTo(17.86f, 10.33f, 18.82f, 11.29f, 20f, 11.29f);
+        bezier13Path.cubicTo(21.18f, 11.29f, 22.14f, 10.33f, 22.14f, 9.14f);
+        bezier13Path.cubicTo(22.14f, 7.96f, 21.18f, 7f, 20f, 7f);
+        bezier13Path.close();
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        bezier13Path.setFillType(Path.FillType.EVEN_ODD);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(crestColor6);
+        canvas.drawPath(bezier13Path, paint);
+        
+        // Bezier 10
+        RectF bezier10Rect = CacheForGuildCrest.bezier10Rect;
+        bezier10Rect.set(2f, 19f, 38f, 34f);
+        Path bezier10Path = CacheForGuildCrest.bezier10Path;
+        bezier10Path.reset();
+        bezier10Path.moveTo(2f, 26.5f);
+        bezier10Path.cubicTo(2f, 22.36f, 5.35f, 19f, 9.5f, 19f);
+        bezier10Path.lineTo(30.5f, 19f);
+        bezier10Path.cubicTo(34.64f, 19f, 38f, 22.37f, 38f, 26.5f);
+        bezier10Path.lineTo(38f, 26.5f);
+        bezier10Path.cubicTo(38f, 30.64f, 34.65f, 34f, 30.5f, 34f);
+        bezier10Path.lineTo(9.5f, 34f);
+        bezier10Path.cubicTo(5.36f, 34f, 2f, 30.63f, 2f, 26.5f);
+        bezier10Path.lineTo(2f, 26.5f);
+        bezier10Path.close();
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        bezier10Path.setFillType(Path.FillType.EVEN_ODD);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(Color.WHITE);
+        canvas.drawPath(bezier10Path, paint);
+        
+        // Bezier 11
+        RectF bezier11Rect = CacheForGuildCrest.bezier11Rect;
+        bezier11Rect.set(2f, 19f, 38f, 34f);
+        Path bezier11Path = CacheForGuildCrest.bezier11Path;
+        bezier11Path.reset();
+        bezier11Path.moveTo(2f, 26.5f);
+        bezier11Path.cubicTo(2f, 22.36f, 5.35f, 19f, 9.5f, 19f);
+        bezier11Path.lineTo(30.5f, 19f);
+        bezier11Path.cubicTo(34.64f, 19f, 38f, 22.37f, 38f, 26.5f);
+        bezier11Path.lineTo(38f, 26.5f);
+        bezier11Path.cubicTo(38f, 30.64f, 34.65f, 34f, 30.5f, 34f);
+        bezier11Path.lineTo(9.5f, 34f);
+        bezier11Path.cubicTo(5.36f, 34f, 2f, 30.63f, 2f, 26.5f);
+        bezier11Path.lineTo(2f, 26.5f);
+        bezier11Path.close();
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStrokeWidth(2f);
+        paint.setStrokeMiter(10f);
+        canvas.save();
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setColor(crestColor3);
+        canvas.drawPath(bezier11Path, paint);
+        canvas.restore();
+        
+        // Label
+        RectF labelRect = CacheForGuildCrest.labelRect;
+        labelRect.set(4f, 20f, 36f, 33f);
+        TextPaint labelTextPaint = CacheForGuildCrest.labelTextPaint;
+        labelTextPaint.reset();
+        labelTextPaint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        labelTextPaint.setColor(crestColor5);
+        labelTextPaint.setTypeface(Typeface.createFromAsset(context.getAssets(), "HelveticaNeue.ttc"));
+        labelTextPaint.setTextSize(12f);
+        StaticLayout labelStaticLayout = CacheForGuildCrest.labelStaticLayout.get((int) labelRect.width(), Layout.Alignment.ALIGN_CENTER, memberCountLabel, labelTextPaint);
+        canvas.save();
+        canvas.clipRect(labelRect);
+        canvas.translate(labelRect.left, labelRect.top + (labelRect.height() - labelStaticLayout.getHeight()) / 2f);
+        labelStaticLayout.draw(canvas);
+        canvas.restore();
+        
+        canvas.restore();
+    }
+    
+    private static class CacheForGuildCrestMedium {
+        private static Paint paint = new Paint();
+        private static RectF originalFrame = new RectF(0f, 0f, 30f, 34f);
+        private static RectF resizedFrame = new RectF();
+        private static RectF group = new RectF();
+        private static Path clip5Path = new Path();
+        private static RectF rectangleRect = new RectF();
+        private static Path rectanglePath = new Path();
+        private static RectF rectangle2Rect = new RectF();
+        private static Path rectangle2Path = new Path();
+        private static RectF rectangle4Rect = new RectF();
+        private static Path rectangle4Path = new Path();
+        private static RectF bezier2Rect = new RectF();
+        private static Path bezier2Path = new Path();
+        private static RectF bezier4Rect = new RectF();
+        private static Path bezier4Path = new Path();
+        private static RectF bezier6Rect = new RectF();
+        private static Path bezier6Path = new Path();
+    }
+    
+    public static void drawGuildCrestMedium(Canvas canvas, float memberCount) {
+        HabiticaIcons.drawGuildCrestMedium(canvas, new RectF(0f, 0f, 30f, 34f), ResizingBehavior.AspectFit, memberCount);
+    }
+    
+    public static void drawGuildCrestMedium(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, float memberCount) {
+        // General Declarations
+        Stack<Matrix> currentTransformation = new Stack<Matrix>();
+        currentTransformation.push(new Matrix());
+        Paint paint = CacheForGuildCrestMedium.paint;
+        
+        // Local Colors
+        int crestGold2 = Color.argb(255, 255, 210, 145);
+        int crestBronze6 = Color.argb(255, 179, 98, 19);
+        int crestGold1 = Color.argb(255, 255, 188, 90);
+        int crestSilver2 = Color.argb(255, 217, 217, 217);
+        int crestBronze4 = Color.argb(255, 215, 122, 32);
+        int crestBronze3 = Color.argb(255, 179, 98, 19);
+        int crestSilver6 = Color.argb(255, 141, 141, 141);
+        int crestBronze2 = Color.argb(255, 244, 165, 89);
+        int crestGold6 = Color.argb(255, 223, 145, 30);
+        int crestSilver4 = Color.argb(255, 175, 175, 175);
+        int crestGold4 = Color.argb(255, 255, 166, 35);
+        int crestSilver3 = Color.argb(255, 141, 141, 141);
+        int crestBronze1 = Color.argb(255, 234, 140, 49);
+        int crestGold3 = Color.argb(255, 223, 145, 30);
+        int crestSilver1 = Color.argb(255, 194, 194, 194);
+        
+        // Local Variables
+        int crestColor3 = memberCount < 100f ? crestBronze3 : (memberCount < 1000f ? crestSilver3 : crestGold3);
+        int crestColor6 = memberCount < 100f ? crestBronze6 : (memberCount < 1000f ? crestSilver6 : crestGold6);
+        int crestColor1 = memberCount < 100f ? crestBronze1 : (memberCount < 1000f ? crestSilver1 : crestGold1);
+        int crestColor4 = memberCount < 100f ? crestBronze4 : (memberCount < 1000f ? crestSilver4 : crestGold4);
+        int crestColor2 = memberCount < 100f ? crestBronze2 : (memberCount < 1000f ? crestSilver2 : crestGold2);
+        
+        // Resize to Target Frame
+        canvas.save();
+        RectF resizedFrame = CacheForGuildCrestMedium.resizedFrame;
+        HabiticaIcons.resizingBehaviorApply(resizing, CacheForGuildCrestMedium.originalFrame, targetFrame, resizedFrame);
+        canvas.translate(resizedFrame.left, resizedFrame.top);
+        canvas.scale(resizedFrame.width() / 30f, resizedFrame.height() / 34f);
+        
+        // Group
+        {
+            RectF group = CacheForGuildCrestMedium.group;
+            group.set(0f, 0f, 30f, 34f);
+            canvas.save();
+            
+            // Clip 5
+            Path clip5Path = CacheForGuildCrestMedium.clip5Path;
+            clip5Path.reset();
+            clip5Path.moveTo(15f, 0f);
+            clip5Path.lineTo(0f, 7f);
+            clip5Path.cubicTo(0f, 21f, 1f, 28f, 15f, 34f);
+            clip5Path.cubicTo(29f, 28f, 30f, 21f, 30f, 7f);
+            clip5Path.lineTo(15f, 0f);
+            clip5Path.close();
+            canvas.clipPath(clip5Path);
+            
+            // Rectangle
+            RectF rectangleRect = CacheForGuildCrestMedium.rectangleRect;
+            rectangleRect.set(-5f, -5f, 35f, 39f);
+            Path rectanglePath = CacheForGuildCrestMedium.rectanglePath;
+            rectanglePath.reset();
+            rectanglePath.addRect(rectangleRect, Path.Direction.CW);
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(crestColor1);
+            canvas.drawPath(rectanglePath, paint);
+            
+            // Rectangle 2
+            canvas.save();
+            canvas.translate(14.44f, 17.06f);
+            currentTransformation.peek().postTranslate(14.44f, 17.06f);
+            canvas.rotate(45f);
+            currentTransformation.peek().postRotate(45f);
+            RectF rectangle2Rect = CacheForGuildCrestMedium.rectangle2Rect;
+            rectangle2Rect.set(-12.37f, -4f, 12.37f, 4f);
+            Path rectangle2Path = CacheForGuildCrestMedium.rectangle2Path;
+            rectangle2Path.reset();
+            rectangle2Path.moveTo(rectangle2Rect.left, rectangle2Rect.top);
+            rectangle2Path.lineTo(rectangle2Rect.right, rectangle2Rect.top);
+            rectangle2Path.lineTo(rectangle2Rect.right, rectangle2Rect.bottom);
+            rectangle2Path.lineTo(rectangle2Rect.left, rectangle2Rect.bottom);
+            rectangle2Path.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(crestColor2);
+            canvas.drawPath(rectangle2Path, paint);
+            canvas.restore();
+            
+            // Rectangle 4
+            canvas.save();
+            canvas.translate(17.86f, 10.71f);
+            currentTransformation.peek().postTranslate(17.86f, 10.71f);
+            canvas.rotate(-45f);
+            currentTransformation.peek().postRotate(-45f);
+            RectF rectangle4Rect = CacheForGuildCrestMedium.rectangle4Rect;
+            rectangle4Rect.set(-1f, -12.5f, 1f, 12.5f);
+            Path rectangle4Path = CacheForGuildCrestMedium.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(crestColor2);
+            canvas.drawPath(rectangle4Path, paint);
+            canvas.restore();
+            
+            // Bezier 2
+            RectF bezier2Rect = CacheForGuildCrestMedium.bezier2Rect;
+            bezier2Rect.set(0f, 0f, 30f, 34f);
+            Path bezier2Path = CacheForGuildCrestMedium.bezier2Path;
+            bezier2Path.reset();
+            bezier2Path.moveTo(15f, 0f);
+            bezier2Path.lineTo(0f, 7f);
+            bezier2Path.cubicTo(0f, 21f, 1f, 28f, 15f, 34f);
+            bezier2Path.cubicTo(29f, 28f, 30f, 21f, 30f, 7f);
+            bezier2Path.lineTo(15f, 0f);
+            bezier2Path.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStrokeWidth(10f);
+            paint.setStrokeMiter(10f);
+            canvas.save();
+            paint.setStyle(Paint.Style.STROKE);
+            paint.setColor(crestColor3);
+            canvas.drawPath(bezier2Path, paint);
+            canvas.restore();
+            
+            // Bezier 4
+            RectF bezier4Rect = CacheForGuildCrestMedium.bezier4Rect;
+            bezier4Rect.set(0f, 0f, 30f, 34f);
+            Path bezier4Path = CacheForGuildCrestMedium.bezier4Path;
+            bezier4Path.reset();
+            bezier4Path.moveTo(15f, 0f);
+            bezier4Path.lineTo(0f, 7f);
+            bezier4Path.cubicTo(0f, 21f, 1f, 28f, 15f, 34f);
+            bezier4Path.cubicTo(29f, 28f, 30f, 21f, 30f, 7f);
+            bezier4Path.lineTo(15f, 0f);
+            bezier4Path.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStrokeWidth(6f);
+            paint.setStrokeMiter(10f);
+            canvas.save();
+            paint.setStyle(Paint.Style.STROKE);
+            paint.setColor(crestColor4);
+            canvas.drawPath(bezier4Path, paint);
+            canvas.restore();
+            
+            // Bezier 6
+            RectF bezier6Rect = CacheForGuildCrestMedium.bezier6Rect;
+            bezier6Rect.set(10f, 11f, 20f, 21f);
+            Path bezier6Path = CacheForGuildCrestMedium.bezier6Path;
+            bezier6Path.reset();
+            bezier6Path.moveTo(15f, 16.72f);
+            bezier6Path.cubicTo(13.33f, 16.72f, 10f, 17.55f, 10f, 19.22f);
+            bezier6Path.lineTo(10f, 21f);
+            bezier6Path.lineTo(20f, 21f);
+            bezier6Path.lineTo(20f, 19.22f);
+            bezier6Path.cubicTo(20f, 17.55f, 16.67f, 16.72f, 15f, 16.72f);
+            bezier6Path.close();
+            bezier6Path.moveTo(15f, 11f);
+            bezier6Path.cubicTo(13.82f, 11f, 12.86f, 11.96f, 12.86f, 13.14f);
+            bezier6Path.cubicTo(12.86f, 14.33f, 13.82f, 15.29f, 15f, 15.29f);
+            bezier6Path.cubicTo(16.18f, 15.29f, 17.14f, 14.33f, 17.14f, 13.14f);
+            bezier6Path.cubicTo(17.14f, 11.96f, 16.18f, 11f, 15f, 11f);
+            bezier6Path.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            bezier6Path.setFillType(Path.FillType.EVEN_ODD);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(crestColor6);
+            canvas.drawPath(bezier6Path, paint);
+            
+            canvas.restore();
+        }
+        
+        canvas.restore();
+    }
+    
+    private static class CacheForGuildCrestSmall {
+        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();
+        private static RectF bezier2Rect = new RectF();
+        private static Path bezier2Path = new Path();
+    }
+    
+    public static void drawGuildCrestSmall(Canvas canvas, float memberCount) {
+        HabiticaIcons.drawGuildCrestSmall(canvas, new RectF(0f, 0f, 16f, 16f), ResizingBehavior.AspectFit, memberCount);
+    }
+    
+    public static void drawGuildCrestSmall(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, float memberCount) {
+        // General Declarations
+        Paint paint = CacheForGuildCrestSmall.paint;
+        
+        // Local Colors
+        int fillColor37 = Color.argb(255, 255, 255, 255);
+        int crestGold4 = Color.argb(255, 255, 166, 35);
+        int crestSilver4 = Color.argb(255, 175, 175, 175);
+        int crestBronze4 = Color.argb(255, 215, 122, 32);
+        
+        // Local Variables
+        int crestColor4 = memberCount < 100f ? crestBronze4 : (memberCount < 1000f ? crestSilver4 : crestGold4);
+        
+        // Resize to Target Frame
+        canvas.save();
+        RectF resizedFrame = CacheForGuildCrestSmall.resizedFrame;
+        HabiticaIcons.resizingBehaviorApply(resizing, CacheForGuildCrestSmall.originalFrame, targetFrame, resizedFrame);
+        canvas.translate(resizedFrame.left, resizedFrame.top);
+        canvas.scale(resizedFrame.width() / 16f, resizedFrame.height() / 16f);
+        
+        // Bezier
+        RectF bezierRect = CacheForGuildCrestSmall.bezierRect;
+        bezierRect.set(0f, 0f, 16f, 16f);
+        Path bezierPath = CacheForGuildCrestSmall.bezierPath;
+        bezierPath.reset();
+        bezierPath.moveTo(15.94f, 3.41f);
+        bezierPath.cubicTo(15.94f, 2.94f, 15.69f, 2.5f, 15.18f, 2.25f);
+        bezierPath.cubicTo(13.64f, 1.5f, 9.97f, 0f, 8f, 0f);
+        bezierPath.cubicTo(6.02f, 0f, 2.36f, 1.5f, 0.82f, 2.25f);
+        bezierPath.cubicTo(0.31f, 2.5f, 0.06f, 2.94f, 0.05f, 3.41f);
+        bezierPath.cubicTo(0.01f, 5.65f, -0.93f, 12.24f, 7.1f, 15.81f);
+        bezierPath.cubicTo(7.65f, 16.05f, 8.35f, 16.07f, 8.9f, 15.81f);
+        bezierPath.cubicTo(16.95f, 12.24f, 15.98f, 5.65f, 15.94f, 3.41f);
+        bezierPath.close();
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        bezierPath.setFillType(Path.FillType.EVEN_ODD);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(crestColor4);
+        canvas.drawPath(bezierPath, paint);
+        
+        // Bezier 2
+        RectF bezier2Rect = CacheForGuildCrestSmall.bezier2Rect;
+        bezier2Rect.set(4f, 3f, 12f, 11f);
+        Path bezier2Path = CacheForGuildCrestSmall.bezier2Path;
+        bezier2Path.reset();
+        bezier2Path.moveTo(8f, 7.57f);
+        bezier2Path.cubicTo(6.67f, 7.57f, 4f, 8.24f, 4f, 9.57f);
+        bezier2Path.lineTo(4f, 11f);
+        bezier2Path.lineTo(12f, 11f);
+        bezier2Path.lineTo(12f, 9.57f);
+        bezier2Path.cubicTo(12f, 8.24f, 9.33f, 7.57f, 8f, 7.57f);
+        bezier2Path.close();
+        bezier2Path.moveTo(8f, 3f);
+        bezier2Path.cubicTo(7.05f, 3f, 6.29f, 3.77f, 6.29f, 4.71f);
+        bezier2Path.cubicTo(6.29f, 5.66f, 7.05f, 6.43f, 8f, 6.43f);
+        bezier2Path.cubicTo(8.95f, 6.43f, 9.71f, 5.66f, 9.71f, 4.71f);
+        bezier2Path.cubicTo(9.71f, 3.77f, 8.95f, 3f, 8f, 3f);
+        bezier2Path.close();
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        bezier2Path.setFillType(Path.FillType.EVEN_ODD);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(fillColor37);
+        canvas.drawPath(bezier2Path, paint);
+        
+        canvas.restore();
+    }
+    
+    private static class CacheForGuildHeaderCrest {
+        private static Paint paint = new Paint();
+        private static RectF originalFrame = new RectF(0f, 0f, 116f, 58f);
+        private static RectF resizedFrame = new RectF();
+        private static RectF group6 = new RectF();
+        private static Path clip6Path = new Path();
+        private static RectF bezier3Rect = new RectF();
+        private static Path bezier3Path = new Path();
+        private static RectF group11 = new RectF();
+        private static Path clip13Path = new Path();
+        private static RectF rectangleRect = new RectF();
+        private static Path rectanglePath = new Path();
+        private static RectF rectangle2Rect = new RectF();
+        private static Path rectangle2Path = new Path();
+        private static RectF rectangle5Rect = new RectF();
+        private static Path rectangle5Path = new Path();
+        private static RectF bezier10Rect = new RectF();
+        private static Path bezier10Path = 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 bezier16Rect = new RectF();
+        private static Path bezier16Path = new Path();
+        private static RectF bezier17Rect = new RectF();
+        private static Path bezier17Path = new Path();
+        private static RectF bezier18Rect = new RectF();
+        private static Path bezier18Path = new Path();
+        private static RectF bezier19Rect = new RectF();
+        private static Path bezier19Path = new Path();
+        private static RectF bezier20Rect = new RectF();
+        private static Path bezier20Path = new Path();
+        private static RectF rectangle9Rect = new RectF();
+        private static Path rectangle9Path = new Path();
+        private static RectF label2Rect = new RectF();
+        private static Path label2Path = new Path();
+    }
+    
+    public static void drawGuildHeaderCrest(Canvas canvas, int guildHeader) {
+        HabiticaIcons.drawGuildHeaderCrest(canvas, new RectF(0f, 0f, 116f, 58f), ResizingBehavior.AspectFit, guildHeader);
+    }
+    
+    public static void drawGuildHeaderCrest(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, int guildHeader) {
+        // General Declarations
+        Stack<Matrix> currentTransformation = new Stack<Matrix>();
+        currentTransformation.push(new Matrix());
+        Paint paint = CacheForGuildHeaderCrest.paint;
+        
+        // Local Colors
+        int guildHeaderDark2 = PaintCodeColor.colorByChangingValue(guildHeader, 0.7f);
+        int guildHeaderDark6 = PaintCodeColor.colorByApplyingHighlight(guildHeaderDark2, 0.3f);
+        int guildHeaderDark8 = PaintCodeColor.colorByApplyingHighlight(guildHeaderDark2, 0.4f);
+        int guildHeaderDark7 = PaintCodeColor.colorByChangingValue(guildHeaderDark8, 1f);
+        int guildHeaderDark3 = PaintCodeColor.colorByChangingValue(guildHeader, 1f);
+        int guildHeaderDark5 = PaintCodeColor.colorByApplyingHighlight(guildHeaderDark3, 0.7f);
+        int guildHeaderDark4 = PaintCodeColor.colorByApplyingHighlight(guildHeaderDark3, 0.15f);
+        int textForeground2 = Color.argb(255, 255, 255, 255);
+        
+        // Resize to Target Frame
+        canvas.save();
+        RectF resizedFrame = CacheForGuildHeaderCrest.resizedFrame;
+        HabiticaIcons.resizingBehaviorApply(resizing, CacheForGuildHeaderCrest.originalFrame, targetFrame, resizedFrame);
+        canvas.translate(resizedFrame.left, resizedFrame.top);
+        canvas.scale(resizedFrame.width() / 116f, resizedFrame.height() / 58f);
+        
+        // Group
+        {
+            // Group 6
+            {
+                RectF group6 = CacheForGuildHeaderCrest.group6;
+                group6.set(34f, 1f, 82f, 57f);
+                canvas.save();
+                
+                // Clip 6
+                Path clip6Path = CacheForGuildHeaderCrest.clip6Path;
+                clip6Path.reset();
+                clip6Path.moveTo(80.23f, 11.47f);
+                clip6Path.lineTo(59.22f, 1.28f);
+                clip6Path.cubicTo(58.45f, 0.91f, 57.55f, 0.91f, 56.78f, 1.28f);
+                clip6Path.lineTo(35.77f, 11.47f);
+                clip6Path.cubicTo(34.84f, 11.92f, 34.22f, 12.84f, 34.14f, 13.89f);
+                clip6Path.cubicTo(34.1f, 14.57f, 33f, 30.58f, 37.73f, 39.77f);
+                clip6Path.cubicTo(41.68f, 47.43f, 49.53f, 52.98f, 56.45f, 56.55f);
+                clip6Path.lineTo(56.72f, 56.69f);
+                clip6Path.cubicTo(57.12f, 56.9f, 57.56f, 57f, 58f, 57f);
+                clip6Path.cubicTo(58.44f, 57f, 58.88f, 56.9f, 59.28f, 56.69f);
+                clip6Path.lineTo(59.55f, 56.55f);
+                clip6Path.cubicTo(66.47f, 52.98f, 74.32f, 47.43f, 78.27f, 39.77f);
+                clip6Path.cubicTo(83.01f, 30.58f, 81.9f, 14.57f, 81.86f, 13.89f);
+                clip6Path.cubicTo(81.78f, 12.84f, 81.16f, 11.92f, 80.23f, 11.47f);
+                clip6Path.close();
+                canvas.clipPath(clip6Path);
+                
+                // Bezier 3
+                RectF bezier3Rect = CacheForGuildHeaderCrest.bezier3Rect;
+                bezier3Rect.set(34f, 1f, 82f, 57f);
+                Path bezier3Path = CacheForGuildHeaderCrest.bezier3Path;
+                bezier3Path.reset();
+                bezier3Path.moveTo(80.23f, 11.47f);
+                bezier3Path.lineTo(59.22f, 1.28f);
+                bezier3Path.cubicTo(58.45f, 0.91f, 57.55f, 0.91f, 56.78f, 1.28f);
+                bezier3Path.lineTo(35.77f, 11.47f);
+                bezier3Path.cubicTo(34.84f, 11.92f, 34.22f, 12.84f, 34.14f, 13.89f);
+                bezier3Path.cubicTo(34.1f, 14.57f, 33f, 30.58f, 37.73f, 39.77f);
+                bezier3Path.cubicTo(41.68f, 47.43f, 49.53f, 52.98f, 56.45f, 56.55f);
+                bezier3Path.lineTo(56.72f, 56.69f);
+                bezier3Path.cubicTo(57.12f, 56.9f, 57.56f, 57f, 58f, 57f);
+                bezier3Path.cubicTo(58.44f, 57f, 58.88f, 56.9f, 59.28f, 56.69f);
+                bezier3Path.lineTo(59.55f, 56.55f);
+                bezier3Path.cubicTo(66.47f, 52.98f, 74.32f, 47.43f, 78.27f, 39.77f);
+                bezier3Path.cubicTo(83.01f, 30.58f, 81.9f, 14.57f, 81.86f, 13.89f);
+                bezier3Path.cubicTo(81.78f, 12.84f, 81.16f, 11.92f, 80.23f, 11.47f);
+                bezier3Path.close();
+                
+                paint.reset();
+                paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+                paint.setStrokeWidth(9f);
+                paint.setStrokeMiter(10f);
+                canvas.save();
+                paint.setStyle(Paint.Style.STROKE);
+                paint.setColor(guildHeaderDark4);
+                canvas.drawPath(bezier3Path, paint);
+                canvas.restore();
+                
+                canvas.restore();
+            }
+            
+            // Group 11
+            {
+                RectF group11 = CacheForGuildHeaderCrest.group11;
+                group11.set(37f, 4.03f, 79f, 53.97f);
+                canvas.save();
+                
+                // Clip 13
+                Path clip13Path = CacheForGuildHeaderCrest.clip13Path;
+                clip13Path.reset();
+                clip13Path.moveTo(77.46f, 13.62f);
+                clip13Path.lineTo(59.06f, 4.28f);
+                clip13Path.cubicTo(58.39f, 3.94f, 57.61f, 3.94f, 56.93f, 4.28f);
+                clip13Path.lineTo(38.55f, 13.62f);
+                clip13Path.cubicTo(37.73f, 14.03f, 37.19f, 14.88f, 37.13f, 15.84f);
+                clip13Path.cubicTo(37.08f, 16.46f, 36.12f, 31.14f, 40.27f, 39.57f);
+                clip13Path.cubicTo(43.72f, 46.58f, 50.59f, 50.29f, 56.65f, 53.56f);
+                clip13Path.lineTo(56.88f, 53.69f);
+                clip13Path.cubicTo(57.23f, 53.88f, 57.62f, 53.97f, 58f, 53.97f);
+                clip13Path.cubicTo(58.38f, 53.97f, 58.77f, 53.88f, 59.12f, 53.69f);
+                clip13Path.lineTo(59.35f, 53.56f);
+                clip13Path.cubicTo(65.41f, 50.29f, 72.28f, 46.58f, 75.73f, 39.57f);
+                clip13Path.cubicTo(79.88f, 31.14f, 78.92f, 16.46f, 78.87f, 15.84f);
+                clip13Path.cubicTo(78.81f, 14.88f, 78.27f, 14.03f, 77.46f, 13.62f);
+                clip13Path.close();
+                canvas.clipPath(clip13Path);
+                
+                // Rectangle
+                RectF rectangleRect = CacheForGuildHeaderCrest.rectangleRect;
+                rectangleRect.set(32f, 1f, 84f, 57f);
+                Path rectanglePath = CacheForGuildHeaderCrest.rectanglePath;
+                rectanglePath.reset();
+                rectanglePath.addRect(rectangleRect, Path.Direction.CW);
+                
+                paint.reset();
+                paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+                paint.setStyle(Paint.Style.FILL);
+                paint.setColor(guildHeaderDark7);
+                canvas.drawPath(rectanglePath, paint);
+                
+                // Rectangle 2
+                canvas.save();
+                canvas.translate(53.06f, 27f);
+                currentTransformation.peek().postTranslate(53.06f, 27f);
+                canvas.rotate(-45f);
+                currentTransformation.peek().postRotate(-45f);
+                RectF rectangle2Rect = CacheForGuildHeaderCrest.rectangle2Rect;
+                rectangle2Rect.set(-8.5f, -25f, 8.5f, 25f);
+                Path rectangle2Path = CacheForGuildHeaderCrest.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(guildHeaderDark5);
+                canvas.drawPath(rectangle2Path, paint);
+                canvas.restore();
+                
+                // Rectangle 5
+                canvas.save();
+                canvas.translate(63.48f, 18.35f);
+                currentTransformation.peek().postTranslate(63.48f, 18.35f);
+                canvas.rotate(45f);
+                currentTransformation.peek().postRotate(45f);
+                RectF rectangle5Rect = CacheForGuildHeaderCrest.rectangle5Rect;
+                rectangle5Rect.set(-15f, -1.5f, 15f, 1.5f);
+                Path rectangle5Path = CacheForGuildHeaderCrest.rectangle5Path;
+                rectangle5Path.reset();
+                rectangle5Path.moveTo(rectangle5Rect.left, rectangle5Rect.top);
+                rectangle5Path.lineTo(rectangle5Rect.right, rectangle5Rect.top);
+                rectangle5Path.lineTo(rectangle5Rect.right, rectangle5Rect.bottom);
+                rectangle5Path.lineTo(rectangle5Rect.left, rectangle5Rect.bottom);
+                rectangle5Path.close();
+                
+                paint.reset();
+                paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+                paint.setStyle(Paint.Style.FILL);
+                paint.setColor(guildHeaderDark5);
+                canvas.drawPath(rectangle5Path, paint);
+                canvas.restore();
+                
+                // Bezier 10
+                RectF bezier10Rect = CacheForGuildHeaderCrest.bezier10Rect;
+                bezier10Rect.set(37f, 4.03f, 79f, 53.97f);
+                Path bezier10Path = CacheForGuildHeaderCrest.bezier10Path;
+                bezier10Path.reset();
+                bezier10Path.moveTo(77.46f, 13.62f);
+                bezier10Path.lineTo(59.06f, 4.28f);
+                bezier10Path.cubicTo(58.39f, 3.94f, 57.61f, 3.94f, 56.93f, 4.28f);
+                bezier10Path.lineTo(38.55f, 13.62f);
+                bezier10Path.cubicTo(37.73f, 14.03f, 37.19f, 14.88f, 37.13f, 15.84f);
+                bezier10Path.cubicTo(37.08f, 16.46f, 36.12f, 31.14f, 40.27f, 39.57f);
+                bezier10Path.cubicTo(43.72f, 46.58f, 50.59f, 50.29f, 56.65f, 53.56f);
+                bezier10Path.lineTo(56.88f, 53.69f);
+                bezier10Path.cubicTo(57.23f, 53.88f, 57.62f, 53.97f, 58f, 53.97f);
+                bezier10Path.cubicTo(58.38f, 53.97f, 58.77f, 53.88f, 59.12f, 53.69f);
+                bezier10Path.lineTo(59.35f, 53.56f);
+                bezier10Path.cubicTo(65.41f, 50.29f, 72.28f, 46.58f, 75.73f, 39.57f);
+                bezier10Path.cubicTo(79.88f, 31.14f, 78.92f, 16.46f, 78.87f, 15.84f);
+                bezier10Path.cubicTo(78.81f, 14.88f, 78.27f, 14.03f, 77.46f, 13.62f);
+                bezier10Path.close();
+                
+                paint.reset();
+                paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+                paint.setStrokeWidth(6f);
+                paint.setStrokeMiter(10f);
+                canvas.save();
+                paint.setStyle(Paint.Style.STROKE);
+                paint.setColor(guildHeader);
+                canvas.drawPath(bezier10Path, paint);
+                canvas.restore();
+                
+                canvas.restore();
+            }
+            
+            // Bezier 13
+            RectF bezier13Rect = CacheForGuildHeaderCrest.bezier13Rect;
+            bezier13Rect.set(50.5f, 13.7f, 65.5f, 28.7f);
+            Path bezier13Path = CacheForGuildHeaderCrest.bezier13Path;
+            bezier13Path.reset();
+            bezier13Path.moveTo(58f, 22.28f);
+            bezier13Path.cubicTo(55.5f, 22.28f, 50.5f, 23.53f, 50.5f, 26.03f);
+            bezier13Path.lineTo(50.5f, 28.7f);
+            bezier13Path.lineTo(65.5f, 28.7f);
+            bezier13Path.lineTo(65.5f, 26.03f);
+            bezier13Path.cubicTo(65.5f, 23.53f, 60.5f, 22.28f, 58f, 22.28f);
+            bezier13Path.close();
+            bezier13Path.moveTo(58f, 13.7f);
+            bezier13Path.cubicTo(56.23f, 13.7f, 54.79f, 15.14f, 54.79f, 16.92f);
+            bezier13Path.cubicTo(54.79f, 18.69f, 56.23f, 20.13f, 58f, 20.13f);
+            bezier13Path.cubicTo(59.78f, 20.13f, 61.2f, 18.69f, 61.2f, 16.92f);
+            bezier13Path.cubicTo(61.2f, 15.14f, 59.78f, 13.7f, 58f, 13.7f);
+            bezier13Path.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            bezier13Path.setFillType(Path.FillType.EVEN_ODD);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(guildHeader);
+            canvas.drawPath(bezier13Path, paint);
+            
+            // Bezier 14
+            RectF bezier14Rect = CacheForGuildHeaderCrest.bezier14Rect;
+            bezier14Rect.set(65.5f, 16.14f, 74.03f, 24.38f);
+            Path bezier14Path = CacheForGuildHeaderCrest.bezier14Path;
+            bezier14Path.reset();
+            bezier14Path.moveTo(69.77f, 23.29f);
+            bezier14Path.lineTo(68.01f, 24.22f);
+            bezier14Path.cubicTo(67.28f, 24.61f, 66.79f, 24.25f, 66.93f, 23.45f);
+            bezier14Path.lineTo(67.27f, 21.46f);
+            bezier14Path.lineTo(65.85f, 20.06f);
+            bezier14Path.cubicTo(65.25f, 19.47f, 65.44f, 18.9f, 66.26f, 18.78f);
+            bezier14Path.lineTo(68.22f, 18.49f);
+            bezier14Path.lineTo(69.1f, 16.7f);
+            bezier14Path.cubicTo(69.47f, 15.95f, 70.06f, 15.95f, 70.43f, 16.7f);
+            bezier14Path.lineTo(71.31f, 18.49f);
+            bezier14Path.lineTo(73.28f, 18.78f);
+            bezier14Path.cubicTo(74.1f, 18.9f, 74.28f, 19.47f, 73.69f, 20.06f);
+            bezier14Path.lineTo(72.26f, 21.46f);
+            bezier14Path.lineTo(72.6f, 23.45f);
+            bezier14Path.cubicTo(72.74f, 24.26f, 72.26f, 24.61f, 71.53f, 24.22f);
+            bezier14Path.lineTo(69.77f, 23.29f);
+            bezier14Path.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            bezier14Path.setFillType(Path.FillType.EVEN_ODD);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(guildHeader);
+            canvas.drawPath(bezier14Path, paint);
+            
+            // Bezier 16
+            RectF bezier16Rect = CacheForGuildHeaderCrest.bezier16Rect;
+            bezier16Rect.set(42.48f, 15.42f, 51.02f, 23.66f);
+            Path bezier16Path = CacheForGuildHeaderCrest.bezier16Path;
+            bezier16Path.reset();
+            bezier16Path.moveTo(46.75f, 22.57f);
+            bezier16Path.lineTo(44.99f, 23.5f);
+            bezier16Path.cubicTo(44.26f, 23.89f, 43.78f, 23.54f, 43.91f, 22.73f);
+            bezier16Path.lineTo(44.25f, 20.74f);
+            bezier16Path.lineTo(42.83f, 19.34f);
+            bezier16Path.cubicTo(42.24f, 18.75f, 42.42f, 18.18f, 43.24f, 18.06f);
+            bezier16Path.lineTo(45.21f, 17.78f);
+            bezier16Path.lineTo(46.09f, 15.98f);
+            bezier16Path.cubicTo(46.45f, 15.23f, 47.05f, 15.23f, 47.41f, 15.98f);
+            bezier16Path.lineTo(48.29f, 17.78f);
+            bezier16Path.lineTo(50.26f, 18.06f);
+            bezier16Path.cubicTo(51.08f, 18.18f, 51.26f, 18.76f, 50.67f, 19.34f);
+            bezier16Path.lineTo(49.25f, 20.74f);
+            bezier16Path.lineTo(49.59f, 22.73f);
+            bezier16Path.cubicTo(49.72f, 23.55f, 49.24f, 23.89f, 48.51f, 23.5f);
+            bezier16Path.lineTo(46.75f, 22.57f);
+            bezier16Path.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            bezier16Path.setFillType(Path.FillType.EVEN_ODD);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(guildHeader);
+            canvas.drawPath(bezier16Path, paint);
+            
+            // Bezier 17
+            RectF bezier17Rect = CacheForGuildHeaderCrest.bezier17Rect;
+            bezier17Rect.set(0f, 34f, 25f, 53f);
+            Path bezier17Path = CacheForGuildHeaderCrest.bezier17Path;
+            bezier17Path.reset();
+            bezier17Path.moveTo(0f, 34f);
+            bezier17Path.lineTo(25f, 34f);
+            bezier17Path.lineTo(25f, 53f);
+            bezier17Path.lineTo(0f, 53f);
+            bezier17Path.lineTo(9f, 43.5f);
+            bezier17Path.lineTo(0f, 34f);
+            bezier17Path.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            bezier17Path.setFillType(Path.FillType.EVEN_ODD);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(guildHeaderDark2);
+            canvas.drawPath(bezier17Path, paint);
+            
+            // Bezier 18
+            RectF bezier18Rect = CacheForGuildHeaderCrest.bezier18Rect;
+            bezier18Rect.set(91f, 34f, 116f, 53f);
+            Path bezier18Path = CacheForGuildHeaderCrest.bezier18Path;
+            bezier18Path.reset();
+            bezier18Path.moveTo(116f, 34f);
+            bezier18Path.lineTo(91f, 34f);
+            bezier18Path.lineTo(91f, 53f);
+            bezier18Path.lineTo(116f, 53f);
+            bezier18Path.lineTo(107f, 43.5f);
+            bezier18Path.lineTo(116f, 34f);
+            bezier18Path.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            bezier18Path.setFillType(Path.FillType.EVEN_ODD);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(guildHeaderDark2);
+            canvas.drawPath(bezier18Path, paint);
+            
+            // Bezier 19
+            RectF bezier19Rect = CacheForGuildHeaderCrest.bezier19Rect;
+            bezier19Rect.set(16f, 41f, 25f, 53f);
+            Path bezier19Path = CacheForGuildHeaderCrest.bezier19Path;
+            bezier19Path.reset();
+            bezier19Path.moveTo(16f, 44f);
+            bezier19Path.lineTo(25f, 53f);
+            bezier19Path.lineTo(25f, 41f);
+            bezier19Path.lineTo(16f, 44f);
+            bezier19Path.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            bezier19Path.setFillType(Path.FillType.EVEN_ODD);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(guildHeaderDark6);
+            canvas.drawPath(bezier19Path, paint);
+            
+            // Bezier 20
+            RectF bezier20Rect = CacheForGuildHeaderCrest.bezier20Rect;
+            bezier20Rect.set(91f, 41f, 100f, 53f);
+            Path bezier20Path = CacheForGuildHeaderCrest.bezier20Path;
+            bezier20Path.reset();
+            bezier20Path.moveTo(100f, 44f);
+            bezier20Path.lineTo(91f, 53f);
+            bezier20Path.lineTo(91f, 41f);
+            bezier20Path.lineTo(100f, 44f);
+            bezier20Path.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            bezier20Path.setFillType(Path.FillType.EVEN_ODD);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(guildHeaderDark6);
+            canvas.drawPath(bezier20Path, paint);
+            
+            // Rectangle 9
+            RectF rectangle9Rect = CacheForGuildHeaderCrest.rectangle9Rect;
+            rectangle9Rect.set(16f, 25f, 100f, 44f);
+            Path rectangle9Path = CacheForGuildHeaderCrest.rectangle9Path;
+            rectangle9Path.reset();
+            rectangle9Path.addRect(rectangle9Rect, Path.Direction.CW);
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(guildHeaderDark2);
+            canvas.drawPath(rectangle9Path, paint);
+            
+            // Label 2
+            RectF label2Rect = CacheForGuildHeaderCrest.label2Rect;
+            label2Rect.set(36.15f, 28.23f, 78.96f, 37.19f);
+            Path label2Path = CacheForGuildHeaderCrest.label2Path;
+            label2Path.reset();
+            label2Path.moveTo(42.98f, 35.93f);
+            label2Path.lineTo(43.28f, 37f);
+            label2Path.lineTo(44f, 37f);
+            label2Path.lineTo(44f, 32.49f);
+            label2Path.lineTo(40.24f, 32.49f);
+            label2Path.lineTo(40.24f, 33.45f);
+            label2Path.lineTo(42.98f, 33.45f);
+            label2Path.cubicTo(42.99f, 33.84f, 42.94f, 34.21f, 42.82f, 34.55f);
+            label2Path.cubicTo(42.7f, 34.89f, 42.52f, 35.18f, 42.29f, 35.43f);
+            label2Path.cubicTo(42.05f, 35.69f, 41.76f, 35.88f, 41.42f, 36.03f);
+            label2Path.cubicTo(41.07f, 36.17f, 40.68f, 36.24f, 40.23f, 36.24f);
+            label2Path.cubicTo(39.75f, 36.24f, 39.33f, 36.15f, 38.96f, 35.96f);
+            label2Path.cubicTo(38.6f, 35.77f, 38.29f, 35.52f, 38.04f, 35.21f);
+            label2Path.cubicTo(37.8f, 34.89f, 37.61f, 34.53f, 37.48f, 34.11f);
+            label2Path.cubicTo(37.35f, 33.7f, 37.29f, 33.27f, 37.29f, 32.82f);
+            label2Path.cubicTo(37.29f, 32.37f, 37.34f, 31.92f, 37.46f, 31.49f);
+            label2Path.cubicTo(37.57f, 31.05f, 37.74f, 30.66f, 37.98f, 30.32f);
+            label2Path.cubicTo(38.21f, 29.98f, 38.52f, 29.71f, 38.89f, 29.5f);
+            label2Path.cubicTo(39.26f, 29.29f, 39.71f, 29.19f, 40.23f, 29.19f);
+            label2Path.cubicTo(40.55f, 29.19f, 40.85f, 29.23f, 41.13f, 29.3f);
+            label2Path.cubicTo(41.42f, 29.38f, 41.67f, 29.49f, 41.9f, 29.64f);
+            label2Path.cubicTo(42.12f, 29.8f, 42.31f, 29.99f, 42.46f, 30.23f);
+            label2Path.cubicTo(42.61f, 30.46f, 42.72f, 30.74f, 42.77f, 31.07f);
+            label2Path.lineTo(43.91f, 31.07f);
+            label2Path.cubicTo(43.83f, 30.57f, 43.68f, 30.14f, 43.46f, 29.78f);
+            label2Path.cubicTo(43.24f, 29.43f, 42.97f, 29.13f, 42.65f, 28.9f);
+            label2Path.cubicTo(42.32f, 28.67f, 41.95f, 28.5f, 41.54f, 28.39f);
+            label2Path.cubicTo(41.13f, 28.28f, 40.69f, 28.23f, 40.23f, 28.23f);
+            label2Path.cubicTo(39.55f, 28.23f, 38.95f, 28.35f, 38.45f, 28.61f);
+            label2Path.cubicTo(37.94f, 28.86f, 37.51f, 29.2f, 37.17f, 29.62f);
+            label2Path.cubicTo(36.83f, 30.04f, 36.58f, 30.54f, 36.41f, 31.1f);
+            label2Path.cubicTo(36.23f, 31.67f, 36.15f, 32.26f, 36.15f, 32.88f);
+            label2Path.cubicTo(36.15f, 33.44f, 36.24f, 33.98f, 36.42f, 34.5f);
+            label2Path.cubicTo(36.61f, 35.02f, 36.88f, 35.48f, 37.23f, 35.88f);
+            label2Path.cubicTo(37.58f, 36.28f, 38.01f, 36.6f, 38.51f, 36.84f);
+            label2Path.cubicTo(39.02f, 37.07f, 39.59f, 37.19f, 40.23f, 37.19f);
+            label2Path.cubicTo(40.73f, 37.19f, 41.23f, 37.09f, 41.73f, 36.9f);
+            label2Path.cubicTo(42.22f, 36.7f, 42.64f, 36.38f, 42.98f, 35.93f);
+            label2Path.close();
+            label2Path.moveTo(52.52f, 33.9f);
+            label2Path.lineTo(52.52f, 28.43f);
+            label2Path.lineTo(51.38f, 28.43f);
+            label2Path.lineTo(51.38f, 33.9f);
+            label2Path.cubicTo(51.38f, 34.67f, 51.19f, 35.25f, 50.81f, 35.65f);
+            label2Path.cubicTo(50.43f, 36.05f, 49.87f, 36.24f, 49.14f, 36.24f);
+            label2Path.cubicTo(48.38f, 36.24f, 47.79f, 36.05f, 47.38f, 35.65f);
+            label2Path.cubicTo(46.97f, 35.25f, 46.77f, 34.67f, 46.77f, 33.9f);
+            label2Path.lineTo(46.77f, 28.43f);
+            label2Path.lineTo(45.63f, 28.43f);
+            label2Path.lineTo(45.63f, 33.9f);
+            label2Path.cubicTo(45.63f, 35.05f, 45.94f, 35.88f, 46.56f, 36.41f);
+            label2Path.cubicTo(47.18f, 36.93f, 48.04f, 37.19f, 49.14f, 37.19f);
+            label2Path.cubicTo(50.22f, 37.19f, 51.06f, 36.92f, 51.64f, 36.37f);
+            label2Path.cubicTo(52.22f, 35.82f, 52.52f, 35f, 52.52f, 33.9f);
+            label2Path.close();
+            label2Path.moveTo(54.39f, 28.43f);
+            label2Path.lineTo(54.39f, 37f);
+            label2Path.lineTo(55.53f, 37f);
+            label2Path.lineTo(55.53f, 28.43f);
+            label2Path.lineTo(54.39f, 28.43f);
+            label2Path.close();
+            label2Path.moveTo(57.45f, 28.43f);
+            label2Path.lineTo(57.45f, 37f);
+            label2Path.lineTo(63.12f, 37f);
+            label2Path.lineTo(63.12f, 36.04f);
+            label2Path.lineTo(58.59f, 36.04f);
+            label2Path.lineTo(58.59f, 28.43f);
+            label2Path.lineTo(57.45f, 28.43f);
+            label2Path.close();
+            label2Path.moveTo(65.26f, 36.04f);
+            label2Path.lineTo(65.26f, 29.39f);
+            label2Path.lineTo(67.18f, 29.39f);
+            label2Path.cubicTo(67.71f, 29.39f, 68.15f, 29.47f, 68.51f, 29.61f);
+            label2Path.cubicTo(68.87f, 29.76f, 69.17f, 29.98f, 69.39f, 30.26f);
+            label2Path.cubicTo(69.62f, 30.55f, 69.79f, 30.89f, 69.89f, 31.29f);
+            label2Path.cubicTo(69.99f, 31.7f, 70.04f, 32.16f, 70.04f, 32.67f);
+            label2Path.cubicTo(70.04f, 33.2f, 69.98f, 33.65f, 69.87f, 34.02f);
+            label2Path.cubicTo(69.77f, 34.39f, 69.63f, 34.7f, 69.46f, 34.95f);
+            label2Path.cubicTo(69.29f, 35.2f, 69.1f, 35.39f, 68.89f, 35.54f);
+            label2Path.cubicTo(68.68f, 35.68f, 68.46f, 35.79f, 68.25f, 35.87f);
+            label2Path.cubicTo(68.03f, 35.94f, 67.83f, 35.99f, 67.64f, 36.01f);
+            label2Path.cubicTo(67.44f, 36.03f, 67.28f, 36.04f, 67.16f, 36.04f);
+            label2Path.lineTo(65.26f, 36.04f);
+            label2Path.close();
+            label2Path.moveTo(64.12f, 28.43f);
+            label2Path.lineTo(64.12f, 37f);
+            label2Path.lineTo(67.06f, 37f);
+            label2Path.cubicTo(67.77f, 37f, 68.39f, 36.9f, 68.91f, 36.7f);
+            label2Path.cubicTo(69.43f, 36.5f, 69.86f, 36.21f, 70.19f, 35.83f);
+            label2Path.cubicTo(70.53f, 35.45f, 70.78f, 34.98f, 70.94f, 34.43f);
+            label2Path.cubicTo(71.1f, 33.87f, 71.18f, 33.23f, 71.18f, 32.51f);
+            label2Path.cubicTo(71.18f, 31.14f, 70.82f, 30.11f, 70.11f, 29.44f);
+            label2Path.cubicTo(69.4f, 28.77f, 68.38f, 28.43f, 67.06f, 28.43f);
+            label2Path.lineTo(64.12f, 28.43f);
+            label2Path.close();
+            label2Path.moveTo(77.52f, 30.94f);
+            label2Path.lineTo(78.6f, 30.94f);
+            label2Path.cubicTo(78.59f, 30.47f, 78.5f, 30.06f, 78.33f, 29.72f);
+            label2Path.cubicTo(78.17f, 29.38f, 77.95f, 29.1f, 77.66f, 28.88f);
+            label2Path.cubicTo(77.38f, 28.65f, 77.05f, 28.49f, 76.67f, 28.38f);
+            label2Path.cubicTo(76.3f, 28.28f, 75.89f, 28.23f, 75.45f, 28.23f);
+            label2Path.cubicTo(75.06f, 28.23f, 74.67f, 28.28f, 74.3f, 28.38f);
+            label2Path.cubicTo(73.93f, 28.48f, 73.6f, 28.63f, 73.31f, 28.83f);
+            label2Path.cubicTo(73.01f, 29.04f, 72.78f, 29.3f, 72.6f, 29.61f);
+            label2Path.cubicTo(72.43f, 29.93f, 72.34f, 30.3f, 72.34f, 30.74f);
+            label2Path.cubicTo(72.34f, 31.13f, 72.42f, 31.45f, 72.57f, 31.71f);
+            label2Path.cubicTo(72.73f, 31.97f, 72.94f, 32.19f, 73.2f, 32.35f);
+            label2Path.cubicTo(73.46f, 32.51f, 73.75f, 32.65f, 74.08f, 32.75f);
+            label2Path.cubicTo(74.41f, 32.85f, 74.74f, 32.93f, 75.08f, 33.01f);
+            label2Path.cubicTo(75.42f, 33.09f, 75.76f, 33.16f, 76.08f, 33.23f);
+            label2Path.cubicTo(76.41f, 33.3f, 76.71f, 33.4f, 76.97f, 33.51f);
+            label2Path.cubicTo(77.23f, 33.63f, 77.43f, 33.78f, 77.59f, 33.96f);
+            label2Path.cubicTo(77.75f, 34.15f, 77.82f, 34.39f, 77.82f, 34.68f);
+            label2Path.cubicTo(77.82f, 35f, 77.76f, 35.25f, 77.63f, 35.45f);
+            label2Path.cubicTo(77.5f, 35.65f, 77.34f, 35.81f, 77.13f, 35.93f);
+            label2Path.cubicTo(76.92f, 36.04f, 76.69f, 36.12f, 76.43f, 36.17f);
+            label2Path.cubicTo(76.17f, 36.22f, 75.91f, 36.24f, 75.65f, 36.24f);
+            label2Path.cubicTo(75.33f, 36.24f, 75.02f, 36.2f, 74.72f, 36.12f);
+            label2Path.cubicTo(74.41f, 36.04f, 74.15f, 35.92f, 73.92f, 35.75f);
+            label2Path.cubicTo(73.69f, 35.58f, 73.51f, 35.37f, 73.37f, 35.11f);
+            label2Path.cubicTo(73.23f, 34.85f, 73.16f, 34.54f, 73.16f, 34.18f);
+            label2Path.lineTo(72.08f, 34.18f);
+            label2Path.cubicTo(72.08f, 34.7f, 72.17f, 35.15f, 72.36f, 35.53f);
+            label2Path.cubicTo(72.55f, 35.91f, 72.8f, 36.22f, 73.13f, 36.47f);
+            label2Path.cubicTo(73.45f, 36.71f, 73.83f, 36.89f, 74.25f, 37.01f);
+            label2Path.cubicTo(74.68f, 37.13f, 75.14f, 37.19f, 75.62f, 37.19f);
+            label2Path.cubicTo(76.01f, 37.19f, 76.4f, 37.15f, 76.8f, 37.05f);
+            label2Path.cubicTo(77.19f, 36.96f, 77.55f, 36.81f, 77.87f, 36.61f);
+            label2Path.cubicTo(78.19f, 36.41f, 78.45f, 36.14f, 78.66f, 35.82f);
+            label2Path.cubicTo(78.86f, 35.49f, 78.96f, 35.1f, 78.96f, 34.65f);
+            label2Path.cubicTo(78.96f, 34.22f, 78.89f, 33.87f, 78.73f, 33.59f);
+            label2Path.cubicTo(78.57f, 33.31f, 78.37f, 33.08f, 78.11f, 32.9f);
+            label2Path.cubicTo(77.85f, 32.71f, 77.55f, 32.57f, 77.22f, 32.46f);
+            label2Path.cubicTo(76.9f, 32.35f, 76.56f, 32.26f, 76.22f, 32.18f);
+            label2Path.cubicTo(75.88f, 32.1f, 75.55f, 32.02f, 75.22f, 31.95f);
+            label2Path.cubicTo(74.89f, 31.89f, 74.6f, 31.8f, 74.34f, 31.7f);
+            label2Path.cubicTo(74.08f, 31.59f, 73.87f, 31.46f, 73.71f, 31.29f);
+            label2Path.cubicTo(73.56f, 31.13f, 73.48f, 30.92f, 73.48f, 30.65f);
+            label2Path.cubicTo(73.48f, 30.37f, 73.53f, 30.14f, 73.64f, 29.95f);
+            label2Path.cubicTo(73.75f, 29.76f, 73.89f, 29.61f, 74.07f, 29.5f);
+            label2Path.cubicTo(74.25f, 29.39f, 74.46f, 29.31f, 74.69f, 29.26f);
+            label2Path.cubicTo(74.92f, 29.21f, 75.16f, 29.19f, 75.4f, 29.19f);
+            label2Path.cubicTo(75.99f, 29.19f, 76.48f, 29.33f, 76.86f, 29.6f);
+            label2Path.cubicTo(77.24f, 29.88f, 77.46f, 30.32f, 77.52f, 30.94f);
+            label2Path.close();
+            
+            paint.reset();
+            paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setColor(textForeground2);
+            canvas.drawPath(label2Path, paint);
+        }
+        
+        canvas.restore();
+    }
+    
+    private static class CacheForTwoHandedIcon {
+        private static Paint paint = new Paint();
+        private static RectF originalFrame = new RectF(0f, 0f, 15f, 15f);
+        private static RectF resizedFrame = new RectF();
+        private static RectF bezierRect = new RectF();
+        private static Path bezierPath = new Path();
+    }
+    
+    public static void drawTwoHandedIcon(Canvas canvas) {
+        HabiticaIcons.drawTwoHandedIcon(canvas, new RectF(0f, 0f, 15f, 15f), ResizingBehavior.AspectFit);
+    }
+    
+    public static void drawTwoHandedIcon(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
+        // General Declarations
+        Paint paint = CacheForTwoHandedIcon.paint;
+        
+        // Local Colors
+        int fillColor39 = Color.argb(255, 189, 168, 255);
+        
+        // Resize to Target Frame
+        canvas.save();
+        RectF resizedFrame = CacheForTwoHandedIcon.resizedFrame;
+        HabiticaIcons.resizingBehaviorApply(resizing, CacheForTwoHandedIcon.originalFrame, targetFrame, resizedFrame);
+        canvas.translate(resizedFrame.left, resizedFrame.top);
+        canvas.scale(resizedFrame.width() / 15f, resizedFrame.height() / 15f);
+        
+        // Bezier
+        RectF bezierRect = CacheForTwoHandedIcon.bezierRect;
+        bezierRect.set(0f, 0f, 14.85f, 14.59f);
+        Path bezierPath = CacheForTwoHandedIcon.bezierPath;
+        bezierPath.reset();
+        bezierPath.moveTo(13.85f, 11.48f);
+        bezierPath.cubicTo(13.85f, 12.64f, 12.9f, 13.59f, 11.74f, 13.59f);
+        bezierPath.lineTo(9.27f, 13.59f);
+        bezierPath.cubicTo(8.72f, 13.59f, 8.34f, 13.46f, 7.9f, 13.08f);
+        bezierPath.lineTo(8.16f, 13.08f);
+        bezierPath.cubicTo(9.88f, 13.08f, 11.27f, 11.69f, 11.27f, 9.97f);
+        bezierPath.lineTo(11.27f, 3.78f);
+        bezierPath.cubicTo(11.28f, 3.57f, 11.45f, 3.4f, 11.66f, 3.4f);
+        bezierPath.cubicTo(11.88f, 3.4f, 12.06f, 3.58f, 12.06f, 3.8f);
+        bezierPath.lineTo(12.06f, 7.67f);
+        bezierPath.cubicTo(12.06f, 7.95f, 12.28f, 8.17f, 12.56f, 8.17f);
+        bezierPath.cubicTo(12.83f, 8.17f, 13.06f, 7.95f, 13.06f, 7.67f);
+        bezierPath.lineTo(13.06f, 4.9f);
+        bezierPath.cubicTo(13.06f, 4.68f, 13.24f, 4.5f, 13.45f, 4.5f);
+        bezierPath.cubicTo(13.67f, 4.5f, 13.85f, 4.68f, 13.85f, 4.9f);
+        bezierPath.lineTo(13.85f, 11.48f);
+        bezierPath.close();
+        bezierPath.moveTo(5.71f, 12.08f);
+        bezierPath.lineTo(5.69f, 12.08f);
+        bezierPath.cubicTo(4.55f, 12.08f, 4.11f, 11.55f, 2.41f, 9.3f);
+        bezierPath.cubicTo(2.05f, 8.81f, 1.64f, 8.26f, 1.15f, 7.64f);
+        bezierPath.cubicTo(1.36f, 7.46f, 1.6f, 7.29f, 1.94f, 7.33f);
+        bezierPath.cubicTo(2.48f, 7.34f, 2.91f, 7.84f, 3.18f, 8.26f);
+        bezierPath.cubicTo(3.3f, 8.45f, 3.53f, 8.53f, 3.74f, 8.47f);
+        bezierPath.cubicTo(3.96f, 8.41f, 4.1f, 8.21f, 4.1f, 7.99f);
+        bezierPath.lineTo(4.1f, 2.38f);
+        bezierPath.cubicTo(4.1f, 2.17f, 4.28f, 1.99f, 4.5f, 1.99f);
+        bezierPath.cubicTo(4.72f, 1.99f, 4.9f, 2.17f, 4.9f, 2.38f);
+        bezierPath.lineTo(4.9f, 6.17f);
+        bezierPath.cubicTo(4.9f, 6.44f, 5.12f, 6.67f, 5.4f, 6.67f);
+        bezierPath.cubicTo(5.67f, 6.67f, 5.9f, 6.44f, 5.9f, 6.17f);
+        bezierPath.lineTo(5.9f, 1.4f);
+        bezierPath.cubicTo(5.9f, 1.18f, 6.07f, 1f, 6.29f, 1f);
+        bezierPath.cubicTo(6.51f, 1f, 6.69f, 1.18f, 6.69f, 1.4f);
+        bezierPath.lineTo(6.69f, 5.24f);
+        bezierPath.cubicTo(6.69f, 5.52f, 6.91f, 5.74f, 7.19f, 5.74f);
+        bezierPath.cubicTo(7.46f, 5.74f, 7.67f, 5.52f, 7.68f, 5.26f);
+        bezierPath.lineTo(7.69f, 2.29f);
+        bezierPath.cubicTo(7.69f, 2.07f, 7.86f, 1.9f, 8.08f, 1.9f);
+        bezierPath.cubicTo(8.3f, 1.9f, 8.48f, 2.08f, 8.48f, 2.29f);
+        bezierPath.lineTo(8.48f, 6.17f);
+        bezierPath.cubicTo(8.48f, 6.44f, 8.7f, 6.67f, 8.98f, 6.67f);
+        bezierPath.cubicTo(9.25f, 6.67f, 9.46f, 6.45f, 9.47f, 6.19f);
+        bezierPath.cubicTo(9.47f, 6.18f, 9.48f, 6.17f, 9.48f, 6.17f);
+        bezierPath.lineTo(9.48f, 3.4f);
+        bezierPath.cubicTo(9.48f, 3.18f, 9.66f, 3f, 9.87f, 3f);
+        bezierPath.cubicTo(10.09f, 3f, 10.27f, 3.18f, 10.27f, 3.4f);
+        bezierPath.lineTo(10.27f, 9.97f);
+        bezierPath.cubicTo(10.27f, 11.14f, 9.32f, 12.08f, 8.16f, 12.08f);
+        bezierPath.lineTo(5.71f, 12.08f);
+        bezierPath.close();
+        bezierPath.moveTo(13.45f, 3.5f);
+        bezierPath.cubicTo(13.31f, 3.5f, 13.17f, 3.53f, 13.04f, 3.57f);
+        bezierPath.cubicTo(12.93f, 2.91f, 12.36f, 2.4f, 11.66f, 2.4f);
+        bezierPath.cubicTo(11.42f, 2.4f, 11.2f, 2.47f, 11f, 2.58f);
+        bezierPath.cubicTo(10.74f, 2.23f, 10.34f, 2f, 9.87f, 2f);
+        bezierPath.cubicTo(9.73f, 2f, 9.59f, 2.03f, 9.46f, 2.07f);
+        bezierPath.cubicTo(9.35f, 1.41f, 8.78f, 0.9f, 8.08f, 0.9f);
+        bezierPath.cubicTo(7.92f, 0.9f, 7.76f, 0.93f, 7.62f, 0.98f);
+        bezierPath.cubicTo(7.44f, 0.42f, 6.92f, 0f, 6.29f, 0f);
+        bezierPath.cubicTo(5.63f, 0f, 5.09f, 0.46f, 4.94f, 1.07f);
+        bezierPath.cubicTo(4.8f, 1.02f, 4.65f, 0.99f, 4.5f, 0.99f);
+        bezierPath.cubicTo(3.73f, 0.99f, 3.1f, 1.62f, 3.1f, 2.38f);
+        bezierPath.lineTo(3.1f, 6.72f);
+        bezierPath.cubicTo(2.68f, 6.42f, 2.28f, 6.34f, 1.96f, 6.33f);
+        bezierPath.cubicTo(1.11f, 6.27f, 0.45f, 6.82f, 0.1f, 7.32f);
+        bezierPath.cubicTo(-0.04f, 7.5f, -0.03f, 7.74f, 0.11f, 7.92f);
+        bezierPath.cubicTo(0.7f, 8.68f, 1.19f, 9.33f, 1.62f, 9.9f);
+        bezierPath.cubicTo(3.31f, 12.15f, 4.01f, 13.08f, 5.69f, 13.08f);
+        bezierPath.lineTo(6.51f, 13.08f);
+        bezierPath.cubicTo(7.4f, 14.12f, 8.1f, 14.59f, 9.27f, 14.59f);
+        bezierPath.lineTo(11.74f, 14.59f);
+        bezierPath.cubicTo(13.45f, 14.59f, 14.85f, 13.19f, 14.85f, 11.48f);
+        bezierPath.lineTo(14.85f, 4.9f);
+        bezierPath.cubicTo(14.85f, 4.13f, 14.22f, 3.5f, 13.45f, 3.5f);
+        bezierPath.close();
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        bezierPath.setFillType(Path.FillType.EVEN_ODD);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(fillColor39);
+        canvas.drawPath(bezierPath, paint);
+        
+        canvas.restore();
+    }
+    
+    private static class CacheForBlankAvatarIcon {
+        private static Paint paint = new Paint();
+        private static RectF originalFrame = new RectF(0f, 0f, 36f, 34f);
+        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();
+    }
+    
+    public static void drawBlankAvatarIcon(Canvas canvas) {
+        HabiticaIcons.drawBlankAvatarIcon(canvas, new RectF(0f, 0f, 36f, 34f), ResizingBehavior.AspectFit);
+    }
+    
+    public static void drawBlankAvatarIcon(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
+        // General Declarations
+        Paint paint = CacheForBlankAvatarIcon.paint;
+        
+        // Local Colors
+        int fillColor40 = Color.argb(255, 165, 161, 172);
+        int fillColor101 = Color.argb(255, 247, 78, 82);
+        
+        // Resize to Target Frame
+        canvas.save();
+        RectF resizedFrame = CacheForBlankAvatarIcon.resizedFrame;
+        HabiticaIcons.resizingBehaviorApply(resizing, CacheForBlankAvatarIcon.originalFrame, targetFrame, resizedFrame);
+        canvas.translate(resizedFrame.left, resizedFrame.top);
+        canvas.scale(resizedFrame.width() / 36f, resizedFrame.height() / 34f);
+        
+        // Bezier
+        RectF bezierRect = CacheForBlankAvatarIcon.bezierRect;
+        bezierRect.set(6f, 6f, 30f, 30f);
+        Path bezierPath = CacheForBlankAvatarIcon.bezierPath;
+        bezierPath.reset();
+        bezierPath.moveTo(14f, 28f);
+        bezierPath.lineTo(22f, 28f);
+        bezierPath.lineTo(22f, 30f);
+        bezierPath.lineTo(14f, 30f);
+        bezierPath.lineTo(14f, 28f);
+        bezierPath.close();
+        bezierPath.moveTo(12f, 6f);
+        bezierPath.lineTo(24f, 6f);
+        bezierPath.lineTo(24f, 8f);
+        bezierPath.lineTo(12f, 8f);
+        bezierPath.lineTo(12f, 6f);
+        bezierPath.close();
+        bezierPath.moveTo(6f, 12f);
+        bezierPath.lineTo(8f, 12f);
+        bezierPath.lineTo(8f, 22f);
+        bezierPath.lineTo(6f, 22f);
+        bezierPath.lineTo(6f, 12f);
+        bezierPath.close();
+        bezierPath.moveTo(28f, 12f);
+        bezierPath.lineTo(30f, 12f);
+        bezierPath.lineTo(30f, 22f);
+        bezierPath.lineTo(28f, 22f);
+        bezierPath.lineTo(28f, 12f);
+        bezierPath.close();
+        bezierPath.moveTo(26f, 10f);
+        bezierPath.lineTo(28f, 10f);
+        bezierPath.lineTo(28f, 12f);
+        bezierPath.lineTo(26f, 12f);
+        bezierPath.lineTo(26f, 10f);
+        bezierPath.close();
+        bezierPath.moveTo(24f, 8f);
+        bezierPath.lineTo(26f, 8f);
+        bezierPath.lineTo(26f, 10f);
+        bezierPath.lineTo(24f, 10f);
+        bezierPath.lineTo(24f, 8f);
+        bezierPath.close();
+        bezierPath.moveTo(10f, 8f);
+        bezierPath.lineTo(12f, 8f);
+        bezierPath.lineTo(12f, 10f);
+        bezierPath.lineTo(10f, 10f);
+        bezierPath.lineTo(10f, 8f);
+        bezierPath.close();
+        bezierPath.moveTo(8f, 10f);
+        bezierPath.lineTo(10f, 10f);
+        bezierPath.lineTo(10f, 12f);
+        bezierPath.lineTo(8f, 12f);
+        bezierPath.lineTo(8f, 10f);
+        bezierPath.close();
+        bezierPath.moveTo(8f, 22f);
+        bezierPath.lineTo(10f, 22f);
+        bezierPath.lineTo(10f, 24f);
+        bezierPath.lineTo(8f, 24f);
+        bezierPath.lineTo(8f, 22f);
+        bezierPath.close();
+        bezierPath.moveTo(10f, 24f);
+        bezierPath.lineTo(12f, 24f);
+        bezierPath.lineTo(12f, 26f);
+        bezierPath.lineTo(10f, 26f);
+        bezierPath.lineTo(10f, 24f);
+        bezierPath.close();
+        bezierPath.moveTo(12f, 26f);
+        bezierPath.lineTo(14f, 26f);
+        bezierPath.lineTo(14f, 28f);
+        bezierPath.lineTo(12f, 28f);
+        bezierPath.lineTo(12f, 26f);
+        bezierPath.close();
+        bezierPath.moveTo(22f, 26f);
+        bezierPath.lineTo(24f, 26f);
+        bezierPath.lineTo(24f, 28f);
+        bezierPath.lineTo(22f, 28f);
+        bezierPath.lineTo(22f, 26f);
+        bezierPath.close();
+        bezierPath.moveTo(26f, 22f);
+        bezierPath.lineTo(28f, 22f);
+        bezierPath.lineTo(28f, 24f);
+        bezierPath.lineTo(26f, 24f);
+        bezierPath.lineTo(26f, 22f);
+        bezierPath.close();
+        bezierPath.moveTo(24f, 24f);
+        bezierPath.lineTo(26f, 24f);
+        bezierPath.lineTo(26f, 26f);
+        bezierPath.lineTo(24f, 26f);
+        bezierPath.lineTo(24f, 24f);
+        bezierPath.close();
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        bezierPath.setFillType(Path.FillType.EVEN_ODD);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(fillColor40);
+        canvas.drawPath(bezierPath, paint);
+        
+        // Bezier 2
+        RectF bezier2Rect = CacheForBlankAvatarIcon.bezier2Rect;
+        bezier2Rect.set(0f, 0f, 36f, 34f);
+        Path bezier2Path = CacheForBlankAvatarIcon.bezier2Path;
+        bezier2Path.reset();
+        bezier2Path.moveTo(34f, 0f);
+        bezier2Path.lineTo(36f, 0f);
+        bezier2Path.lineTo(36f, 2f);
+        bezier2Path.lineTo(34f, 2f);
+        bezier2Path.lineTo(34f, 4f);
+        bezier2Path.lineTo(32f, 4f);
+        bezier2Path.lineTo(32f, 6f);
+        bezier2Path.lineTo(30f, 6f);
+        bezier2Path.lineTo(30f, 8f);
+        bezier2Path.lineTo(28f, 8f);
+        bezier2Path.lineTo(28f, 10f);
+        bezier2Path.lineTo(26f, 10f);
+        bezier2Path.lineTo(26f, 12f);
+        bezier2Path.lineTo(24f, 12f);
+        bezier2Path.lineTo(24f, 14f);
+        bezier2Path.lineTo(22f, 14f);
+        bezier2Path.lineTo(22f, 16f);
+        bezier2Path.lineTo(20f, 16f);
+        bezier2Path.lineTo(20f, 18f);
+        bezier2Path.lineTo(18f, 18f);
+        bezier2Path.lineTo(18f, 20f);
+        bezier2Path.lineTo(16f, 20f);
+        bezier2Path.lineTo(16f, 22f);
+        bezier2Path.lineTo(14f, 22f);
+        bezier2Path.lineTo(14f, 24f);
+        bezier2Path.lineTo(12f, 24f);
+        bezier2Path.lineTo(12f, 26f);
+        bezier2Path.lineTo(10f, 26f);
+        bezier2Path.lineTo(10f, 28f);
+        bezier2Path.lineTo(8f, 28f);
+        bezier2Path.lineTo(8f, 30f);
+        bezier2Path.lineTo(6f, 30f);
+        bezier2Path.lineTo(6f, 32f);
+        bezier2Path.lineTo(4f, 32f);
+        bezier2Path.lineTo(4f, 34f);
+        bezier2Path.lineTo(2f, 34f);
+        bezier2Path.lineTo(0f, 34f);
+        bezier2Path.lineTo(0f, 32f);
+        bezier2Path.lineTo(2f, 32f);
+        bezier2Path.lineTo(2f, 30f);
+        bezier2Path.lineTo(4f, 30f);
+        bezier2Path.lineTo(4f, 28f);
+        bezier2Path.lineTo(6f, 28f);
+        bezier2Path.lineTo(6f, 26f);
+        bezier2Path.lineTo(8f, 26f);
+        bezier2Path.lineTo(8f, 24f);
+        bezier2Path.lineTo(10f, 24f);
+        bezier2Path.lineTo(10f, 22f);
+        bezier2Path.lineTo(12f, 22f);
+        bezier2Path.lineTo(12f, 20f);
+        bezier2Path.lineTo(14f, 20f);
+        bezier2Path.lineTo(14f, 18f);
+        bezier2Path.lineTo(16f, 18f);
+        bezier2Path.lineTo(16f, 16f);
+        bezier2Path.lineTo(18f, 16f);
+        bezier2Path.lineTo(18f, 14f);
+        bezier2Path.lineTo(20f, 14f);
+        bezier2Path.lineTo(20f, 12f);
+        bezier2Path.lineTo(22f, 12f);
+        bezier2Path.lineTo(22f, 10f);
+        bezier2Path.lineTo(24f, 10f);
+        bezier2Path.lineTo(24f, 8f);
+        bezier2Path.lineTo(26f, 8f);
+        bezier2Path.lineTo(26f, 6f);
+        bezier2Path.lineTo(28f, 6f);
+        bezier2Path.lineTo(28f, 4f);
+        bezier2Path.lineTo(30f, 4f);
+        bezier2Path.lineTo(30f, 2f);
+        bezier2Path.lineTo(32f, 2f);
+        bezier2Path.lineTo(32f, 0f);
+        bezier2Path.lineTo(34f, 0f);
+        bezier2Path.close();
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        bezier2Path.setFillType(Path.FillType.EVEN_ODD);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(fillColor101);
+        canvas.drawPath(bezier2Path, paint);
+        
+        canvas.restore();
+    }
+    
+    private static class CacheForDisclosureArrow {
+        private static Paint paint = new Paint();
+        private static RectF originalFrame = new RectF(0f, 0f, 8f, 13f);
+        private static RectF resizedFrame = new RectF();
+        private static RectF bezierRect = new RectF();
+        private static Path bezierPath = new Path();
+    }
+    
+    public static void drawDisclosureArrow(Canvas canvas) {
+        HabiticaIcons.drawDisclosureArrow(canvas, new RectF(0f, 0f, 8f, 13f), ResizingBehavior.AspectFit);
+    }
+    
+    public static void drawDisclosureArrow(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
+        // General Declarations
+        Paint paint = CacheForDisclosureArrow.paint;
+        
+        // Local Colors
+        int fillColor102 = Color.argb(255, 199, 199, 204);
+        
+        // Resize to Target Frame
+        canvas.save();
+        RectF resizedFrame = CacheForDisclosureArrow.resizedFrame;
+        HabiticaIcons.resizingBehaviorApply(resizing, CacheForDisclosureArrow.originalFrame, targetFrame, resizedFrame);
+        canvas.translate(resizedFrame.left, resizedFrame.top);
+        canvas.scale(resizedFrame.width() / 8f, resizedFrame.height() / 13f);
+        
+        // Bezier
+        RectF bezierRect = CacheForDisclosureArrow.bezierRect;
+        bezierRect.set(0f, 0f, 8f, 13f);
+        Path bezierPath = CacheForDisclosureArrow.bezierPath;
+        bezierPath.reset();
+        bezierPath.moveTo(0f, 1.5f);
+        bezierPath.lineTo(1.5f, 0f);
+        bezierPath.lineTo(8f, 6.5f);
+        bezierPath.lineTo(1.5f, 13f);
+        bezierPath.lineTo(0f, 11.5f);
+        bezierPath.lineTo(5f, 6.5f);
+        bezierPath.lineTo(0f, 1.5f);
+        bezierPath.close();
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        bezierPath.setFillType(Path.FillType.EVEN_ODD);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(fillColor102);
+        canvas.drawPath(bezierPath, paint);
+        
+        canvas.restore();
+    }
+    
+    private static class CacheForFilterIcon {
+        private static Paint paint = new Paint();
+        private static RectF originalFrame = new RectF(0f, 0f, 22f, 22f);
+        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 bezier3Rect = new RectF();
+        private static Path bezier3Path = new Path();
+        private static RectF oval2Rect = new RectF();
+        private static Path oval2Path = new Path();
+        private static RectF oval4Rect = new RectF();
+        private static Path oval4Path = new Path();
+        private static RectF oval6Rect = new RectF();
+        private static Path oval6Path = new Path();
+    }
+    
+    public static void drawFilterIcon(Canvas canvas, float percentage) {
+        HabiticaIcons.drawFilterIcon(canvas, new RectF(0f, 0f, 22f, 22f), ResizingBehavior.AspectFit, percentage);
+    }
+    
+    public static void drawFilterIcon(Canvas canvas, RectF targetFrame, ResizingBehavior resizing, float percentage) {
+        // General Declarations
+        Paint paint = CacheForFilterIcon.paint;
+        
+        // Local Colors
+        int strokeColor19 = Color.argb(255, 154, 98, 255);
+        
+        // Local Variables
+        float filterNode1Position = 3f + 10f * percentage;
+        float filterNode2Position = 13f - 10f * percentage;
+        float filterNode3Position = 3f + 5f * percentage;
+        
+        // Resize to Target Frame
+        canvas.save();
+        RectF resizedFrame = CacheForFilterIcon.resizedFrame;
+        HabiticaIcons.resizingBehaviorApply(resizing, CacheForFilterIcon.originalFrame, targetFrame, resizedFrame);
+        canvas.translate(resizedFrame.left, resizedFrame.top);
+        canvas.scale(resizedFrame.width() / 22f, resizedFrame.height() / 22f);
+        
+        // Bezier
+        RectF bezierRect = CacheForFilterIcon.bezierRect;
+        bezierRect.set(1.5f, 18f, 20.53f, 18f);
+        Path bezierPath = CacheForFilterIcon.bezierPath;
+        bezierPath.reset();
+        bezierPath.moveTo(1.5f, 18f);
+        bezierPath.lineTo(20.53f, 18f);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStrokeWidth(2f);
+        paint.setStrokeCap(Paint.Cap.ROUND);
+        paint.setStrokeMiter(10f);
+        canvas.save();
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setColor(strokeColor19);
+        canvas.drawPath(bezierPath, paint);
+        canvas.restore();
+        
+        // Bezier 2
+        RectF bezier2Rect = CacheForFilterIcon.bezier2Rect;
+        bezier2Rect.set(1.5f, 11f, 20.53f, 11f);
+        Path bezier2Path = CacheForFilterIcon.bezier2Path;
+        bezier2Path.reset();
+        bezier2Path.moveTo(1.5f, 11f);
+        bezier2Path.lineTo(20.53f, 11f);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStrokeWidth(2f);
+        paint.setStrokeCap(Paint.Cap.ROUND);
+        paint.setStrokeMiter(10f);
+        canvas.save();
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setColor(strokeColor19);
+        canvas.drawPath(bezier2Path, paint);
+        canvas.restore();
+        
+        // Bezier 3
+        RectF bezier3Rect = CacheForFilterIcon.bezier3Rect;
+        bezier3Rect.set(1.5f, 4f, 20.53f, 4f);
+        Path bezier3Path = CacheForFilterIcon.bezier3Path;
+        bezier3Path.reset();
+        bezier3Path.moveTo(1.5f, 4f);
+        bezier3Path.lineTo(20.53f, 4f);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStrokeWidth(2f);
+        paint.setStrokeCap(Paint.Cap.ROUND);
+        paint.setStrokeMiter(10f);
+        canvas.save();
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setColor(strokeColor19);
+        canvas.drawPath(bezier3Path, paint);
+        canvas.restore();
+        
+        // Oval 2
+        RectF oval2Rect = CacheForFilterIcon.oval2Rect;
+        oval2Rect.set(filterNode1Position, 1f, filterNode1Position + 5f, 6f);
+        Path oval2Path = CacheForFilterIcon.oval2Path;
+        oval2Path.reset();
+        oval2Path.addOval(oval2Rect, Path.Direction.CW);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(Color.WHITE);
+        canvas.drawPath(oval2Path, paint);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStrokeWidth(1.5f);
+        paint.setStrokeMiter(10f);
+        canvas.save();
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setColor(strokeColor19);
+        canvas.drawPath(oval2Path, paint);
+        canvas.restore();
+        
+        // Oval 4
+        RectF oval4Rect = CacheForFilterIcon.oval4Rect;
+        oval4Rect.set(filterNode2Position, 8f, filterNode2Position + 5f, 13f);
+        Path oval4Path = CacheForFilterIcon.oval4Path;
+        oval4Path.reset();
+        oval4Path.addOval(oval4Rect, Path.Direction.CW);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(Color.WHITE);
+        canvas.drawPath(oval4Path, paint);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStrokeWidth(1.5f);
+        paint.setStrokeMiter(10f);
+        canvas.save();
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setColor(strokeColor19);
+        canvas.drawPath(oval4Path, paint);
+        canvas.restore();
+        
+        // Oval 6
+        RectF oval6Rect = CacheForFilterIcon.oval6Rect;
+        oval6Rect.set(filterNode3Position, 16f, filterNode3Position + 5f, 21f);
+        Path oval6Path = CacheForFilterIcon.oval6Path;
+        oval6Path.reset();
+        oval6Path.addOval(oval6Rect, Path.Direction.CW);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(Color.WHITE);
+        canvas.drawPath(oval6Path, paint);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStrokeWidth(1.5f);
+        paint.setStrokeMiter(10f);
+        canvas.save();
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setColor(strokeColor19);
+        canvas.drawPath(oval6Path, paint);
+        canvas.restore();
+        
+        canvas.restore();
+    }
+    
+    private static class CacheForDeclineIcon {
+        private static Paint paint = new Paint();
+        private static RectF originalFrame = new RectF(0f, 0f, 13f, 13f);
+        private static RectF resizedFrame = new RectF();
+        private static RectF bezier2Rect = new RectF();
+        private static Path bezier2Path = new Path();
+    }
+    
+    public static void drawDeclineIcon(Canvas canvas) {
+        HabiticaIcons.drawDeclineIcon(canvas, new RectF(0f, 0f, 13f, 13f), ResizingBehavior.AspectFit);
+    }
+    
+    public static void drawDeclineIcon(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
+        // General Declarations
+        Paint paint = CacheForDeclineIcon.paint;
+        
+        // Local Colors
+        int strokeColor20 = Color.argb(255, 247, 78, 82);
+        
+        // Resize to Target Frame
+        canvas.save();
+        RectF resizedFrame = CacheForDeclineIcon.resizedFrame;
+        HabiticaIcons.resizingBehaviorApply(resizing, CacheForDeclineIcon.originalFrame, targetFrame, resizedFrame);
+        canvas.translate(resizedFrame.left, resizedFrame.top);
+        canvas.scale(resizedFrame.width() / 13f, resizedFrame.height() / 13f);
+        
+        // Bezier 2
+        RectF bezier2Rect = CacheForDeclineIcon.bezier2Rect;
+        bezier2Rect.set(2f, 2f, 11f, 11f);
+        Path bezier2Path = CacheForDeclineIcon.bezier2Path;
+        bezier2Path.reset();
+        bezier2Path.moveTo(2f, 2.75f);
+        bezier2Path.lineTo(2.75f, 2f);
+        bezier2Path.lineTo(6.5f, 5.75f);
+        bezier2Path.lineTo(10.25f, 2f);
+        bezier2Path.lineTo(11f, 2.75f);
+        bezier2Path.lineTo(7.25f, 6.5f);
+        bezier2Path.lineTo(11f, 10.25f);
+        bezier2Path.lineTo(10.25f, 11f);
+        bezier2Path.lineTo(6.5f, 7.25f);
+        bezier2Path.lineTo(2.75f, 11f);
+        bezier2Path.lineTo(2f, 10.25f);
+        bezier2Path.lineTo(5.75f, 6.5f);
+        bezier2Path.lineTo(2f, 2.75f);
+        bezier2Path.close();
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStrokeWidth(1.1f);
+        paint.setStrokeMiter(10f);
+        canvas.save();
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setColor(strokeColor20);
+        canvas.drawPath(bezier2Path, paint);
+        canvas.restore();
+        
+        canvas.restore();
+    }
+    
+    private static class CacheForAcceptIcon {
+        private static Paint paint = new Paint();
+        private static RectF originalFrame = new RectF(0f, 0f, 13f, 13f);
+        private static RectF resizedFrame = new RectF();
+        private static RectF bezierRect = new RectF();
+        private static Path bezierPath = new Path();
+    }
+    
+    public static void drawAcceptIcon(Canvas canvas) {
+        HabiticaIcons.drawAcceptIcon(canvas, new RectF(0f, 0f, 13f, 13f), ResizingBehavior.AspectFit);
+    }
+    
+    public static void drawAcceptIcon(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
+        // General Declarations
+        Paint paint = CacheForAcceptIcon.paint;
+        
+        // Local Colors
+        int fillColor103 = Color.argb(255, 32, 183, 128);
+        
+        // Resize to Target Frame
+        canvas.save();
+        RectF resizedFrame = CacheForAcceptIcon.resizedFrame;
+        HabiticaIcons.resizingBehaviorApply(resizing, CacheForAcceptIcon.originalFrame, targetFrame, resizedFrame);
+        canvas.translate(resizedFrame.left, resizedFrame.top);
+        canvas.scale(resizedFrame.width() / 13f, resizedFrame.height() / 13f);
+        
+        // Bezier
+        RectF bezierRect = CacheForAcceptIcon.bezierRect;
+        bezierRect.set(0f, 2f, 13f, 12f);
+        Path bezierPath = CacheForAcceptIcon.bezierPath;
+        bezierPath.reset();
+        bezierPath.moveTo(1.5f, 6.5f);
+        bezierPath.lineTo(0f, 8f);
+        bezierPath.lineTo(4f, 12f);
+        bezierPath.lineTo(13f, 3.5f);
+        bezierPath.lineTo(11.5f, 2f);
+        bezierPath.lineTo(4f, 9f);
+        bezierPath.lineTo(1.5f, 6.5f);
+        bezierPath.close();
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        bezierPath.setFillType(Path.FillType.EVEN_ODD);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(fillColor103);
+        canvas.drawPath(bezierPath, paint);
+        
+        canvas.restore();
+    }
+    
+    private static class CacheForBuffIcon {
+        private static Paint paint = new Paint();
+        private static RectF originalFrame = new RectF(0f, 0f, 15f, 15f);
+        private static RectF resizedFrame = new RectF();
+        private static RectF rectangleRect = new RectF();
+        private static Path rectanglePath = new Path();
+        private static RectF bezier2Rect = new RectF();
+        private static Path bezier2Path = new Path();
+    }
+    
+    public static void drawBuffIcon(Canvas canvas) {
+        HabiticaIcons.drawBuffIcon(canvas, new RectF(0f, 0f, 15f, 15f), ResizingBehavior.AspectFit);
+    }
+    
+    public static void drawBuffIcon(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
+        // General Declarations
+        Paint paint = CacheForBuffIcon.paint;
+        
+        // Local Colors
+        int fillColor85 = Color.argb(255, 237, 236, 238);
+        int fillColor18 = Color.argb(255, 154, 98, 255);
+        
+        // Resize to Target Frame
+        canvas.save();
+        RectF resizedFrame = CacheForBuffIcon.resizedFrame;
+        HabiticaIcons.resizingBehaviorApply(resizing, CacheForBuffIcon.originalFrame, targetFrame, resizedFrame);
+        canvas.translate(resizedFrame.left, resizedFrame.top);
+        canvas.scale(resizedFrame.width() / 15f, resizedFrame.height() / 15f);
+        
+        // Rectangle
+        RectF rectangleRect = CacheForBuffIcon.rectangleRect;
+        rectangleRect.set(0f, 0f, 15f, 15f);
+        Path rectanglePath = CacheForBuffIcon.rectanglePath;
+        rectanglePath.reset();
+        rectanglePath.addRoundRect(rectangleRect, 2f, 2f, Path.Direction.CW);
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(fillColor85);
+        canvas.drawPath(rectanglePath, paint);
+        
+        // Bezier 2
+        RectF bezier2Rect = CacheForBuffIcon.bezier2Rect;
+        bezier2Rect.set(3.75f, 3f, 11.25f, 12f);
+        Path bezier2Path = CacheForBuffIcon.bezier2Path;
+        bezier2Path.reset();
+        bezier2Path.moveTo(7.5f, 3f);
+        bezier2Path.lineTo(11.25f, 7.5f);
+        bezier2Path.lineTo(9f, 7.5f);
+        bezier2Path.lineTo(9f, 9f);
+        bezier2Path.lineTo(6f, 9f);
+        bezier2Path.lineTo(6f, 7.5f);
+        bezier2Path.lineTo(3.75f, 7.5f);
+        bezier2Path.lineTo(7.5f, 3f);
+        bezier2Path.close();
+        bezier2Path.moveTo(6f, 9.75f);
+        bezier2Path.lineTo(9f, 9.75f);
+        bezier2Path.lineTo(9f, 10.5f);
+        bezier2Path.lineTo(6f, 10.5f);
+        bezier2Path.lineTo(6f, 9.75f);
+        bezier2Path.close();
+        bezier2Path.moveTo(6f, 11.25f);
+        bezier2Path.lineTo(9f, 11.25f);
+        bezier2Path.lineTo(9f, 12f);
+        bezier2Path.lineTo(6f, 12f);
+        bezier2Path.lineTo(6f, 11.25f);
+        bezier2Path.close();
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        bezier2Path.setFillType(Path.FillType.EVEN_ODD);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(fillColor18);
+        canvas.drawPath(bezier2Path, paint);
+        
+        canvas.restore();
+    }
+    
+    private static class CacheForParticipantsIcon {
+        private static Paint paint = new Paint();
+        private static RectF originalFrame = new RectF(0f, 0f, 20f, 20f);
+        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 bezier3Rect = new RectF();
+        private static Path bezier3Path = new Path();
+    }
+    
+    public static void drawParticipantsIcon(Canvas canvas) {
+        HabiticaIcons.drawParticipantsIcon(canvas, new RectF(0f, 0f, 20f, 20f), ResizingBehavior.AspectFit);
+    }
+    
+    public static void drawParticipantsIcon(Canvas canvas, RectF targetFrame, ResizingBehavior resizing) {
+        // General Declarations
+        Paint paint = CacheForParticipantsIcon.paint;
+        
+        // Local Colors
+        int fillColor39 = Color.argb(255, 189, 168, 255);
+        int fillColor25 = Color.argb(255, 225, 224, 227);
+        int fillColor104 = Color.argb(255, 249, 249, 249);
+        
+        // Resize to Target Frame
+        canvas.save();
+        RectF resizedFrame = CacheForParticipantsIcon.resizedFrame;
+        HabiticaIcons.resizingBehaviorApply(resizing, CacheForParticipantsIcon.originalFrame, targetFrame, resizedFrame);
+        canvas.translate(resizedFrame.left, resizedFrame.top);
+        canvas.scale(resizedFrame.width() / 20f, resizedFrame.height() / 20f);
+        
+        // Bezier
+        RectF bezierRect = CacheForParticipantsIcon.bezierRect;
+        bezierRect.set(1f, 3f, 13f, 17f);
+        Path bezierPath = CacheForParticipantsIcon.bezierPath;
+        bezierPath.reset();
+        bezierPath.moveTo(5f, 3f);
+        bezierPath.lineTo(3f, 7f);
+        bezierPath.lineTo(5f, 11f);
+        bezierPath.lineTo(2f, 13f);
+        bezierPath.lineTo(1f, 16f);
+        bezierPath.lineTo(2f, 17f);
+        bezierPath.lineTo(13f, 17f);
+        bezierPath.lineTo(13f, 15f);
+        bezierPath.lineTo(12f, 13f);
+        bezierPath.lineTo(11f, 11f);
+        bezierPath.lineTo(11f, 8f);
+        bezierPath.lineTo(11f, 4f);
+        bezierPath.lineTo(10f, 4f);
+        bezierPath.lineTo(7f, 3f);
+        bezierPath.lineTo(5f, 3f);
+        bezierPath.close();
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        bezierPath.setFillType(Path.FillType.EVEN_ODD);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(fillColor104);
+        canvas.drawPath(bezierPath, paint);
+        
+        // Bezier 2
+        RectF bezier2Rect = CacheForParticipantsIcon.bezier2Rect;
+        bezier2Rect.set(10f, 3f, 19f, 17f);
+        Path bezier2Path = CacheForParticipantsIcon.bezier2Path;
+        bezier2Path.reset();
+        bezier2Path.moveTo(15f, 3f);
+        bezier2Path.lineTo(17f, 5f);
+        bezier2Path.lineTo(17f, 9f);
+        bezier2Path.lineTo(15f, 11f);
+        bezier2Path.lineTo(18f, 13f);
+        bezier2Path.lineTo(19f, 15f);
+        bezier2Path.lineTo(19f, 17f);
+        bezier2Path.lineTo(13f, 17f);
+        bezier2Path.lineTo(13f, 14f);
+        bezier2Path.lineTo(11f, 12f);
+        bezier2Path.lineTo(10f, 10f);
+        bezier2Path.lineTo(11f, 7f);
+        bezier2Path.lineTo(10f, 4f);
+        bezier2Path.lineTo(13f, 3f);
+        bezier2Path.lineTo(15f, 3f);
+        bezier2Path.close();
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        bezier2Path.setFillType(Path.FillType.EVEN_ODD);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(fillColor25);
+        canvas.drawPath(bezier2Path, paint);
+        
+        // Bezier 3
+        RectF bezier3Rect = CacheForParticipantsIcon.bezier3Rect;
+        bezier3Rect.set(0f, 2f, 20f, 18f);
+        Path bezier3Path = CacheForParticipantsIcon.bezier3Path;
+        bezier3Path.reset();
+        bezier3Path.moveTo(14f, 16f);
+        bezier3Path.cubicTo(14f, 14.46f, 13.42f, 13.06f, 12.46f, 12f);
+        bezier3Path.lineTo(14f, 12f);
+        bezier3Path.cubicTo(16.21f, 12f, 18f, 13.79f, 18f, 16f);
+        bezier3Path.lineTo(14f, 16f);
+        bezier3Path.close();
+        bezier3Path.moveTo(2f, 16f);
+        bezier3Path.cubicTo(2f, 13.79f, 3.79f, 12f, 6f, 12f);
+        bezier3Path.lineTo(8f, 12f);
+        bezier3Path.cubicTo(10.21f, 12f, 12f, 13.79f, 12f, 16f);
+        bezier3Path.lineTo(2f, 16f);
+        bezier3Path.close();
+        bezier3Path.moveTo(7f, 4f);
+        bezier3Path.cubicTo(8.66f, 4f, 10f, 5.34f, 10f, 7f);
+        bezier3Path.cubicTo(10f, 8.66f, 8.66f, 10f, 7f, 10f);
+        bezier3Path.cubicTo(5.34f, 10f, 4f, 8.66f, 4f, 7f);
+        bezier3Path.cubicTo(4f, 5.34f, 5.34f, 4f, 7f, 4f);
+        bezier3Path.lineTo(7f, 4f);
+        bezier3Path.close();
+        bezier3Path.moveTo(11.32f, 4.52f);
+        bezier3Path.cubicTo(11.8f, 4.19f, 12.38f, 4f, 13f, 4f);
+        bezier3Path.cubicTo(14.66f, 4f, 16f, 5.34f, 16f, 7f);
+        bezier3Path.cubicTo(16f, 8.66f, 14.66f, 10f, 13f, 10f);
+        bezier3Path.cubicTo(12.38f, 10f, 11.8f, 9.81f, 11.32f, 9.48f);
+        bezier3Path.cubicTo(11.74f, 8.75f, 12f, 7.91f, 12f, 7f);
+        bezier3Path.cubicTo(12f, 6.09f, 11.74f, 5.25f, 11.32f, 4.52f);
+        bezier3Path.lineTo(11.32f, 4.52f);
+        bezier3Path.close();
+        bezier3Path.moveTo(16.51f, 10.56f);
+        bezier3Path.cubicTo(17.43f, 9.65f, 18f, 8.39f, 18f, 7f);
+        bezier3Path.cubicTo(18f, 4.24f, 15.76f, 2f, 13f, 2f);
+        bezier3Path.cubicTo(11.87f, 2f, 10.84f, 2.39f, 10f, 3.03f);
+        bezier3Path.cubicTo(9.16f, 2.39f, 8.13f, 2f, 7f, 2f);
+        bezier3Path.cubicTo(4.24f, 2f, 2f, 4.24f, 2f, 7f);
+        bezier3Path.cubicTo(2f, 8.39f, 2.57f, 9.65f, 3.49f, 10.56f);
+        bezier3Path.cubicTo(1.43f, 11.5f, 0f, 13.58f, 0f, 16f);
+        bezier3Path.cubicTo(0f, 17.11f, 0.9f, 18f, 2f, 18f);
+        bezier3Path.lineTo(8f, 18f);
+        bezier3Path.lineTo(12f, 18f);
+        bezier3Path.lineTo(18f, 18f);
+        bezier3Path.cubicTo(19.11f, 18f, 20f, 17.11f, 20f, 16f);
+        bezier3Path.cubicTo(20f, 13.58f, 18.57f, 11.5f, 16.51f, 10.56f);
+        bezier3Path.lineTo(16.51f, 10.56f);
+        bezier3Path.close();
+        
+        paint.reset();
+        paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+        bezier3Path.setFillType(Path.FillType.EVEN_ODD);
+        paint.setStyle(Paint.Style.FILL);
+        paint.setColor(fillColor39);
+        canvas.drawPath(bezier3Path, paint);
+        
+        canvas.restore();
+    }
+    
+    
     // Canvas Images
     // Tab
     
@@ -9477,38 +12310,26 @@ public class HabiticaIcons {
         return imageOfUnpinItem;
     }
     
-    private static Bitmap imageOfItemIndicatorNumber = null;
-    public static Bitmap imageOfItemIndicatorNumber() {
-        if (imageOfItemIndicatorNumber != null)
-            return imageOfItemIndicatorNumber;
-        
-        imageOfItemIndicatorNumber = Bitmap.createBitmap(28, 28, Bitmap.Config.ARGB_8888);
+    public static Bitmap imageOfItemIndicatorNumber(int lockColor) {
+        Bitmap imageOfItemIndicatorNumber = Bitmap.createBitmap(28, 28, Bitmap.Config.ARGB_8888);
         Canvas canvas = new Canvas(imageOfItemIndicatorNumber);
-        HabiticaIcons.drawItemIndicatorNumber(canvas);
+        HabiticaIcons.drawItemIndicatorNumber(canvas, lockColor);
         
         return imageOfItemIndicatorNumber;
     }
     
-    private static Bitmap imageOfItemIndicatorLocked = null;
-    public static Bitmap imageOfItemIndicatorLocked() {
-        if (imageOfItemIndicatorLocked != null)
-            return imageOfItemIndicatorLocked;
-        
-        imageOfItemIndicatorLocked = Bitmap.createBitmap(28, 28, Bitmap.Config.ARGB_8888);
+    public static Bitmap imageOfItemIndicatorLocked(int lockColor) {
+        Bitmap imageOfItemIndicatorLocked = Bitmap.createBitmap(28, 28, Bitmap.Config.ARGB_8888);
         Canvas canvas = new Canvas(imageOfItemIndicatorLocked);
-        HabiticaIcons.drawItemIndicatorLocked(canvas);
+        HabiticaIcons.drawItemIndicatorLocked(canvas, lockColor);
         
         return imageOfItemIndicatorLocked;
     }
     
-    private static Bitmap imageOfItemIndicatorLimited = null;
-    public static Bitmap imageOfItemIndicatorLimited() {
-        if (imageOfItemIndicatorLimited != null)
-            return imageOfItemIndicatorLimited;
-        
-        imageOfItemIndicatorLimited = Bitmap.createBitmap(28, 28, Bitmap.Config.ARGB_8888);
+    public static Bitmap imageOfItemIndicatorLimited(int lockColor) {
+        Bitmap imageOfItemIndicatorLimited = Bitmap.createBitmap(28, 28, Bitmap.Config.ARGB_8888);
         Canvas canvas = new Canvas(imageOfItemIndicatorLimited);
-        HabiticaIcons.drawItemIndicatorLimited(canvas);
+        HabiticaIcons.drawItemIndicatorLimited(canvas, lockColor);
         
         return imageOfItemIndicatorLimited;
     }
@@ -9677,14 +12498,10 @@ public class HabiticaIcons {
         return imageOfAttributeAllocateButton;
     }
     
-    private static Bitmap imageOfInfoIcon = null;
-    public static Bitmap imageOfInfoIcon() {
-        if (imageOfInfoIcon != null)
-            return imageOfInfoIcon;
-        
-        imageOfInfoIcon = Bitmap.createBitmap(20, 20, Bitmap.Config.ARGB_8888);
+    public static Bitmap imageOfInfoIcon(int infoIconColor) {
+        Bitmap imageOfInfoIcon = Bitmap.createBitmap(20, 20, Bitmap.Config.ARGB_8888);
         Canvas canvas = new Canvas(imageOfInfoIcon);
-        HabiticaIcons.drawInfoIcon(canvas);
+        HabiticaIcons.drawInfoIcon(canvas, infoIconColor);
         
         return imageOfInfoIcon;
     }
@@ -9752,19 +12569,163 @@ public class HabiticaIcons {
         
         return imageOfRageStrikeActive;
     }
-
+    
     private static Bitmap imageOfRage = null;
     public static Bitmap imageOfRage() {
         if (imageOfRage != null)
             return imageOfRage;
-
+        
         imageOfRage = Bitmap.createBitmap(18, 18, Bitmap.Config.ARGB_8888);
         Canvas canvas = new Canvas(imageOfRage);
         HabiticaIcons.drawRage(canvas);
-
+        
         return imageOfRage;
     }
     
+    public static Bitmap imageOfTaskDifficultyStars(int taskTintColor, float difficulty, boolean isActive) {
+        Bitmap imageOfTaskDifficultyStars = Bitmap.createBitmap(36, 36, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(imageOfTaskDifficultyStars);
+        HabiticaIcons.drawTaskDifficultyStars(canvas, taskTintColor, difficulty, isActive);
+        
+        return imageOfTaskDifficultyStars;
+    }
+    
+    public static Bitmap imageOfHabitControlPlus(int taskTintColor, boolean isActive) {
+        Bitmap imageOfHabitControlPlus = Bitmap.createBitmap(34, 34, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(imageOfHabitControlPlus);
+        HabiticaIcons.drawHabitControlPlus(canvas, taskTintColor, isActive);
+        
+        return imageOfHabitControlPlus;
+    }
+    
+    public static Bitmap imageOfHabitControlMinus(int taskTintColor, boolean isActive) {
+        Bitmap imageOfHabitControlMinus = Bitmap.createBitmap(34, 34, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(imageOfHabitControlMinus);
+        HabiticaIcons.drawHabitControlMinus(canvas, taskTintColor, isActive);
+        
+        return imageOfHabitControlMinus;
+    }
+    
+    public static Bitmap imageOfLocked(int lockColor) {
+        Bitmap imageOfLocked = Bitmap.createBitmap(15, 17, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(imageOfLocked);
+        HabiticaIcons.drawLocked(canvas, lockColor);
+        
+        return imageOfLocked;
+    }
+    
+    public static Bitmap imageOfGuildCrest(Context context, boolean isOwner, boolean isPublic, float memberCount, String memberCountLabel) {
+        Bitmap imageOfGuildCrest = Bitmap.createBitmap(40, 38, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(imageOfGuildCrest);
+        HabiticaIcons.drawGuildCrest(canvas, context, isOwner, isPublic, memberCount, memberCountLabel);
+        
+        return imageOfGuildCrest;
+    }
+    
+    public static Bitmap imageOfGuildCrestMedium(float memberCount) {
+        Bitmap imageOfGuildCrestMedium = Bitmap.createBitmap(30, 34, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(imageOfGuildCrestMedium);
+        HabiticaIcons.drawGuildCrestMedium(canvas, memberCount);
+        
+        return imageOfGuildCrestMedium;
+    }
+    
+    public static Bitmap imageOfGuildCrestSmall(float memberCount) {
+        Bitmap imageOfGuildCrestSmall = Bitmap.createBitmap(16, 16, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(imageOfGuildCrestSmall);
+        HabiticaIcons.drawGuildCrestSmall(canvas, memberCount);
+        
+        return imageOfGuildCrestSmall;
+    }
+    
+    public static Bitmap imageOfGuildHeaderCrest(int guildHeader) {
+        Bitmap imageOfGuildHeaderCrest = Bitmap.createBitmap(116, 58, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(imageOfGuildHeaderCrest);
+        HabiticaIcons.drawGuildHeaderCrest(canvas, guildHeader);
+        
+        return imageOfGuildHeaderCrest;
+    }
+    
+    private static Bitmap imageOfTwoHandedIcon = null;
+    public static Bitmap imageOfTwoHandedIcon() {
+        if (imageOfTwoHandedIcon != null)
+            return imageOfTwoHandedIcon;
+        
+        imageOfTwoHandedIcon = Bitmap.createBitmap(15, 15, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(imageOfTwoHandedIcon);
+        HabiticaIcons.drawTwoHandedIcon(canvas);
+        
+        return imageOfTwoHandedIcon;
+    }
+    
+    private static Bitmap imageOfBlankAvatarIcon = null;
+    public static Bitmap imageOfBlankAvatarIcon() {
+        if (imageOfBlankAvatarIcon != null)
+            return imageOfBlankAvatarIcon;
+        
+        imageOfBlankAvatarIcon = Bitmap.createBitmap(36, 34, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(imageOfBlankAvatarIcon);
+        HabiticaIcons.drawBlankAvatarIcon(canvas);
+        
+        return imageOfBlankAvatarIcon;
+    }
+    
+    private static Bitmap imageOfDisclosureArrow = null;
+    public static Bitmap imageOfDisclosureArrow() {
+        if (imageOfDisclosureArrow != null)
+            return imageOfDisclosureArrow;
+        
+        imageOfDisclosureArrow = Bitmap.createBitmap(8, 13, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(imageOfDisclosureArrow);
+        HabiticaIcons.drawDisclosureArrow(canvas);
+        
+        return imageOfDisclosureArrow;
+    }
+    
+    public static Bitmap imageOfFilterIcon(float percentage) {
+        Bitmap imageOfFilterIcon = Bitmap.createBitmap(22, 22, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(imageOfFilterIcon);
+        HabiticaIcons.drawFilterIcon(canvas, percentage);
+        
+        return imageOfFilterIcon;
+    }
+    
+    private static Bitmap imageOfDeclineIcon = null;
+    public static Bitmap imageOfDeclineIcon() {
+        if (imageOfDeclineIcon != null)
+            return imageOfDeclineIcon;
+        
+        imageOfDeclineIcon = Bitmap.createBitmap(13, 13, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(imageOfDeclineIcon);
+        HabiticaIcons.drawDeclineIcon(canvas);
+        
+        return imageOfDeclineIcon;
+    }
+    
+    private static Bitmap imageOfAcceptIcon = null;
+    public static Bitmap imageOfAcceptIcon() {
+        if (imageOfAcceptIcon != null)
+            return imageOfAcceptIcon;
+        
+        imageOfAcceptIcon = Bitmap.createBitmap(13, 13, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(imageOfAcceptIcon);
+        HabiticaIcons.drawAcceptIcon(canvas);
+        
+        return imageOfAcceptIcon;
+    }
+    
+    private static Bitmap imageOfBuffIcon = null;
+    public static Bitmap imageOfBuffIcon() {
+        if (imageOfBuffIcon != null)
+            return imageOfBuffIcon;
+        
+        imageOfBuffIcon = Bitmap.createBitmap(15, 15, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(imageOfBuffIcon);
+        HabiticaIcons.drawBuffIcon(canvas);
+        
+        return imageOfBuffIcon;
+    }
+    
     
     // Resizing Behavior
     public static void resizingBehaviorApply(ResizingBehavior behavior, RectF rect, RectF target, RectF result) {
@@ -9956,3 +12917,23 @@ class PaintCodeDashPathEffect {
         return this.effect;
     }
 }
+
+
+class PaintCodeStaticLayout {
+    private StaticLayout layout;
+    private int width;
+    private Layout.Alignment alignment;
+    private CharSequence source;
+    private TextPaint paint;
+    
+    StaticLayout get(int width, Layout.Alignment alignment, CharSequence source, TextPaint paint) {
+        if (this.layout == null || this.width != width || this.alignment != alignment || !this.source.equals(source) || !this.paint.equals(paint)) {
+            this.width = width;
+            this.alignment = alignment;
+            this.source = source;
+            this.paint = paint;
+            this.layout = new StaticLayout(source, paint, width, alignment, 1, 0, false);
+        }
+        return this.layout;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIconsHelper.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIconsHelper.java
index 79d8b637b..e1170cda0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIconsHelper.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaIconsHelper.java
@@ -3,8 +3,11 @@ package com.habitrpg.android.habitica.ui.views;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
+import android.graphics.Color;
 import android.graphics.PointF;
 import android.graphics.RectF;
+import android.support.annotation.ColorInt;
+import android.support.annotation.ColorRes;
 
 /**
  * Created by phillip on 05.09.17.
@@ -262,7 +265,7 @@ public class HabiticaIconsHelper {
         imageOfItemIndicatorNumber = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
         Canvas canvas = new Canvas(imageOfItemIndicatorNumber);
         canvas.scale(displayDensity, displayDensity);
-        HabiticaIcons.drawItemIndicator(canvas, false, false);
+        HabiticaIcons.drawItemIndicator(canvas, Color.parseColor("#C3C0C7"), false, false);
 
         return imageOfItemIndicatorNumber;
     }
@@ -276,8 +279,7 @@ public class HabiticaIconsHelper {
         imageOfItemIndicatorLocked = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
         Canvas canvas = new Canvas(imageOfItemIndicatorLocked);
         canvas.scale(displayDensity, displayDensity);
-        HabiticaIcons.drawItemIndicator(canvas, true, false);
-
+        HabiticaIcons.drawItemIndicator(canvas, Color.parseColor("#C3C0C7"), true, false);
         return imageOfItemIndicatorLocked;
     }
 
@@ -290,7 +292,7 @@ public class HabiticaIconsHelper {
         imageOfItemIndicatorLimited = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
         Canvas canvas = new Canvas(imageOfItemIndicatorLimited);
         canvas.scale(displayDensity, displayDensity);
-        HabiticaIcons.drawItemIndicator(canvas, false, true);
+        HabiticaIcons.drawItemIndicator(canvas, Color.parseColor("#C3C0C7"), false, true);
 
         return imageOfItemIndicatorLimited;
     }
@@ -474,7 +476,7 @@ public class HabiticaIconsHelper {
     }
 
     private static Bitmap imageOfInfoIcon = null;
-    public static Bitmap imageOfInfoIcon() {
+    public static Bitmap imageOfInfoIcon(@ColorInt int iconColor) {
         if (imageOfInfoIcon != null)
             return imageOfInfoIcon;
 
@@ -482,7 +484,7 @@ public class HabiticaIconsHelper {
         imageOfInfoIcon = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
         Canvas canvas = new Canvas(imageOfInfoIcon);
         canvas.scale(displayDensity, displayDensity);
-        HabiticaIcons.drawInfoIcon(canvas);
+        HabiticaIcons.drawInfoIcon(canvas, iconColor);
 
         return imageOfInfoIcon;
     }
@@ -576,4 +578,27 @@ public class HabiticaIconsHelper {
 
         return imageOfRage;
     }
+
+    public static Bitmap imageOfLocked(@ColorInt int lockColor) {
+        Bitmap imageOfLocked = Bitmap.createBitmap(scaleSize(15), scaleSize(17), Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(imageOfLocked);
+        canvas.scale(displayDensity, displayDensity);
+        HabiticaIcons.drawLocked(canvas, lockColor);
+
+        return imageOfLocked;
+    }
+
+    private static Bitmap imageOfParticipantsIcon = null;
+    public static Bitmap imageOfParticipantIcon() {
+        if (imageOfParticipantsIcon != null)
+            return imageOfParticipantsIcon;
+
+        int size = scaleSize(20);
+        imageOfParticipantsIcon = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(imageOfParticipantsIcon);
+        canvas.scale(displayDensity, displayDensity);
+        HabiticaIcons.drawParticipantsIcon(canvas);
+
+        return imageOfParticipantsIcon;
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChallengeDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChallengeDeserializer.java
deleted file mode 100644
index 87e52f9d0..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChallengeDeserializer.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.habitrpg.android.habitica.utils;
-
-import android.text.TextUtils;
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-import com.google.gson.JsonSerializationContext;
-import com.google.gson.JsonSerializer;
-import com.habitrpg.android.habitica.models.social.Challenge;
-
-import java.lang.reflect.Type;
-import java.util.Date;
-
-public class ChallengeDeserializer implements JsonDeserializer<Challenge>, JsonSerializer<Challenge> {
-    @Override
-    public Challenge deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-
-        JsonObject jsonObject = json.getAsJsonObject();
-
-        Challenge challenge = new Challenge();
-
-        challenge.id = jsonObject.get("id").getAsString();
-        challenge.name = jsonObject.get("name").getAsString();
-        if (jsonObject.has("sortName")) {
-            challenge.shortName = jsonObject.get("shortName").getAsString();
-        }
-        challenge.description = jsonObject.get("description").getAsString();
-        challenge.memberCount = jsonObject.get("memberCount").getAsInt();
-
-        JsonElement prizeElement = jsonObject.get("prize");
-        if (!prizeElement.isJsonNull()) {
-            challenge.prize = prizeElement.getAsInt();
-        }
-
-        challenge.official = jsonObject.get("official").getAsBoolean();
-
-        JsonElement leaderElement = jsonObject.get("leader");
-
-        if (leaderElement != null && !leaderElement.isJsonNull()) {
-            JsonObject leaderObj = leaderElement.getAsJsonObject();
-
-            if (leaderObj != null) {
-                JsonObject profile = leaderObj.get("profile").getAsJsonObject();
-
-                if (profile != null) {
-                    challenge.leaderName = profile.get("name").getAsString();
-
-                    JsonElement id = leaderObj.get("id");
-                    if (id == null) {
-                        id = leaderObj.get("_id");
-                    }
-
-                    if (id != null) {
-                        challenge.leaderId = id.getAsString();
-                    }
-                }
-            }
-        }
-
-        if (jsonObject.has("createdAt")) {
-            challenge.createdAt = context.deserialize(jsonObject.get("createdAt"), Date.class);
-        }
-        if (jsonObject.has("updatedAt")) {
-            challenge.updatedAt = context.deserialize(jsonObject.get("updatedAt"), Date.class);
-        }
-
-        JsonElement groupElement = jsonObject.get("group");
-
-        if (groupElement != null && !groupElement.isJsonNull()) {
-            JsonObject groupObj = groupElement.getAsJsonObject();
-
-            if (groupObj != null) {
-                challenge.groupName = groupObj.get("name").getAsString();
-                challenge.groupId = groupObj.get("_id").getAsString();
-            }
-        }
-
-        JsonElement tasksOrderElement = jsonObject.get("tasksOrder");
-
-        if (tasksOrderElement != null && !tasksOrderElement.isJsonNull()) {
-            JsonObject tasksOrderObj = tasksOrderElement.getAsJsonObject();
-
-            challenge.todoList = getTaskArrayAsString(context, tasksOrderObj, Challenge.TASK_ORDER_TODOS);
-            challenge.dailyList = getTaskArrayAsString(context, tasksOrderObj, Challenge.TASK_ORDER_DAILYS);
-            challenge.habitList = getTaskArrayAsString(context, tasksOrderObj, Challenge.TASK_ORDER_HABITS);
-            challenge.rewardList = getTaskArrayAsString(context, tasksOrderObj, Challenge.TASK_ORDER_REWARDS);
-        }
-
-        return challenge;
-    }
-
-    private String getTaskArrayAsString(JsonDeserializationContext context, JsonObject tasksOrderObj, String taskType) {
-
-        if (tasksOrderObj.has(taskType)) {
-            JsonElement jsonElement = tasksOrderObj.get(taskType);
-
-            String[] taskArray = context.deserialize(jsonElement, String[].class);
-
-            return TextUtils.join(",", taskArray);
-        }
-
-        return "";
-    }
-
-    @Override
-    public JsonElement serialize(Challenge src, Type typeOfSrc, JsonSerializationContext context) {
-        JsonObject object = new JsonObject();
-        object.addProperty("id", src.id);
-        object.addProperty("name", src.name);
-        object.addProperty("shortName", src.shortName);
-        object.addProperty("description", src.description);
-        object.addProperty("memberCount", src.memberCount);
-        object.addProperty("prize", src.prize);
-        object.addProperty("official", src.official);
-
-        object.addProperty("group", src.groupId);
-        object.add("tasksOrder", context.serialize(src.tasksOrder));
-
-
-        return object;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChallengeDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChallengeDeserializer.kt
new file mode 100644
index 000000000..3a63f2fe6
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChallengeDeserializer.kt
@@ -0,0 +1,124 @@
+package com.habitrpg.android.habitica.utils
+
+import android.text.TextUtils
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonObject
+import com.google.gson.JsonParseException
+import com.google.gson.JsonSerializationContext
+import com.google.gson.JsonSerializer
+import com.habitrpg.android.habitica.models.social.Challenge
+
+import java.lang.reflect.Type
+import java.util.Date
+
+class ChallengeDeserializer : JsonDeserializer<Challenge>, JsonSerializer<Challenge> {
+    @Throws(JsonParseException::class)
+    override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): Challenge {
+
+        val jsonObject = json.asJsonObject
+
+        val challenge = Challenge()
+
+        challenge.id = jsonObject.get("id").asString
+        challenge.name = jsonObject.get("name").asString
+        if (jsonObject.has("sortName")) {
+            challenge.shortName = jsonObject.get("shortName").asString
+        }
+        challenge.description = jsonObject.get("description").asString
+        challenge.memberCount = jsonObject.get("memberCount").asInt
+
+        val prizeElement = jsonObject.get("prize")
+        if (!prizeElement.isJsonNull) {
+            challenge.prize = prizeElement.asInt
+        }
+
+        challenge.official = jsonObject.get("official").asBoolean
+
+        val leaderElement = jsonObject.get("leader")
+
+        if (leaderElement != null && !leaderElement.isJsonNull) {
+            val leaderObj = leaderElement.asJsonObject
+
+            if (leaderObj != null) {
+                val profile = leaderObj.get("profile").asJsonObject
+
+                if (profile != null) {
+                    challenge.leaderName = profile.get("name").asString
+
+                    var id: JsonElement? = leaderObj.get("id")
+                    if (id == null) {
+                        id = leaderObj.get("_id")
+                    }
+
+                    if (id != null) {
+                        challenge.leaderId = id.asString
+                    }
+                }
+            }
+        }
+
+        if (jsonObject.has("createdAt")) {
+            challenge.createdAt = context.deserialize(jsonObject.get("createdAt"), Date::class.java)
+        }
+        if (jsonObject.has("updatedAt")) {
+            challenge.updatedAt = context.deserialize(jsonObject.get("updatedAt"), Date::class.java)
+        }
+
+        val groupElement = jsonObject.get("group")
+
+        if (groupElement != null && !groupElement.isJsonNull) {
+            val groupObj = groupElement.asJsonObject
+
+            if (groupObj != null) {
+                challenge.groupName = groupObj.get("name").asString
+                challenge.groupId = groupObj.get("_id").asString
+            }
+        }
+
+        val tasksOrderElement = jsonObject.get("tasksOrder")
+
+        if (tasksOrderElement != null && !tasksOrderElement.isJsonNull) {
+            val tasksOrderObj = tasksOrderElement.asJsonObject
+
+            challenge.todoList = getTaskArrayAsString(context, tasksOrderObj, Challenge.TASK_ORDER_TODOS)
+            challenge.dailyList = getTaskArrayAsString(context, tasksOrderObj, Challenge.TASK_ORDER_DAILYS)
+            challenge.habitList = getTaskArrayAsString(context, tasksOrderObj, Challenge.TASK_ORDER_HABITS)
+            challenge.rewardList = getTaskArrayAsString(context, tasksOrderObj, Challenge.TASK_ORDER_REWARDS)
+        }
+
+        return challenge
+    }
+
+    private fun getTaskArrayAsString(context: JsonDeserializationContext, tasksOrderObj: JsonObject, taskType: String): String {
+
+        if (tasksOrderObj.has(taskType)) {
+            val jsonElement = tasksOrderObj.get(taskType)
+
+            val taskArray = context.deserialize<Array<String>>(jsonElement, Array<String>::class.java)
+
+            return TextUtils.join(",", taskArray)
+        }
+
+        return ""
+    }
+
+    override fun serialize(src: Challenge, typeOfSrc: Type, context: JsonSerializationContext): JsonElement {
+        val obj = JsonObject()
+        obj.addProperty("id", src.id)
+        obj.addProperty("name", src.name)
+        obj.addProperty("shortName", src.shortName)
+        obj.addProperty("description", src.description)
+        obj.addProperty("memberCount", src.memberCount)
+        obj.addProperty("prize", src.prize)
+        obj.addProperty("official", src.official)
+
+        obj.addProperty("group", src.groupId)
+        obj.add("tasksOrder", context.serialize(src.tasksOrder))
+
+
+        return obj
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChallengeListDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChallengeListDeserializer.java
deleted file mode 100644
index c141396dd..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChallengeListDeserializer.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.habitrpg.android.habitica.utils;
-
-import android.support.annotation.Nullable;
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParseException;
-import com.habitrpg.android.habitica.models.social.Challenge;
-
-import java.lang.reflect.Type;
-import java.util.List;
-
-import io.realm.Realm;
-import io.realm.RealmList;
-
-public class ChallengeListDeserializer implements JsonDeserializer<List<Challenge>> {
-    @Override
-    public List<Challenge> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-        RealmList<Challenge> challenges = new RealmList<>();
-
-        Realm realm = Realm.getDefaultInstance();
-        List<Challenge> existingChallenges = realm.copyFromRealm(realm.where(Challenge.class).findAll());
-        realm.close();
-
-         for (JsonElement element : json.getAsJsonArray()) {
-            Challenge challenge;
-            if (element.isJsonObject()) {
-                challenge = context.deserialize(element, Challenge.class);
-                Challenge existingChallenge = findExistingChallenge(existingChallenges, challenge.id);
-                if (existingChallenge != null) {
-                    challenge.isParticipating = existingChallenge.isParticipating;
-                }
-            } else {
-                challenge = findExistingChallenge(existingChallenges, element.getAsString());
-                if (challenge == null) {
-                    challenge = new Challenge();
-                    challenge.id = element.getAsString();
-                }
-                challenge.isParticipating = true;
-            }
-            challenges.add(challenge);
-        }
-
-        return challenges;
-    }
-
-    @Nullable
-    private Challenge findExistingChallenge(List<Challenge> existingChallenges, String id) {
-        for (Challenge challenge : existingChallenges) {
-            if (id.equals(challenge.id)) {
-                return challenge;
-            }
-        }
-        return null;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChallengeListDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChallengeListDeserializer.kt
new file mode 100644
index 000000000..9271b2409
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChallengeListDeserializer.kt
@@ -0,0 +1,37 @@
+package com.habitrpg.android.habitica.utils
+
+import com.google.gson.JsonDeserializationContext
+import com.google.gson.JsonDeserializer
+import com.google.gson.JsonElement
+import com.google.gson.JsonParseException
+import com.habitrpg.android.habitica.models.social.Challenge
+
+import java.lang.reflect.Type
+
+import io.realm.Realm
+import io.realm.RealmList
+
+class ChallengeListDeserializer : JsonDeserializer<List<Challenge>> {
+    @Throws(JsonParseException::class)
+    override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): List<Challenge> {
+        val challenges = RealmList<Challenge>()
+
+        val realm = Realm.getDefaultInstance()
+        realm.close()
+
+        for (element in json.asJsonArray) {
+            var challenge: Challenge?
+            if (element.isJsonObject) {
+                challenge = context.deserialize<Challenge>(element, Challenge::class.java)
+            } else {
+                challenge = Challenge()
+                challenge.id = element.asString
+            }
+            if (challenge != null) {
+                challenges.add(challenge)
+            }
+        }
+
+        return challenges
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/UserDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/UserDeserializer.kt
index a92f83272..2065e1065 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/UserDeserializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/UserDeserializer.kt
@@ -9,7 +9,7 @@ import com.habitrpg.android.habitica.models.PushDevice
 import com.habitrpg.android.habitica.models.Tag
 import com.habitrpg.android.habitica.models.inventory.Quest
 import com.habitrpg.android.habitica.models.invitations.Invitations
-import com.habitrpg.android.habitica.models.social.Challenge
+import com.habitrpg.android.habitica.models.social.ChallengeMembership
 import com.habitrpg.android.habitica.models.social.UserParty
 import com.habitrpg.android.habitica.models.tasks.TasksOrder
 import com.habitrpg.android.habitica.models.user.*
@@ -84,7 +84,10 @@ class UserDeserializer : JsonDeserializer<User> {
             user.tasksOrder = context.deserialize(obj.get("tasksOrder"), TasksOrder::class.java)
         }
         if (obj.has("challenges")) {
-            user.challenges = context.deserialize(obj.get("challenges"), object : TypeToken<RealmList<Challenge>>() {}.type)
+            user.challenges = RealmList()
+            obj.getAsJsonArray("challenges").forEach {
+                user.challenges.add(ChallengeMembership(user.id, it.asString))
+            }
         }
         if (obj.has("purchased")) {
             user.purchased = context.deserialize(obj.get("purchased"), Purchases::class.java)