diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index 1bfa96778..e8efa408e 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.habitrpg.android.habitica"
-    android:versionCode="90"
+    android:versionCode="91"
     android:versionName="0.0.31.0"
     android:screenOrientation="portrait"
     android:installLocation="auto" >
diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 108e33313..dd8a507d7 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -198,6 +198,10 @@ android {
         javaMaxHeapSize "2g" // Use gig increments depending on needs
         incremental true
     }
+
+    lintOptions {
+        disable 'UnusedResources'
+    }
 }
 
 def Properties props = new Properties()
diff --git a/Habitica/res/layout/overlay_tutorial.xml b/Habitica/res/layout/overlay_tutorial.xml
index 2e1d26424..df24167a8 100644
--- a/Habitica/res/layout/overlay_tutorial.xml
+++ b/Habitica/res/layout/overlay_tutorial.xml
@@ -42,13 +42,13 @@
                 android:layout_height="wrap_content"
                 android:id="@+id/tutorialTextView"
                 android:layout_gravity="bottom"
-                android:textSize="20sp"
-                android:text="jerwerwe rwe r we rwerewioro ikljhrwe rjhwek rhjwekr jhwke rhjwke jrhwkelgrfwe r" />
+                android:textSize="20sp" />
 
             <LinearLayout
                 android:orientation="horizontal"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="match_parent"
+                style="?android:attr/buttonBarStyle" >
 
                 <Button
                     android:layout_width="0px"
@@ -57,7 +57,8 @@
                     android:text="@string/dismiss_tutorial"
                     android:id="@+id/dismissButton"
                     android:layout_gravity="center_vertical"
-                    android:theme="@style/DialogButton" />
+                    android:theme="@style/DialogButton"
+                    style="?android:attr/buttonBarButtonStyle" />
 
                 <Button
                     android:layout_width="0px"
@@ -66,7 +67,8 @@
                     android:text="@string/complete_tutorial"
                     android:id="@+id/completeButton"
                     android:layout_gravity="center_vertical"
-                    android:theme="@style/DialogButton" />
+                    android:theme="@style/DialogButton"
+                    style="?android:attr/buttonBarButtonStyle" />
             </LinearLayout>
 
         </LinearLayout>
diff --git a/Habitica/res/layout/reminder_item.xml b/Habitica/res/layout/reminder_item.xml
index c7bf48246..98f0489e0 100644
--- a/Habitica/res/layout/reminder_item.xml
+++ b/Habitica/res/layout/reminder_item.xml
@@ -12,7 +12,8 @@
         android:layout_weight="1"
         android:layout_height="wrap_content"
         android:textColor="@android:color/black"
-        android:focusable="false" />
+        android:focusable="false"
+            android:inputType="date"/>
 
     <Button
         style="?android:attr/buttonStyleSmall"
diff --git a/Habitica/res/layout/skill_task_item_card.xml b/Habitica/res/layout/skill_task_item_card.xml
index 0ece71509..8547f47da 100644
--- a/Habitica/res/layout/skill_task_item_card.xml
+++ b/Habitica/res/layout/skill_task_item_card.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <data>
 
@@ -11,7 +12,7 @@
             type="Task" />
     </data>
 
-    <LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
diff --git a/Habitica/res/layout/value_bar.xml b/Habitica/res/layout/value_bar.xml
index 58a4fce9a..0cfa8999e 100644
--- a/Habitica/res/layout/value_bar.xml
+++ b/Habitica/res/layout/value_bar.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <data>
 
@@ -30,8 +31,7 @@
 
     </data>
 
-    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/bar_padding"
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.java
index aaa9cc064..35f70e191 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.java
@@ -406,6 +406,11 @@ public class AvatarView extends View {
         return multiDraweeHolder.onTouchEvent(event) || super.onTouchEvent(event);
     }
 
+    @Override
+    public boolean performClick() {
+        return super.performClick();
+    }
+
     @Override
     protected boolean verifyDrawable(Drawable who) {
         return multiDraweeHolder.verifyDrawable(who) || super.verifyDrawable(who);