diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index a676ada8f..7e415a6bb 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.habitrpg.android.habitica"
-    android:versionCode="155"
-    android:versionName="0.0.37"
+    android:versionCode="156"
+    android:versionName="0.0.37.1"
     android:screenOrientation="portrait"
     android:installLocation="auto" >
 
diff --git a/Habitica/res/drawable-hdpi/ic_check_purple_24dp.png b/Habitica/res/drawable-hdpi/ic_check_purple_24dp.png
new file mode 100644
index 000000000..ac436a012
Binary files /dev/null and b/Habitica/res/drawable-hdpi/ic_check_purple_24dp.png differ
diff --git a/Habitica/res/drawable-mdpi/ic_check_purple_24dp.png b/Habitica/res/drawable-mdpi/ic_check_purple_24dp.png
new file mode 100644
index 000000000..c0548bcbe
Binary files /dev/null and b/Habitica/res/drawable-mdpi/ic_check_purple_24dp.png differ
diff --git a/Habitica/res/drawable-xhdpi/ic_check_purple_24dp.png b/Habitica/res/drawable-xhdpi/ic_check_purple_24dp.png
new file mode 100644
index 000000000..f2d27754e
Binary files /dev/null and b/Habitica/res/drawable-xhdpi/ic_check_purple_24dp.png differ
diff --git a/Habitica/res/drawable-xxhdpi/ic_check_purple_24dp.png b/Habitica/res/drawable-xxhdpi/ic_check_purple_24dp.png
new file mode 100644
index 000000000..26bee6d37
Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/ic_check_purple_24dp.png differ
diff --git a/Habitica/res/drawable-xxxhdpi/ic_check_purple_24dp.png b/Habitica/res/drawable-xxxhdpi/ic_check_purple_24dp.png
new file mode 100644
index 000000000..60b008016
Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/ic_check_purple_24dp.png differ
diff --git a/Habitica/res/layout/activity_full_profile.xml b/Habitica/res/layout/activity_full_profile.xml
index 5846402b9..6e398d916 100644
--- a/Habitica/res/layout/activity_full_profile.xml
+++ b/Habitica/res/layout/activity_full_profile.xml
@@ -293,11 +293,11 @@
                                 android:textStyle="bold" />
 
                             <com.facebook.drawee.view.SimpleDraweeView
-                                android:id="@+id/attributes_collapse_icon"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:src="@drawable/ic_keyboard_arrow_right_black_24dp"
-                                android:layout_gravity="bottom" />
+                                    android:id="@+id/attributes_collapse_icon"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    app:srcCompat="@drawable/ic_keyboard_arrow_right_black_24dp"
+                                    android:layout_gravity="bottom" />
 
                         </LinearLayout>
 
diff --git a/Habitica/res/values-v21/styles.xml b/Habitica/res/values-v21/styles.xml
new file mode 100644
index 000000000..36b71cf42
--- /dev/null
+++ b/Habitica/res/values-v21/styles.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="GemPurchaseListItem">
+        <item name="android:textColor">@color/brand_100</item>
+        <item name="android:gravity">center_horizontal</item>
+        <item name="android:textSize">12sp</item>
+        <item name="android:drawableLeft">@drawable/ic_check_purple</item>
+        <item name="android:layout_gravity">center</item>
+        <item name="android:drawablePadding">4dp</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index 02f1a82c8..4e344dc98 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -187,7 +187,7 @@
         <item name="android:textColor">@color/brand_100</item>
         <item name="android:gravity">center_horizontal</item>
         <item name="android:textSize">12sp</item>
-        <item name="android:drawableLeft">@drawable/ic_check_purple</item>
+        <item name="android:drawableLeft">@drawable/ic_check_purple_24dp</item>
         <item name="android:layout_gravity">center</item>
         <item name="android:drawablePadding">4dp</item>
     </style>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PopupNotificationsManager.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PopupNotificationsManager.java
index 6f026a864..7ea30aba2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PopupNotificationsManager.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PopupNotificationsManager.java
@@ -108,7 +108,11 @@ public class PopupNotificationsManager {
     }
 
     public Boolean showNotificationDialog(final List<Notification> notifications) {
-        if (notifications.size() == 0) {
+        if (notifications == null || notifications.size() == 0) {
+            return false;
+        }
+
+        if (HabiticaApplication.currentActivity == null || HabiticaApplication.currentActivity.isFinishing()) {
             return false;
         }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.java
index e0998703c..0c3f714c2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.java
@@ -169,7 +169,7 @@ public class GuildFragment extends BaseMainFragment implements Action1<Group> {
 
             @Override
             public void onPageSelected(int position) {
-                if (position == 1 && GuildFragment.this.guild != null) {
+                if (position == 1 && GuildFragment.this.guild != null && chatListFragment != null) {
                     chatListFragment.setNavigatedToFragment(GuildFragment.this.guild.id);
                 }
             }