diff --git a/src/amazon/java/org/tasks/analytics/Tracker.java b/src/amazon/java/org/tasks/analytics/Tracker.java
index 60aacb904..f79328899 100644
--- a/src/amazon/java/org/tasks/analytics/Tracker.java
+++ b/src/amazon/java/org/tasks/analytics/Tracker.java
@@ -33,20 +33,17 @@ public class Tracker {
         tracker = analytics.newTracker(R.xml.google_analytics);
         tracker.setAppVersion(Integer.toString(BuildConfig.VERSION_CODE));
         final StandardExceptionParser standardExceptionParser = new StandardExceptionParser(context, null);
-        exceptionParser = new ExceptionParser() {
-            @Override
-            public String getDescription(String thread, Throwable throwable) {
-                StringBuilder stack = new StringBuilder()
-                        .append(standardExceptionParser.getDescription(thread, throwable))
-                        .append("\n")
-                        .append(throwable.getClass().getName())
+        exceptionParser = (thread, throwable) -> {
+            StringBuilder stack = new StringBuilder()
+                    .append(standardExceptionParser.getDescription(thread, throwable))
+                    .append("\n")
+                    .append(throwable.getClass().getName())
+                    .append("\n");
+            for (StackTraceElement element : throwable.getStackTrace()) {
+                stack.append(element.toString())
                         .append("\n");
-                for (StackTraceElement element : throwable.getStackTrace()) {
-                    stack.append(element.toString())
-                            .append("\n");
-                }
-                return stack.toString();
             }
+            return stack.toString();
         };
         ExceptionReporter reporter = new ExceptionReporter(
                 tracker,
diff --git a/src/googleplay/AndroidManifest.xml b/src/googleplay/AndroidManifest.xml
index 151553f91..11eb6fa7f 100644
--- a/src/googleplay/AndroidManifest.xml
+++ b/src/googleplay/AndroidManifest.xml
@@ -30,7 +30,7 @@
     <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>
     <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS"/>
 
-    <application>
+    <application tools:ignore="GoogleAppIndexingWarning">
 
         <meta-data
             android:name="com.google.android.backup.api_key"
@@ -146,7 +146,8 @@
 
         <service
             android:name=".gtasks.GoogleTaskSyncService"
-            android:exported="true">
+            android:exported="true"
+            android:permission="signature">
             <intent-filter>
                 <action android:name="android.content.SyncAdapter" />
             </intent-filter>
diff --git a/src/main/java/com/todoroo/astrid/provider/Astrid3ContentProvider.java b/src/main/java/com/todoroo/astrid/provider/Astrid3ContentProvider.java
index bece6cdfc..1a3e4dc44 100644
--- a/src/main/java/com/todoroo/astrid/provider/Astrid3ContentProvider.java
+++ b/src/main/java/com/todoroo/astrid/provider/Astrid3ContentProvider.java
@@ -5,6 +5,7 @@
  */
 package com.todoroo.astrid.provider;
 
+import android.annotation.SuppressLint;
 import android.content.ContentResolver;
 import android.content.ContentUris;
 import android.content.ContentValues;
@@ -78,6 +79,7 @@ public class Astrid3ContentProvider extends InjectingContentProvider {
 
     private static final UriMatcher uriMatcher;
 
+    @SuppressLint("StaticFieldLeak")
     private static Database databaseOverride;
 
     // --- instance variables
diff --git a/src/main/java/com/todoroo/astrid/reminders/ReminderService.java b/src/main/java/com/todoroo/astrid/reminders/ReminderService.java
index 71006844b..cd69b4dd4 100644
--- a/src/main/java/com/todoroo/astrid/reminders/ReminderService.java
+++ b/src/main/java/com/todoroo/astrid/reminders/ReminderService.java
@@ -5,6 +5,7 @@
  */
 package com.todoroo.astrid.reminders;
 
+import android.annotation.SuppressLint;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
@@ -345,7 +346,7 @@ public final class ReminderService  {
 
             // calculate the unique requestCode as a combination of the task-id and alarm-type:
             // concatenate id+type to keep the combo unique
-            String rc = String.format("%d%d", task.getId(), type);
+            @SuppressLint("DefaultLocale") String rc = String.format("%d%d", task.getId(), type);
             int requestCode;
             try {
                 requestCode = Integer.parseInt(rc);
diff --git a/src/main/res/drawable/ic_add_24dp.xml b/src/main/res/drawable/ic_add_24dp.xml
index 51b073bd2..d1880fe4c 100644
--- a/src/main/res/drawable/ic_add_24dp.xml
+++ b/src/main/res/drawable/ic_add_24dp.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector android:autoMirrored="true" android:height="24dp"
+<vector xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="UnusedAttribute">
     <path android:fillColor="#FF000000" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
 </vector>
diff --git a/src/main/res/drawable/ic_arrow_back_24dp.xml b/src/main/res/drawable/ic_arrow_back_24dp.xml
index d9839b1c6..c61085ceb 100644
--- a/src/main/res/drawable/ic_arrow_back_24dp.xml
+++ b/src/main/res/drawable/ic_arrow_back_24dp.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector android:autoMirrored="true" android:height="24dp"
+<vector xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="UnusedAttribute">
     <path android:fillColor="#FF000000" android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
 </vector>
diff --git a/src/main/res/drawable/ic_attachment_24dp.xml b/src/main/res/drawable/ic_attachment_24dp.xml
index 115de53d8..3bd752d27 100644
--- a/src/main/res/drawable/ic_attachment_24dp.xml
+++ b/src/main/res/drawable/ic_attachment_24dp.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector android:autoMirrored="true" android:height="24dp"
+<vector xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="UnusedAttribute">
     <path android:fillColor="#FF000000" android:pathData="M7.5,18C4.46,18 2,15.54 2,12.5S4.46,7 7.5,7H18c2.21,0 4,1.79 4,4s-1.79,4 -4,4H9.5C8.12,15 7,13.88 7,12.5S8.12,10 9.5,10H17v1.5H9.5c-0.55,0 -1,0.45 -1,1s0.45,1 1,1H18c1.38,0 2.5,-1.12 2.5,-2.5S19.38,8.5 18,8.5H7.5c-2.21,0 -4,1.79 -4,4s1.79,4 4,4H17V18H7.5z"/>
 </vector>
diff --git a/src/main/res/drawable/ic_camera_alt_black_24dp.xml b/src/main/res/drawable/ic_camera_alt_black_24dp.xml
index bd0236887..c9d70e51c 100644
--- a/src/main/res/drawable/ic_camera_alt_black_24dp.xml
+++ b/src/main/res/drawable/ic_camera_alt_black_24dp.xml
@@ -1,6 +1,8 @@
-<vector android:autoMirrored="true" android:height="24dp"
+<vector xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="UnusedAttribute">
     <path android:fillColor="#FF000000" android:pathData="M12,12m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0"/>
     <path android:fillColor="#FF000000" android:pathData="M9,2L7.17,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2L9,2zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z"/>
 </vector>
diff --git a/src/main/res/drawable/ic_cancel_24dp.xml b/src/main/res/drawable/ic_cancel_24dp.xml
index 1a1352f61..84d0ca10a 100644
--- a/src/main/res/drawable/ic_cancel_24dp.xml
+++ b/src/main/res/drawable/ic_cancel_24dp.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector android:autoMirrored="true" android:height="24dp"
+<vector xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="UnusedAttribute">
     <path android:fillColor="#FF000000" android:pathData="M12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2zm5,13.59L15.59,17 12,13.41 8.41,17 7,15.59 10.59,12 7,8.41 8.41,7 12,10.59 15.59,7 17,8.41 13.41,12 17,15.59z"/>
 </vector>
diff --git a/src/main/res/drawable/ic_close_24dp.xml b/src/main/res/drawable/ic_close_24dp.xml
index 4ee27e28a..87f7b6f4b 100644
--- a/src/main/res/drawable/ic_close_24dp.xml
+++ b/src/main/res/drawable/ic_close_24dp.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector android:autoMirrored="true" android:height="24dp"
+<vector xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="UnusedAttribute">
     <path android:fillColor="#FF000000" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
 </vector>
diff --git a/src/main/res/drawable/ic_cloud_queue_24dp.xml b/src/main/res/drawable/ic_cloud_queue_24dp.xml
index 1ee8bbe43..69f2695fe 100644
--- a/src/main/res/drawable/ic_cloud_queue_24dp.xml
+++ b/src/main/res/drawable/ic_cloud_queue_24dp.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector android:autoMirrored="true" android:height="24dp"
+<vector xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="UnusedAttribute">
     <path android:fillColor="#FF000000" android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM19,18H6c-2.21,0 -4,-1.79 -4,-4s1.79,-4 4,-4h0.71C7.37,7.69 9.48,6 12,6c3.04,0 5.5,2.46 5.5,5.5v0.5H19c1.66,0 3,1.34 3,3s-1.34,3 -3,3z"/>
 </vector>
diff --git a/src/main/res/drawable/ic_delete_24dp.xml b/src/main/res/drawable/ic_delete_24dp.xml
index 7d4a324bc..6c630067a 100644
--- a/src/main/res/drawable/ic_delete_24dp.xml
+++ b/src/main/res/drawable/ic_delete_24dp.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector android:autoMirrored="true" android:height="24dp"
+<vector xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="UnusedAttribute">
     <path android:fillColor="#FF000000" android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
 </vector>
diff --git a/src/main/res/drawable/ic_event_24dp.xml b/src/main/res/drawable/ic_event_24dp.xml
index e3d306ab7..b111abe45 100644
--- a/src/main/res/drawable/ic_event_24dp.xml
+++ b/src/main/res/drawable/ic_event_24dp.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector android:autoMirrored="true" android:height="24dp"
+<vector xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="UnusedAttribute">
     <path android:fillColor="#FF000000" android:pathData="M17,12h-5v5h5v-5zM16,1v2H8V1H6v2H5c-1.11,0 -1.99,0.9 -1.99,2L3,19c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2h-1V1h-2zm3,18H5V8h14v11z"/>
 </vector>
diff --git a/src/main/res/drawable/ic_event_note_24dp.xml b/src/main/res/drawable/ic_event_note_24dp.xml
index 614f4a769..3bc83daa8 100644
--- a/src/main/res/drawable/ic_event_note_24dp.xml
+++ b/src/main/res/drawable/ic_event_note_24dp.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector android:autoMirrored="true" android:height="24dp"
+<vector xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="UnusedAttribute">
     <path android:fillColor="#FF000000" android:pathData="M17,10H7v2h10v-2zm2,-7h-1V1h-2v2H8V1H6v2H5c-1.11,0 -1.99,0.9 -1.99,2L3,19c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2zm0,16H5V8h14v11zm-5,-5H7v2h7v-2z"/>
 </vector>
diff --git a/src/main/res/drawable/ic_filter_list_24dp.xml b/src/main/res/drawable/ic_filter_list_24dp.xml
index 61dcd3a32..95eafe1ce 100644
--- a/src/main/res/drawable/ic_filter_list_24dp.xml
+++ b/src/main/res/drawable/ic_filter_list_24dp.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector android:autoMirrored="true" android:height="24dp"
+<vector xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="UnusedAttribute">
     <path android:fillColor="#FF000000" android:pathData="M10,18h4v-2h-4v2zM3,6v2h18V6H3zm3,7h12v-2H6v2z"/>
 </vector>
diff --git a/src/main/res/drawable/ic_flag_24dp.xml b/src/main/res/drawable/ic_flag_24dp.xml
index 4a65626f0..fb62f7b74 100644
--- a/src/main/res/drawable/ic_flag_24dp.xml
+++ b/src/main/res/drawable/ic_flag_24dp.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector android:autoMirrored="true" android:height="24dp"
+<vector xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="UnusedAttribute">
     <path android:fillColor="#FF000000" android:pathData="M14.4,6L14,4H5v17h2v-7h5.6l0.4,2h7V6z"/>
 </vector>
diff --git a/src/main/res/drawable/ic_help_24dp.xml b/src/main/res/drawable/ic_help_24dp.xml
index f45935e6f..939ef35c0 100644
--- a/src/main/res/drawable/ic_help_24dp.xml
+++ b/src/main/res/drawable/ic_help_24dp.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector android:autoMirrored="true" android:height="24dp"
+<vector xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="UnusedAttribute">
     <path android:fillColor="#FF000000" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zm1,17h-2v-2h2v2zm2.07,-7.75l-0.9,0.92C13.45,12.9 13,13.5 13,15h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2H8c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88 -0.36,1.68 -0.93,2.25z"/>
 </vector>
diff --git a/src/main/res/drawable/ic_history_24dp.xml b/src/main/res/drawable/ic_history_24dp.xml
index 5751bac08..603afc433 100644
--- a/src/main/res/drawable/ic_history_24dp.xml
+++ b/src/main/res/drawable/ic_history_24dp.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector android:autoMirrored="true" android:height="24dp"
+<vector xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="UnusedAttribute">
     <path android:fillAlpha=".9" android:fillColor="#FF000000" android:pathData="M13,3c-4.97,0 -9,4.03 -9,9H1l3.89,3.89 0.07,0.14L9,12H6c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zm-1,5v5l4.28,2.54 0.72,-1.21 -3.5,-2.08V8H12z"/>
 </vector>
diff --git a/src/main/res/drawable/ic_inbox_24dp.xml b/src/main/res/drawable/ic_inbox_24dp.xml
index f40fed818..7aacd65b8 100644
--- a/src/main/res/drawable/ic_inbox_24dp.xml
+++ b/src/main/res/drawable/ic_inbox_24dp.xml
@@ -1,5 +1,7 @@
-<vector android:autoMirrored="true" android:height="24dp"
+<vector xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="UnusedAttribute">
     <path android:fillColor="#FF000000" android:pathData="M19,3L4.99,3c-1.11,0 -1.98,0.89 -1.98,2L3,19c0,1.1 0.88,2 1.99,2L19,21c1.1,0 2,-0.9 2,-2L21,5c0,-1.11 -0.9,-2 -2,-2zM19,15h-4c0,1.66 -1.35,3 -3,3s-3,-1.34 -3,-3L4.99,15L4.99,5L19,5v10z"/>
 </vector>
diff --git a/src/main/res/drawable/ic_label_24dp.xml b/src/main/res/drawable/ic_label_24dp.xml
index 07164af55..3739eec2f 100644
--- a/src/main/res/drawable/ic_label_24dp.xml
+++ b/src/main/res/drawable/ic_label_24dp.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector android:autoMirrored="true" android:height="24dp"
+<vector xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="UnusedAttribute">
     <path android:fillColor="#FF000000" android:pathData="M17.63,5.84C17.27,5.33 16.67,5 16,5L5,5.01C3.9,5.01 3,5.9 3,7v10c0,1.1 0.9,1.99 2,1.99L16,19c0.67,0 1.27,-0.33 1.63,-0.84L22,12l-4.37,-6.16z"/>
 </vector>
diff --git a/src/main/res/drawable/ic_lens_black_24dp.xml b/src/main/res/drawable/ic_lens_black_24dp.xml
index 036d4b198..68d0c4781 100644
--- a/src/main/res/drawable/ic_lens_black_24dp.xml
+++ b/src/main/res/drawable/ic_lens_black_24dp.xml
@@ -1,5 +1,7 @@
-<vector android:autoMirrored="true" android:height="24dp"
+<vector xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="UnusedAttribute">
     <path android:fillColor="#FF000000" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2z"/>
 </vector>
diff --git a/src/main/res/drawable/ic_menu_24dp.xml b/src/main/res/drawable/ic_menu_24dp.xml
index 89198a3f9..def231a41 100644
--- a/src/main/res/drawable/ic_menu_24dp.xml
+++ b/src/main/res/drawable/ic_menu_24dp.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector android:autoMirrored="true" android:height="24dp"
+<vector xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="UnusedAttribute">
     <path android:fillColor="#FF000000" android:pathData="M3,18h18v-2H3v2zm0,-5h18v-2H3v2zm0,-7v2h18V6H3z"/>
 </vector>
diff --git a/src/main/res/drawable/ic_mic_24dp.xml b/src/main/res/drawable/ic_mic_24dp.xml
index ac5e85609..51e5b18ec 100644
--- a/src/main/res/drawable/ic_mic_24dp.xml
+++ b/src/main/res/drawable/ic_mic_24dp.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector android:autoMirrored="true" android:height="24dp"
+<vector xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="UnusedAttribute">
     <path android:fillColor="#FF000000" android:pathData="M12,14c1.66,0 2.99,-1.34 2.99,-3L15,5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v6c0,1.66 1.34,3 3,3zm5.3,-3c0,3 -2.54,5.1 -5.3,5.1S6.7,14 6.7,11H5c0,3.41 2.72,6.23 6,6.72V21h2v-3.28c3.28,-0.48 6,-3.3 6,-6.72h-1.7z"/>
 </vector>
diff --git a/src/main/res/drawable/ic_notifications_24dp.xml b/src/main/res/drawable/ic_notifications_24dp.xml
index 452854311..b3aaf83e5 100644
--- a/src/main/res/drawable/ic_notifications_24dp.xml
+++ b/src/main/res/drawable/ic_notifications_24dp.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector android:autoMirrored="true" android:height="24dp"
+<vector xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="UnusedAttribute">
     <path android:fillColor="#FF000000" android:pathData="M11.5,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.9,2 2,2zm6.5,-6v-5.5c0,-3.07 -2.13,-5.64 -5,-6.32V3.5c0,-0.83 -0.67,-1.5 -1.5,-1.5S10,2.67 10,3.5v0.68c-2.87,0.68 -5,3.25 -5,6.32V16l-2,2v1h17v-1l-2,-2z"/>
 </vector>
diff --git a/src/main/res/drawable/ic_pause_24dp.xml b/src/main/res/drawable/ic_pause_24dp.xml
index b2ff04582..3b1fa7bea 100644
--- a/src/main/res/drawable/ic_pause_24dp.xml
+++ b/src/main/res/drawable/ic_pause_24dp.xml
@@ -1,5 +1,7 @@
-<vector android:autoMirrored="true" android:height="24dp"
+<vector xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="UnusedAttribute">
     <path android:fillColor="#FF000000" android:pathData="M6,19h4V5H6v14zm8,-14v14h4V5h-4z"/>
 </vector>
diff --git a/src/main/res/drawable/ic_play_arrow_24dp.xml b/src/main/res/drawable/ic_play_arrow_24dp.xml
index 3100224e2..004d1e373 100644
--- a/src/main/res/drawable/ic_play_arrow_24dp.xml
+++ b/src/main/res/drawable/ic_play_arrow_24dp.xml
@@ -1,5 +1,7 @@
-<vector android:autoMirrored="true" android:height="24dp"
+<vector xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="UnusedAttribute">
     <path android:fillColor="#FF000000" android:pathData="M8,5v14l11,-7z"/>
 </vector>
diff --git a/src/main/res/drawable/ic_repeat_24dp.xml b/src/main/res/drawable/ic_repeat_24dp.xml
index 4dd2efdba..ae95d9a18 100644
--- a/src/main/res/drawable/ic_repeat_24dp.xml
+++ b/src/main/res/drawable/ic_repeat_24dp.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector android:autoMirrored="true" android:height="24dp"
+<vector xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="UnusedAttribute">
     <path android:fillColor="#FF000000" android:pathData="M7,7h10v3l4,-4 -4,-4v3H5v6h2V7zm10,10H7v-3l-4,4 4,4v-3h12v-6h-2v4z"/>
 </vector>
diff --git a/src/main/res/drawable/ic_save_24dp.xml b/src/main/res/drawable/ic_save_24dp.xml
index c26fb3328..d6e80ca88 100644
--- a/src/main/res/drawable/ic_save_24dp.xml
+++ b/src/main/res/drawable/ic_save_24dp.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector android:autoMirrored="true" android:height="24dp"
+<vector xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="UnusedAttribute">
     <path android:fillColor="#FF000000" android:pathData="M17,3H5c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V7l-4,-4zm-5,16c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zm3,-10H5V5h10v4z"/>
 </vector>
diff --git a/src/main/res/drawable/ic_schedule_24dp.xml b/src/main/res/drawable/ic_schedule_24dp.xml
index ad969d6d6..6ab9e55cd 100644
--- a/src/main/res/drawable/ic_schedule_24dp.xml
+++ b/src/main/res/drawable/ic_schedule_24dp.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector android:autoMirrored="true" android:height="24dp"
+<vector xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="UnusedAttribute">
     <path android:fillAlpha=".9" android:fillColor="#FF000000" android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"/>
 </vector>
diff --git a/src/main/res/drawable/ic_search_24dp.xml b/src/main/res/drawable/ic_search_24dp.xml
index 173d7cc2f..9f93d61d8 100644
--- a/src/main/res/drawable/ic_search_24dp.xml
+++ b/src/main/res/drawable/ic_search_24dp.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector android:autoMirrored="true" android:height="24dp"
+<vector xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="UnusedAttribute">
     <path android:fillColor="#FF000000" android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zm-6,0C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
 </vector>
diff --git a/src/main/res/drawable/ic_settings_24dp.xml b/src/main/res/drawable/ic_settings_24dp.xml
index f125782f0..1960419fd 100644
--- a/src/main/res/drawable/ic_settings_24dp.xml
+++ b/src/main/res/drawable/ic_settings_24dp.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector android:autoMirrored="true" android:height="24dp"
+<vector xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="UnusedAttribute">
     <path android:fillColor="#FF000000" android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
 </vector>
diff --git a/src/main/res/drawable/ic_sort_24dp.xml b/src/main/res/drawable/ic_sort_24dp.xml
index 3735be4cb..5c29bbc1e 100644
--- a/src/main/res/drawable/ic_sort_24dp.xml
+++ b/src/main/res/drawable/ic_sort_24dp.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector android:autoMirrored="true" android:height="24dp"
+<vector xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="UnusedAttribute">
     <path android:fillColor="#FF000000" android:pathData="M3,18h6v-2H3v2zM3,6v2h18V6H3zm0,7h12v-2H3v2z"/>
 </vector>
diff --git a/src/main/res/drawable/ic_timer_24dp.xml b/src/main/res/drawable/ic_timer_24dp.xml
index fa9420593..6fe292256 100644
--- a/src/main/res/drawable/ic_timer_24dp.xml
+++ b/src/main/res/drawable/ic_timer_24dp.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector android:autoMirrored="true" android:height="24dp"
+<vector xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="UnusedAttribute">
     <path android:fillColor="#FF000000" android:pathData="M15,1H9v2h6V1zm-4,13h2V8h-2v6zm8.03,-6.61l1.42,-1.42c-0.43,-0.51 -0.9,-0.99 -1.41,-1.41l-1.42,1.42C16.07,4.74 14.12,4 12,4c-4.97,0 -9,4.03 -9,9s4.02,9 9,9 9,-4.03 9,-9c0,-2.12 -0.74,-4.07 -1.97,-5.61zM12,20c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z"/>
 </vector>
diff --git a/src/main/res/drawable/ic_today_24dp.xml b/src/main/res/drawable/ic_today_24dp.xml
index b3e52fa2c..abf24daad 100644
--- a/src/main/res/drawable/ic_today_24dp.xml
+++ b/src/main/res/drawable/ic_today_24dp.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector android:autoMirrored="true" android:height="24dp"
+<vector xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="UnusedAttribute">
     <path android:fillColor="#FF000000" android:pathData="M19,3h-1V1h-2v2H8V1H6v2H5c-1.11,0 -1.99,0.9 -1.99,2L3,19c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2zm0,16H5V8h14v11zM7,10h5v5H7z"/>
 </vector>
diff --git a/src/main/res/drawable/ic_visibility_off_24dp.xml b/src/main/res/drawable/ic_visibility_off_24dp.xml
index 59a614550..05876daa1 100644
--- a/src/main/res/drawable/ic_visibility_off_24dp.xml
+++ b/src/main/res/drawable/ic_visibility_off_24dp.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector android:autoMirrored="true" android:height="24dp"
+<vector xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="UnusedAttribute">
     <path android:fillColor="#FF000000" android:pathData="M12,7c2.76,0 5,2.24 5,5 0,0.65 -0.13,1.26 -0.36,1.83l2.92,2.92c1.51,-1.26 2.7,-2.89 3.43,-4.75 -1.73,-4.39 -6,-7.5 -11,-7.5 -1.4,0 -2.74,0.25 -3.98,0.7l2.16,2.16C10.74,7.13 11.35,7 12,7zM2,4.27l2.28,2.28 0.46,0.46C3.08,8.3 1.78,10.02 1,12c1.73,4.39 6,7.5 11,7.5 1.55,0 3.03,-0.3 4.38,-0.84l0.42,0.42L19.73,22 21,20.73 3.27,3 2,4.27zM7.53,9.8l1.55,1.55c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.66 1.34,3 3,3 0.22,0 0.44,-0.03 0.65,-0.08l1.55,1.55c-0.67,0.33 -1.41,0.53 -2.2,0.53 -2.76,0 -5,-2.24 -5,-5 0,-0.79 0.2,-1.53 0.53,-2.2zm4.31,-0.78l3.15,3.15 0.02,-0.16c0,-1.66 -1.34,-3 -3,-3l-0.17,0.01z"/>
 </vector>
diff --git a/src/main/res/drawable/ic_vpn_key_black_24dp.xml b/src/main/res/drawable/ic_vpn_key_black_24dp.xml
index a1098cfb1..714981a1f 100644
--- a/src/main/res/drawable/ic_vpn_key_black_24dp.xml
+++ b/src/main/res/drawable/ic_vpn_key_black_24dp.xml
@@ -1,5 +1,7 @@
-<vector android:autoMirrored="true" android:height="24dp"
+<vector xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="UnusedAttribute">
     <path android:fillColor="#FF000000" android:pathData="M12.65,10C11.83,7.67 9.61,6 7,6c-3.31,0 -6,2.69 -6,6s2.69,6 6,6c2.61,0 4.83,-1.67 5.65,-4H17v4h4v-4h2v-4H12.65zM7,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z"/>
 </vector>
diff --git a/src/main/res/layout/alarm_edit_row.xml b/src/main/res/layout/alarm_edit_row.xml
index c2953e83e..99ea23ca2 100644
--- a/src/main/res/layout/alarm_edit_row.xml
+++ b/src/main/res/layout/alarm_edit_row.xml
@@ -4,7 +4,8 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:paddingBottom="@dimen/task_edit_double_padding_top_bottom"
-    android:layout_marginBottom="@dimen/task_edit_double_padding_top_bottom">
+    android:layout_marginBottom="@dimen/task_edit_double_padding_top_bottom"
+    android:baselineAligned="false">
 
     <LinearLayout
         android:layout_width="0dp"
diff --git a/src/main/res/layout/astrid_calendar_reminder_view.xml b/src/main/res/layout/astrid_calendar_reminder_view.xml
index 3b4856f98..c348ceb7b 100644
--- a/src/main/res/layout/astrid_calendar_reminder_view.xml
+++ b/src/main/res/layout/astrid_calendar_reminder_view.xml
@@ -60,8 +60,7 @@
 	        android:layout_height="wrap_content"
 	        android:layout_marginBottom="5dip"
 	        android:src="@mipmap/ic_launcher"
-	        android:scaleType="fitCenter"
-	        android:layout_alignParentLeft="true"/>
+	        android:scaleType="fitCenter" />
 
 
 	    <LinearLayout
@@ -71,10 +70,8 @@
 	        android:layout_marginRight="5dip"
 	        android:layout_marginBottom="5dip"
 	        android:minHeight="60dip"
-	        android:layout_alignParentBottom="true"
 	        android:gravity="center_vertical"
-	        android:background="@drawable/speech_bubble_reminder"
-	        android:layout_toRightOf="@id/astridIcon">
+	        android:background="@drawable/speech_bubble_reminder" >
 	        <TextView
 	            android:id="@+id/reminder_message"
 	            android:layout_width="fill_parent"
diff --git a/src/main/res/layout/control_set_deadline.xml b/src/main/res/layout/control_set_deadline.xml
index 8282c96b3..393aba4e4 100644
--- a/src/main/res/layout/control_set_deadline.xml
+++ b/src/main/res/layout/control_set_deadline.xml
@@ -1,8 +1,10 @@
 <?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="fill_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal">
+    android:orientation="horizontal"
+    tools:ignore="DisableBaselineAlignment">
 
     <LinearLayout
         android:layout_width="0dp"
diff --git a/src/main/res/layout/control_set_hide.xml b/src/main/res/layout/control_set_hide.xml
index 0645611ed..58d5b6e4e 100644
--- a/src/main/res/layout/control_set_hide.xml
+++ b/src/main/res/layout/control_set_hide.xml
@@ -2,7 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal">
+    android:orientation="horizontal"
+    android:baselineAligned="false">
 
     <LinearLayout
         android:layout_width="0dp"
diff --git a/src/main/res/layout/control_set_priority.xml b/src/main/res/layout/control_set_priority.xml
index 83603060d..eca53fb54 100644
--- a/src/main/res/layout/control_set_priority.xml
+++ b/src/main/res/layout/control_set_priority.xml
@@ -1,5 +1,6 @@
 <?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:gravity="center_vertical"
@@ -30,22 +31,26 @@
         <android.support.v7.widget.AppCompatRadioButton
             android:id="@+id/priority_none"
             style="@style/priority_button"
-            android:buttonTint="@color/importance_4" />
+            android:buttonTint="@color/importance_4"
+            tools:ignore="UnusedAttribute" />
 
         <android.support.v7.widget.AppCompatRadioButton
             android:id="@+id/priority_low"
             style="@style/priority_button"
-            android:buttonTint="@color/importance_3" />
+            android:buttonTint="@color/importance_3"
+            tools:ignore="UnusedAttribute" />
 
         <android.support.v7.widget.AppCompatRadioButton
             android:id="@+id/priority_medium"
             style="@style/priority_button"
-            android:buttonTint="@color/importance_2" />
+            android:buttonTint="@color/importance_2"
+            tools:ignore="UnusedAttribute" />
 
         <android.support.v7.widget.AppCompatRadioButton
             android:id="@+id/priority_high"
             style="@style/priority_button"
-            android:buttonTint="@color/importance_1" />
+            android:buttonTint="@color/importance_1"
+            tools:ignore="UnusedAttribute" />
     </RadioGroup>
 
 </LinearLayout>
diff --git a/src/main/res/layout/control_set_repeat_display.xml b/src/main/res/layout/control_set_repeat_display.xml
index 453d4ed31..749c638e6 100644
--- a/src/main/res/layout/control_set_repeat_display.xml
+++ b/src/main/res/layout/control_set_repeat_display.xml
@@ -6,7 +6,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal">
+    android:orientation="horizontal"
+    android:baselineAligned="false">
 
     <LinearLayout
         android:layout_width="0dp"
diff --git a/src/main/res/layout/control_set_timers.xml b/src/main/res/layout/control_set_timers.xml
index 334f341c9..d492bc93a 100644
--- a/src/main/res/layout/control_set_timers.xml
+++ b/src/main/res/layout/control_set_timers.xml
@@ -6,7 +6,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal">
+    android:orientation="horizontal"
+    android:baselineAligned="false">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/src/main/res/layout/file_row.xml b/src/main/res/layout/file_row.xml
index 689775413..54f89e87e 100644
--- a/src/main/res/layout/file_row.xml
+++ b/src/main/res/layout/file_row.xml
@@ -4,6 +4,7 @@
 ** See the file "LICENSE" for the full license governing this code. 
 -->
 <RelativeLayout 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:paddingBottom="@dimen/task_edit_double_padding_top_bottom">
@@ -22,6 +23,7 @@
         android:layout_toStartOf="@id/clear"
         android:gravity="start"
         android:textDirection="locale"
-        android:textColor="?attr/asTextColor" />
+        android:textColor="?attr/asTextColor"
+        tools:ignore="UnusedAttribute" />
 
 </RelativeLayout>
diff --git a/src/main/res/layout/filter_adapter_row.xml b/src/main/res/layout/filter_adapter_row.xml
index 2b884c77f..250b92d04 100644
--- a/src/main/res/layout/filter_adapter_row.xml
+++ b/src/main/res/layout/filter_adapter_row.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:paddingBottom="12dp"
@@ -19,7 +20,8 @@
         android:paddingLeft="@dimen/keyline_first"
         android:paddingRight="@dimen/keyline_first"
         android:paddingStart="@dimen/keyline_first"
-        android:textColor="?android:attr/textColorSecondary" />
+        android:textColor="?android:attr/textColorSecondary"
+        tools:ignore="UnusedAttribute" />
 
     <ImageView
         android:id="@+id/icon"
@@ -53,6 +55,7 @@
         android:lines="1"
         android:singleLine="true"
         android:textColor="?android:attr/textColorPrimary"
-        android:textSize="14sp" />
+        android:textSize="14sp"
+        tools:ignore="UnusedAttribute" />
 
 </RelativeLayout>
diff --git a/src/main/res/layout/filter_adapter_subheader.xml b/src/main/res/layout/filter_adapter_subheader.xml
index ee24a5848..cac10ce56 100644
--- a/src/main/res/layout/filter_adapter_subheader.xml
+++ b/src/main/res/layout/filter_adapter_subheader.xml
@@ -1,5 +1,6 @@
 <?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="48dp"
     android:orientation="vertical"
@@ -21,6 +22,7 @@
         android:fontFamily="@string/font_fontFamily_medium"
         android:alpha="0.54"
         android:layout_width="match_parent"
-        android:layout_height="fill_parent"/>
+        android:layout_height="fill_parent"
+        tools:ignore="UnusedAttribute" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/filter_settings_activity.xml b/src/main/res/layout/filter_settings_activity.xml
index abacfe9ca..f272b42d2 100644
--- a/src/main/res/layout/filter_settings_activity.xml
+++ b/src/main/res/layout/filter_settings_activity.xml
@@ -7,46 +7,41 @@
 
     <include layout="@layout/toolbar" />
 
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+    <ScrollView
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="top">
 
-        <ScrollView
+        <RelativeLayout
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="top">
+            android:padding="16dp">
 
-            <RelativeLayout
-                android:layout_width="fill_parent"
+            <TextView
+                android:id="@+id/tag_label"
+                style="@style/TextAppearance"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:padding="16dp">
-
-                <TextView
-                    android:id="@+id/tag_label"
-                    style="@style/TextAppearance"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentTop="true"
-                    android:text="@string/name" />
+                android:layout_alignParentTop="true"
+                android:text="@string/name" />
 
-                <EditText
-                    android:id="@+id/tag_name"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/tag_label"
-                    android:layout_marginTop="16dp"
-                    android:background="#00000000"
-                    android:hint="@string/enter_tag_name"
-                    android:imeOptions="flagNoExtractUi"
-                    android:inputType="textCapSentences"
-                    android:singleLine="true"
-                    android:gravity="start"
-                    android:textAlignment="viewStart"
-                    android:textColor="?attr/asTextColorHint"
-                    android:textColorHint="?attr/asTextColorHint"
-                    android:textSize="15sp" />
-            </RelativeLayout>
-        </ScrollView>
-    </FrameLayout>
+            <EditText
+                android:id="@+id/tag_name"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/tag_label"
+                android:layout_marginTop="16dp"
+                android:background="#00000000"
+                android:hint="@string/enter_tag_name"
+                android:imeOptions="flagNoExtractUi"
+                android:inputType="textCapSentences"
+                android:singleLine="true"
+                android:gravity="start"
+                android:textAlignment="viewStart"
+                android:textColor="?attr/asTextColorHint"
+                android:textColorHint="?attr/asTextColorHint"
+                android:textSize="15sp" />
+        </RelativeLayout>
+    </ScrollView>
 
 </LinearLayout>
diff --git a/src/main/res/layout/task_list_body_empty.xml b/src/main/res/layout/task_list_body_empty.xml
index 34a5e5368..d8802c1c2 100644
--- a/src/main/res/layout/task_list_body_empty.xml
+++ b/src/main/res/layout/task_list_body_empty.xml
@@ -1,9 +1,11 @@
 <android.support.v4.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/swipe_layout_empty"
     style="@style/task_list_container"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:elevation="@dimen/elevation_task_list">
+    android:elevation="@dimen/elevation_task_list"
+    tools:ignore="UnusedAttribute">
 
     <ScrollView
         android:layout_width="wrap_content"
diff --git a/src/main/res/layout/task_list_body_standard.xml b/src/main/res/layout/task_list_body_standard.xml
index d64129da4..f0ccf1d55 100644
--- a/src/main/res/layout/task_list_body_standard.xml
+++ b/src/main/res/layout/task_list_body_standard.xml
@@ -1,10 +1,12 @@
 <android.support.v4.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/swipe_layout"
     style="@style/task_list_container"
     android:background="?attr/asContentBackground"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:elevation="@dimen/elevation_task_list">
+    android:elevation="@dimen/elevation_task_list"
+    tools:ignore="UnusedAttribute">
 
     <ListView
         android:id="@android:id/list"
diff --git a/src/main/res/layout/task_list_body_subtasks.xml b/src/main/res/layout/task_list_body_subtasks.xml
index f6f4d576c..a783443e7 100644
--- a/src/main/res/layout/task_list_body_subtasks.xml
+++ b/src/main/res/layout/task_list_body_subtasks.xml
@@ -1,10 +1,12 @@
 <org.tasks.ui.DraggableSwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/swipe_layout"
     style="@style/task_list_container"
     android:background="?attr/asContentBackground"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:elevation="@dimen/elevation_task_list" >
+    android:elevation="@dimen/elevation_task_list"
+    tools:ignore="UnusedAttribute">
 
     <com.todoroo.astrid.ui.DraggableListView
         android:id="@android:id/list"
diff --git a/src/main/res/layout/toolbar.xml b/src/main/res/layout/toolbar.xml
index acd9ec79c..312fdb063 100644
--- a/src/main/res/layout/toolbar.xml
+++ b/src/main/res/layout/toolbar.xml
@@ -1,5 +1,6 @@
 <android.support.v7.widget.Toolbar 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:id="@+id/toolbar"
     android:layout_width="match_parent"
     android:layout_height="?attr/actionBarSize"
@@ -7,4 +8,5 @@
     android:elevation="@dimen/elevation_toolbar"
     app:toolbarStyle="@style/Widget.AppCompat.Toolbar"
     app:popupTheme="@style/popup_overlay"
-    app:theme="?attr/overlay_theme" />
+    app:theme="?attr/overlay_theme"
+    tools:ignore="UnusedAttribute" />
diff --git a/src/main/res/values/theme.xml b/src/main/res/values/theme.xml
index 2fd7a01fa..98c5608d8 100644
--- a/src/main/res/values/theme.xml
+++ b/src/main/res/values/theme.xml
@@ -2,7 +2,7 @@
 <resources>
 
     <style name="Tasks" parent="Theme.AppCompat.DayNight.NoActionBar">
-        <item name="android:windowBackground">@color/background_color</item>
+        <item name="android:windowBackground">@null</item>
         <item name="windowActionModeOverlay">true</item>
         <item name="asContentBackground">@color/background_color</item>
         <item name="asTextColor">@color/text_primary</item>
@@ -38,12 +38,10 @@
     </style>
 
     <style name="ThemeBlack" parent="TasksOverride">
-        <item name="android:windowBackground">@android:color/black</item>
         <item name="asContentBackground">@android:color/black</item>
     </style>
 
     <style name="Wallpaper" parent="TasksOverride">
-        <item name="android:windowBackground">@color/black_38</item>
         <item name="asContentBackground">@color/black_38</item>
         <item name="android:windowShowWallpaper">true</item>
     </style>
diff --git a/src/main/res/xml/scrollable_widget_provider_info.xml b/src/main/res/xml/scrollable_widget_provider_info.xml
index f79781f64..5c9c7392b 100644
--- a/src/main/res/xml/scrollable_widget_provider_info.xml
+++ b/src/main/res/xml/scrollable_widget_provider_info.xml
@@ -6,6 +6,7 @@
 -->
 
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:configure="org.tasks.widget.WidgetConfigActivity"
     android:widgetCategory="keyguard|home_screen"
     android:minWidth="142dip"
@@ -15,4 +16,5 @@
     android:updatePeriodMillis="86400000"
     android:initialLayout="@layout/scrollable_widget"
     android:initialKeyguardLayout="@layout/scrollable_widget"
-    android:resizeMode="horizontal|vertical"/>
+    android:resizeMode="horizontal|vertical"
+    tools:ignore="UnusedAttribute" />