diff --git a/build.gradle b/build.gradle
index a35284157..7d2af4753 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,6 +3,7 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.3'
@@ -13,6 +14,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 
     tasks.withType(Javadoc) {
diff --git a/hockeysdk/build.gradle b/hockeysdk/build.gradle
index 13f16015a..f3ab61048 100644
--- a/hockeysdk/build.gradle
+++ b/hockeysdk/build.gradle
@@ -51,10 +51,7 @@ publish {
 
 dependencies {
     // Mocking
-    androidTestCompile 'org.mockito:mockito-core:1.10.19'
-    androidTestCompile 'com.crittercism.dexmaker:dexmaker:1.4'
-    androidTestCompile 'com.crittercism.dexmaker:dexmaker-dx:1.4'
-    androidTestCompile 'com.crittercism.dexmaker:dexmaker-mockito:1.4'
+    androidTestCompile 'com.linkedin.dexmaker:dexmaker-mockito:2.2.0'
 
     testCompile 'org.powermock:powermock-api-mockito:1.6.6'
     testCompile 'org.powermock:powermock-module-junit4:1.6.6'
@@ -64,6 +61,6 @@ dependencies {
     androidTestCompile 'org.hamcrest:hamcrest-library:1.3'
     testCompile 'junit:junit:4.12'
 
-    androidTestCompile 'com.android.support.test:runner:0.5'
-    androidTestCompile 'com.android.support.test:rules:0.5'
+    androidTestCompile 'com.android.support.test:runner:1.0.1'
+    androidTestCompile 'com.android.support.test:rules:1.0.1'
 }
diff --git a/hockeysdk/src/androidTest/java/net/hockeyapp/android/EnvironmentTest.java b/hockeysdk/src/androidTest/java/net/hockeyapp/android/EnvironmentTest.java
index e53d377d9..51ac93c0d 100644
--- a/hockeysdk/src/androidTest/java/net/hockeyapp/android/EnvironmentTest.java
+++ b/hockeysdk/src/androidTest/java/net/hockeyapp/android/EnvironmentTest.java
@@ -3,29 +3,40 @@
 import android.support.test.InstrumentationRegistry;
 import android.support.test.runner.AndroidJUnit4;
 
-import junit.framework.TestCase;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import java.io.File;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 /**
  * <h3>Description</h3>
  *
  * This class provides testing for the environment features, such as the SDK wide constants.
  */
 @RunWith(AndroidJUnit4.class)
-public class EnvironmentTest extends TestCase {
+public class EnvironmentTest {
 
+    /*
+     * This test is disabled since it is always failing on emulators with API under 18. The problem
+     * is that emulators start with external storage being in removed state and necessary directory
+     * can not be created.
+     *
+     * TODO: Uncomment test in case emulators with API under 18 start supporting external storage
+     */
     /**
      * Test to verify basic creation of the external storage directory works.
      */
-    @Test
+    //@Test
     public void basicStorageDirTest() {
         File storageDir = Constants.getHockeyAppStorageDir(InstrumentationRegistry.getTargetContext());
 
         assertNotNull(storageDir);
         assertTrue(storageDir.exists());
     }
+
+    @Test
+    public void dummyTestMethod() {}
 }
diff --git a/hockeysdk/src/main/AndroidManifest.xml b/hockeysdk/src/main/AndroidManifest.xml
index e59dcfcee..2b2c19f2d 100644
--- a/hockeysdk/src/main/AndroidManifest.xml
+++ b/hockeysdk/src/main/AndroidManifest.xml
@@ -8,7 +8,7 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="18" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 
-    <application>
+    <application android:supportsRtl="true">
 
         <activity android:name=".UpdateActivity" />
         <activity android:name=".FeedbackActivity" android:windowSoftInputMode="adjustResize|stateVisible" />
diff --git a/hockeysdk/src/main/java/net/hockeyapp/android/Constants.java b/hockeysdk/src/main/java/net/hockeyapp/android/Constants.java
index a5f2b5596..8816aa3b7 100644
--- a/hockeysdk/src/main/java/net/hockeyapp/android/Constants.java
+++ b/hockeysdk/src/main/java/net/hockeyapp/android/Constants.java
@@ -1,5 +1,6 @@
 package net.hockeyapp.android;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
@@ -185,6 +186,7 @@ private static int loadBuildNumber(Context context, PackageManager packageManage
      *
      * @param context the context to use. Usually your Activity object.
      */
+    @SuppressLint("StaticFieldLeak")
     private static void loadIdentifiers(final Context context) {
         if (Constants.DEVICE_IDENTIFIER != null) {
             return;
diff --git a/hockeysdk/src/main/java/net/hockeyapp/android/CrashManager.java b/hockeysdk/src/main/java/net/hockeyapp/android/CrashManager.java
index c80bc738a..211587a24 100644
--- a/hockeysdk/src/main/java/net/hockeyapp/android/CrashManager.java
+++ b/hockeysdk/src/main/java/net/hockeyapp/android/CrashManager.java
@@ -1,5 +1,6 @@
 package net.hockeyapp.android;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
@@ -204,6 +205,7 @@ public static void initialize(Context context, String urlString, String appIdent
      * @param context  The context to use. Usually your Activity object.
      * @param listener Implement for callback functions.
      */
+    @SuppressLint("StaticFieldLeak")
     public static void execute(Context context, final CrashManagerListener listener) {
         final WeakReference<Context> weakContext = new WeakReference<>(context);
         AsyncTaskUtils.execute(new AsyncTask<Void, Object, Integer>() {
@@ -503,6 +505,7 @@ public static void deleteStackTraces(final WeakReference<Context> weakContext) {
      * @see CrashMetaData
      * @see CrashManagerListener
      */
+    @SuppressLint("StaticFieldLeak")
     @SuppressWarnings("WeakerAccess")
     public static boolean handleUserInput(final CrashManagerUserInput userInput,
                                           final CrashMetaData userProvidedMetaData, final CrashManagerListener listener,
@@ -634,6 +637,7 @@ private static String getAlertTitle(Context context) {
      * Starts thread to send crashes to HockeyApp, then registers the exception
      * handler.
      */
+    @SuppressLint("StaticFieldLeak")
     private static void sendCrashes(final WeakReference<Context> weakContext, final CrashManagerListener listener, final boolean ignoreDefaultHandler, final CrashMetaData crashMetaData) {
         registerHandler(listener, ignoreDefaultHandler);
         Context context = weakContext != null ? weakContext.get() : null;
diff --git a/hockeysdk/src/main/java/net/hockeyapp/android/FeedbackActivity.java b/hockeysdk/src/main/java/net/hockeyapp/android/FeedbackActivity.java
index ec9a30cc3..4eb43f6d2 100644
--- a/hockeysdk/src/main/java/net/hockeyapp/android/FeedbackActivity.java
+++ b/hockeysdk/src/main/java/net/hockeyapp/android/FeedbackActivity.java
@@ -700,6 +700,7 @@ private void loadFeedbackMessages(final FeedbackResponse feedbackResponse) {
         }
     }
 
+    @SuppressLint("StaticFieldLeak")
     private void resetFeedbackView() {
         mToken = null;
         AsyncTaskUtils.execute(new AsyncTask<Void, Object, Object>() {
@@ -722,6 +723,7 @@ protected Object doInBackground(Void... voids) {
     /**
      * Send feedback to HockeyApp.
      */
+    @SuppressLint("StaticFieldLeak")
     private void sendFeedback() {
         if (!Util.isConnectedToNetwork(this)) {
             Toast errorToast = Toast.makeText(this, R.string.hockeyapp_error_no_network_message, Toast.LENGTH_LONG);
@@ -873,6 +875,7 @@ private static class ParseFeedbackHandler extends Handler {
             mWeakFeedbackActivity = new WeakReference<>(feedbackActivity);
         }
 
+        @SuppressLint("StaticFieldLeak")
         @Override
         public void handleMessage(Message msg) {
             boolean success = false;
diff --git a/hockeysdk/src/main/java/net/hockeyapp/android/FeedbackManager.java b/hockeysdk/src/main/java/net/hockeyapp/android/FeedbackManager.java
index 24fe6811a..169f235a6 100644
--- a/hockeysdk/src/main/java/net/hockeyapp/android/FeedbackManager.java
+++ b/hockeysdk/src/main/java/net/hockeyapp/android/FeedbackManager.java
@@ -1,5 +1,6 @@
 package net.hockeyapp.android;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Notification;
 import android.app.PendingIntent;
@@ -198,6 +199,7 @@ public static void showFeedbackActivity(Context context, Uri... attachments) {
      * @param attachments the optional attachment {@link Uri}s
      * @param extras      a bundle to be added to the Intent that starts the FeedbackActivity instance
      */
+    @SuppressLint("StaticFieldLeak")
     public static void showFeedbackActivity(final Context context, final Bundle extras, final Uri... attachments) {
         if (context != null) {
             final Class<?> activityClass = lastListener != null ? lastListener.getFeedbackActivityClass() : null;
@@ -281,6 +283,7 @@ public boolean accept(File dir, String name) {
      *
      * @param context the context to use
      */
+    @SuppressLint("StaticFieldLeak")
     public static void checkForAnswersAndNotify(final Context context) {
         String token = PrefsUtil.getInstance().getFeedbackTokenFromPrefs(context);
         if (token == null) {
@@ -417,6 +420,7 @@ public static void unsetCurrentActivityForScreenshot(Activity activity) {
      *
      * @param context toast messages will be displayed using this context
      */
+    @SuppressLint("StaticFieldLeak")
     public static void takeScreenshot(final Context context) {
         final Activity currentActivity = getCurrentActivity();
         if (currentActivity == null) {
diff --git a/hockeysdk/src/main/java/net/hockeyapp/android/LoginManager.java b/hockeysdk/src/main/java/net/hockeyapp/android/LoginManager.java
index ede1f2987..30edf3d6d 100644
--- a/hockeysdk/src/main/java/net/hockeyapp/android/LoginManager.java
+++ b/hockeysdk/src/main/java/net/hockeyapp/android/LoginManager.java
@@ -1,5 +1,6 @@
 package net.hockeyapp.android;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -175,6 +176,7 @@ public static void register(final Context context, String appIdentifier, String
      * @param context The activity from which this method is called.
      * @param intent  The intent that the activity has been created with.
      */
+    @SuppressLint("StaticFieldLeak")
     public static void verifyLogin(final Activity context, Intent intent) {
         //Don't verify anything if we're in LOGIN_MODE_ANONYMOUS
         if (context == null || mode == LOGIN_MODE_ANONYMOUS) {
diff --git a/hockeysdk/src/main/java/net/hockeyapp/android/PaintActivity.java b/hockeysdk/src/main/java/net/hockeyapp/android/PaintActivity.java
index 78872ff0d..16bfb0c72 100644
--- a/hockeysdk/src/main/java/net/hockeyapp/android/PaintActivity.java
+++ b/hockeysdk/src/main/java/net/hockeyapp/android/PaintActivity.java
@@ -1,5 +1,6 @@
 package net.hockeyapp.android;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.ContentResolver;
@@ -42,6 +43,7 @@ public class PaintActivity extends Activity {
     private PaintView mPaintView;
     private Uri mImageUri;
 
+    @SuppressLint("StaticFieldLeak")
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -177,6 +179,7 @@ private void showPaintView() {
         toast.show();
     }
 
+    @SuppressLint("StaticFieldLeak")
     private void makeResult() {
         mPaintView.setDrawingCacheEnabled(true);
         final Bitmap bitmap = mPaintView.getDrawingCache();
diff --git a/hockeysdk/src/main/java/net/hockeyapp/android/metrics/MetricsManager.java b/hockeysdk/src/main/java/net/hockeyapp/android/metrics/MetricsManager.java
index 848e8442d..8fe6ff47e 100644
--- a/hockeysdk/src/main/java/net/hockeyapp/android/metrics/MetricsManager.java
+++ b/hockeysdk/src/main/java/net/hockeyapp/android/metrics/MetricsManager.java
@@ -1,5 +1,6 @@
 package net.hockeyapp.android.metrics;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Application;
 import android.content.Context;
@@ -423,6 +424,7 @@ private void updateSession() {
         }
     }
 
+    @SuppressLint("StaticFieldLeak")
     private void renewSession() {
         final String sessionId = UUID.randomUUID().toString();
         try {
@@ -478,6 +480,7 @@ public static void trackEvent(final String eventName, final Map<String, String>
         trackEvent(eventName, properties, null);
     }
 
+    @SuppressLint("StaticFieldLeak")
     public static void trackEvent(final String eventName, final Map<String, String> properties, final Map<String, Double> measurements) {
         if (TextUtils.isEmpty(eventName)) {
             return;
diff --git a/hockeysdk/src/main/java/net/hockeyapp/android/metrics/Persistence.java b/hockeysdk/src/main/java/net/hockeyapp/android/metrics/Persistence.java
index cd78a18b2..218e02172 100644
--- a/hockeysdk/src/main/java/net/hockeyapp/android/metrics/Persistence.java
+++ b/hockeysdk/src/main/java/net/hockeyapp/android/metrics/Persistence.java
@@ -1,5 +1,6 @@
 package net.hockeyapp.android.metrics;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.AsyncTask;
 
@@ -95,6 +96,7 @@ protected void persist(String[] data) {
         }
     }
 
+    @SuppressLint("StaticFieldLeak")
     void sendAvailable() {
         AsyncTaskUtils.execute(new AsyncTask<Void, Object, Object>() {
 
diff --git a/hockeysdk/src/main/java/net/hockeyapp/android/metrics/Sender.java b/hockeysdk/src/main/java/net/hockeyapp/android/metrics/Sender.java
index 50b1d6137..749926d2c 100644
--- a/hockeysdk/src/main/java/net/hockeyapp/android/metrics/Sender.java
+++ b/hockeysdk/src/main/java/net/hockeyapp/android/metrics/Sender.java
@@ -1,5 +1,6 @@
 package net.hockeyapp.android.metrics;
 
+import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.os.AsyncTask;
 import android.os.Build;
@@ -74,6 +75,7 @@ protected Sender() {
      * for available data, if the max amount of concurrent requests is not reached yet.
      * Does nothing, if the maximum number of concurrent requests is already reached or exceeded.
      */
+    @SuppressLint("StaticFieldLeak")
     protected void triggerSending() {
         if (requestCount() < MAX_REQUEST_COUNT) {
             try {
@@ -95,6 +97,7 @@ protected Void doInBackground(Void... params) {
         }
     }
 
+    @SuppressLint("StaticFieldLeak")
     protected void triggerSendingForTesting(final HttpURLConnection connection, final File file, final String persistedData) {
         if (requestCount() < MAX_REQUEST_COUNT) {
             mRequestCount.getAndIncrement();
diff --git a/hockeysdk/src/main/java/net/hockeyapp/android/metrics/TelemetryContext.java b/hockeysdk/src/main/java/net/hockeyapp/android/metrics/TelemetryContext.java
index f8dd2ac8e..332c20b2b 100644
--- a/hockeysdk/src/main/java/net/hockeyapp/android/metrics/TelemetryContext.java
+++ b/hockeysdk/src/main/java/net/hockeyapp/android/metrics/TelemetryContext.java
@@ -1,5 +1,6 @@
 package net.hockeyapp.android.metrics;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.graphics.Point;
@@ -105,6 +106,7 @@ private TelemetryContext() {
      * @param context       the context for this telemetryContext
      * @param appIdentifier the app identifier for this application
      */
+    @SuppressLint("StaticFieldLeak")
     TelemetryContext(Context context, String appIdentifier) {
         this();
         mWeakContext = new WeakReference<>(context);
diff --git a/hockeysdk/src/main/java/net/hockeyapp/android/tasks/AttachmentDownloader.java b/hockeysdk/src/main/java/net/hockeyapp/android/tasks/AttachmentDownloader.java
index 9689af4e7..3e2c2108d 100644
--- a/hockeysdk/src/main/java/net/hockeyapp/android/tasks/AttachmentDownloader.java
+++ b/hockeysdk/src/main/java/net/hockeyapp/android/tasks/AttachmentDownloader.java
@@ -1,5 +1,6 @@
 package net.hockeyapp.android.tasks;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.os.AsyncTask;
@@ -143,6 +144,7 @@ boolean consumeRetry() {
     /**
      * The AsyncTask that downloads the image and the updates the view.
      */
+    @SuppressLint("StaticFieldLeak")
     private static class DownloadTask extends AsyncTask<Void, Integer, Boolean> {
 
         private final DownloadJob downloadJob;
diff --git a/hockeysdk/src/main/java/net/hockeyapp/android/tasks/DownloadFileTask.java b/hockeysdk/src/main/java/net/hockeyapp/android/tasks/DownloadFileTask.java
index 52040a282..ac1030960 100644
--- a/hockeysdk/src/main/java/net/hockeyapp/android/tasks/DownloadFileTask.java
+++ b/hockeysdk/src/main/java/net/hockeyapp/android/tasks/DownloadFileTask.java
@@ -1,5 +1,6 @@
 package net.hockeyapp.android.tasks;
 
+import android.annotation.SuppressLint;
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.content.Context;
@@ -33,6 +34,7 @@
  * it on external storage. If the download was successful, the file
  * is then opened to trigger the installation.
  **/
+@SuppressLint("StaticFieldLeak")
 public class DownloadFileTask extends AsyncTask<Void, Integer, Long> {
     protected static final int MAX_REDIRECTS = 6;
 
diff --git a/hockeysdk/src/main/java/net/hockeyapp/android/tasks/LoginTask.java b/hockeysdk/src/main/java/net/hockeyapp/android/tasks/LoginTask.java
index 9abdc8771..bb7162f8e 100644
--- a/hockeysdk/src/main/java/net/hockeyapp/android/tasks/LoginTask.java
+++ b/hockeysdk/src/main/java/net/hockeyapp/android/tasks/LoginTask.java
@@ -1,5 +1,6 @@
 package net.hockeyapp.android.tasks;
 
+import android.annotation.SuppressLint;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -25,6 +26,7 @@
  * Perform the authentication process.
  *
  **/
+@SuppressLint("StaticFieldLeak")
 public class LoginTask extends ConnectionTask<Void, Void, Boolean> {
 
     /**
diff --git a/hockeysdk/src/main/java/net/hockeyapp/android/tasks/ParseFeedbackTask.java b/hockeysdk/src/main/java/net/hockeyapp/android/tasks/ParseFeedbackTask.java
index 3bff213ca..94f35a0c4 100644
--- a/hockeysdk/src/main/java/net/hockeyapp/android/tasks/ParseFeedbackTask.java
+++ b/hockeysdk/src/main/java/net/hockeyapp/android/tasks/ParseFeedbackTask.java
@@ -1,5 +1,6 @@
 package net.hockeyapp.android.tasks;
 
+import android.annotation.SuppressLint;
 import android.app.Notification;
 import android.app.PendingIntent;
 import android.content.Context;
@@ -28,6 +29,7 @@
  * {@link AsyncTask} that parses the Feedback JSON response
  *
  */
+@SuppressLint("StaticFieldLeak")
 public class ParseFeedbackTask extends AsyncTask<Void, Void, FeedbackResponse> {
 
     public static final String PREFERENCES_NAME = "net.hockeyapp.android.feedback";
diff --git a/hockeysdk/src/main/java/net/hockeyapp/android/tasks/SendFeedbackTask.java b/hockeysdk/src/main/java/net/hockeyapp/android/tasks/SendFeedbackTask.java
index 2614219b7..881da1284 100644
--- a/hockeysdk/src/main/java/net/hockeyapp/android/tasks/SendFeedbackTask.java
+++ b/hockeysdk/src/main/java/net/hockeyapp/android/tasks/SendFeedbackTask.java
@@ -1,5 +1,6 @@
 package net.hockeyapp.android.tasks;
 
+import android.annotation.SuppressLint;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -29,6 +30,7 @@
  * Internal helper class. Sends feedback to server.
  *
  **/
+@SuppressLint("StaticFieldLeak")
 public class SendFeedbackTask extends ConnectionTask<Void, Void, HashMap<String, String>> {
 
     public static final String BUNDLE_FEEDBACK_RESPONSE = "feedback_response";
diff --git a/hockeysdk/src/main/java/net/hockeyapp/android/views/AttachmentView.java b/hockeysdk/src/main/java/net/hockeyapp/android/views/AttachmentView.java
index ddf8c7850..d54aeae03 100644
--- a/hockeysdk/src/main/java/net/hockeyapp/android/views/AttachmentView.java
+++ b/hockeysdk/src/main/java/net/hockeyapp/android/views/AttachmentView.java
@@ -65,6 +65,7 @@ public class AttachmentView extends FrameLayout {
 
     private int mOrientation;
 
+    @SuppressLint("StaticFieldLeak")
     public AttachmentView(Context context, ViewGroup parent, Uri attachmentUri, boolean removable) {
         super(context);
 
diff --git a/hockeysdk/src/main/java/net/hockeyapp/android/views/PaintView.java b/hockeysdk/src/main/java/net/hockeyapp/android/views/PaintView.java
index 8a64d1e41..ae0e60945 100644
--- a/hockeysdk/src/main/java/net/hockeyapp/android/views/PaintView.java
+++ b/hockeysdk/src/main/java/net/hockeyapp/android/views/PaintView.java
@@ -33,6 +33,7 @@ public class PaintView extends ImageView {
     private Paint paint;
     private float mX, mY;
 
+    @SuppressLint("StaticFieldLeak")
     public PaintView(Context context, Uri imageUri, int displayWidth, int displayHeight) {
         super(context);
 
@@ -130,6 +131,7 @@ private void touchUp() {
         path = new Path();
     }
 
+    @SuppressLint("ClickableViewAccessibility")
     @Override
     public boolean onTouchEvent(MotionEvent event) {
         float x = event.getX();
diff --git a/hockeysdk/src/main/res/layout-land/hockeyapp_fragment_update.xml b/hockeysdk/src/main/res/layout-land/hockeyapp_fragment_update.xml
index 59ce139e0..bc2b349ab 100644
--- a/hockeysdk/src/main/res/layout-land/hockeyapp_fragment_update.xml
+++ b/hockeysdk/src/main/res/layout-land/hockeyapp_fragment_update.xml
@@ -3,7 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/hockeyapp_background_white">
+    android:background="@color/hockeyapp_background_white"
+    tools:ignore="Overdraw">
 
     <RelativeLayout
         android:id="@+id/view_header"
diff --git a/hockeysdk/src/main/res/layout/hockeyapp_activity_expiry_info.xml b/hockeysdk/src/main/res/layout/hockeyapp_activity_expiry_info.xml
index e969f7c33..f2e2f6b7c 100644
--- a/hockeysdk/src/main/res/layout/hockeyapp_activity_expiry_info.xml
+++ b/hockeysdk/src/main/res/layout/hockeyapp_activity_expiry_info.xml
@@ -1,8 +1,10 @@
 <?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="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/hockeyapp_background_white">
+    android:background="@color/hockeyapp_background_white"
+    tools:ignore="Overdraw">
 
     <TextView
         android:id="@+id/label_message"
diff --git a/hockeysdk/src/main/res/layout/hockeyapp_activity_feedback.xml b/hockeysdk/src/main/res/layout/hockeyapp_activity_feedback.xml
index 25c7c7150..1b84b6c05 100644
--- a/hockeysdk/src/main/res/layout/hockeyapp_activity_feedback.xml
+++ b/hockeysdk/src/main/res/layout/hockeyapp_activity_feedback.xml
@@ -1,9 +1,11 @@
 <?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="match_parent"
     android:background="@color/hockeyapp_background_white"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    tools:ignore="Overdraw">
 
     <ScrollView
         android:id="@+id/wrapper_feedback_scroll"
@@ -124,6 +126,7 @@
                 android:layout_gravity="center_horizontal"
                 android:layout_marginBottom="10dp"
                 android:layout_marginRight="5dp"
+                android:layout_marginEnd="5dp"
                 android:layout_weight="1"
                 android:gravity="center"
                 android:paddingLeft="10dp"
@@ -139,6 +142,7 @@
                 android:layout_gravity="center_horizontal"
                 android:layout_marginBottom="10dp"
                 android:layout_marginLeft="5dp"
+                android:layout_marginStart="5dp"
                 android:layout_weight="1"
                 android:gravity="center"
                 android:text="@string/hockeyapp_feedback_refresh_button_text"
diff --git a/hockeysdk/src/main/res/layout/hockeyapp_activity_login.xml b/hockeysdk/src/main/res/layout/hockeyapp_activity_login.xml
index 9ec656317..a54455520 100644
--- a/hockeysdk/src/main/res/layout/hockeyapp_activity_login.xml
+++ b/hockeysdk/src/main/res/layout/hockeyapp_activity_login.xml
@@ -3,7 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/hockeyapp_background_white">
+    android:background="@color/hockeyapp_background_white"
+    tools:ignore="Overdraw">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/hockeysdk/src/main/res/layout/hockeyapp_fragment_update.xml b/hockeysdk/src/main/res/layout/hockeyapp_fragment_update.xml
index 9850c9567..7555ad24a 100644
--- a/hockeysdk/src/main/res/layout/hockeyapp_fragment_update.xml
+++ b/hockeysdk/src/main/res/layout/hockeyapp_fragment_update.xml
@@ -3,7 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/hockeyapp_background_white">
+    android:background="@color/hockeyapp_background_white"
+    tools:ignore="Overdraw">
 
     <RelativeLayout
         android:id="@+id/view_header"
diff --git a/hockeysdk/src/main/res/values-de/strings.xml b/hockeysdk/src/main/res/values-de/strings.xml
index 9c09b7e8c..b699ebd2f 100644
--- a/hockeysdk/src/main/res/values-de/strings.xml
+++ b/hockeysdk/src/main/res/values-de/strings.xml
@@ -54,7 +54,6 @@
     <string name="hockeyapp_feedback_validate_email_empty">Bitte geben Sie eine E-Mail-Adresse an</string>
     <string name="hockeyapp_feedback_validate_name_error">Bitte geben Sie Ihren Namen an</string>
     <string name="hockeyapp_feedback_validate_text_error">Die Nachricht konnte nicht übertragen werden. Überprüfen Sie bitte Ihre E-Mail-Adresse.</string>
-    <string name="hockeyapp_feedback_generic_error">Es ist ein Fehler aufgetreten</string>
     <string name="hockeyapp_feedback_attach_file">Datei anhängen</string>
     <string name="hockeyapp_feedback_attach_picture">Bild anhängen</string>
     <string name="hockeyapp_feedback_select_file">Datei auswählen</string>
@@ -98,7 +97,6 @@
 
     <!-- Dialogs -->
     <string name="hockeyapp_dialog_positive_button">OK</string>
-    <string name="hockeyapp_dialog_negative_button">Abbrechen</string>
     <string name="hockeyapp_dialog_error_title">Fehler</string>
     <string name="hockeyapp_dialog_error_message">Es ist ein Fehler aufgetreten.</string>
 
diff --git a/hockeysdk/src/main/res/values-es/strings.xml b/hockeysdk/src/main/res/values-es/strings.xml
index c75a6d950..71823a29d 100644
--- a/hockeysdk/src/main/res/values-es/strings.xml
+++ b/hockeysdk/src/main/res/values-es/strings.xml
@@ -54,7 +54,6 @@
     <string name="hockeyapp_feedback_validate_email_empty">Por favor, introduce una dirección de email</string>
     <string name="hockeyapp_feedback_validate_name_error">Por favor, introduce un nombre</string>
     <string name="hockeyapp_feedback_validate_text_error">No se pudo enviar el mensaje. Por favor, comprueba el formato de tu dirección de email.</string>
-    <string name="hockeyapp_feedback_generic_error">Ha ocurrido un error</string>
     <string name="hockeyapp_feedback_attach_file">Adjuntar fichero</string>
     <string name="hockeyapp_feedback_attach_picture">Adjuntar imagen</string>
     <string name="hockeyapp_feedback_select_file">Seleccionar archivo</string>
@@ -98,7 +97,6 @@
 
     <!-- Dialogs -->
     <string name="hockeyapp_dialog_positive_button">OK</string>
-    <string name="hockeyapp_dialog_negative_button">Cancelar</string>
     <string name="hockeyapp_dialog_error_title">Error</string>
     <string name="hockeyapp_dialog_error_message">Ha ocurrido un error</string>
 
diff --git a/hockeysdk/src/main/res/values-fa/strings.xml b/hockeysdk/src/main/res/values-fa/strings.xml
index dc277e328..e7527da4e 100644
--- a/hockeysdk/src/main/res/values-fa/strings.xml
+++ b/hockeysdk/src/main/res/values-fa/strings.xml
@@ -54,7 +54,6 @@
     <string name="hockeyapp_feedback_validate_email_empty">لطفا یک ایمیل وارد کنید</string>
     <string name="hockeyapp_feedback_validate_name_error">لطفا نام خود را وارد کنید</string>
     <string name="hockeyapp_feedback_validate_text_error">پیام نمی تواند ارسال شود. لطفا متن پیام خود را وارد کنید</string>
-    <string name="hockeyapp_feedback_generic_error">بروز خطا</string>
     <string name="hockeyapp_feedback_attach_file">ضمیمه فایل</string>
     <string name="hockeyapp_feedback_attach_picture">ضمیمه عکس</string>
     <string name="hockeyapp_feedback_select_file">انتخاب فایل</string>
@@ -98,7 +97,6 @@
 
     <!-- Dialogs -->
     <string name="hockeyapp_dialog_positive_button">تایید</string>
-    <string name="hockeyapp_dialog_negative_button">لغو</string>
     <string name="hockeyapp_dialog_error_title">خطا</string>
     <string name="hockeyapp_dialog_error_message">بروز خطا</string>
 
diff --git a/hockeysdk/src/main/res/values-fr/strings.xml b/hockeysdk/src/main/res/values-fr/strings.xml
index 0676ef4f0..61b70dbe2 100644
--- a/hockeysdk/src/main/res/values-fr/strings.xml
+++ b/hockeysdk/src/main/res/values-fr/strings.xml
@@ -54,7 +54,6 @@
     <string name="hockeyapp_feedback_validate_email_empty">Spécifier une adresse email valide, s\'il vous plaît.</string>
     <string name="hockeyapp_feedback_validate_name_error">Spécifier vos commentaires, s\'il vous plaît.</string>
     <string name="hockeyapp_feedback_validate_text_error">Le message n\'a pas pu être envoyé. Vérifier votre adresse email.</string>
-    <string name="hockeyapp_feedback_generic_error">Une erreur est survenue.</string>
     <string name="hockeyapp_feedback_attach_file">Ajouter un fichier</string>
     <string name="hockeyapp_feedback_attach_picture">Ajouter une image</string>
     <string name="hockeyapp_feedback_select_file">Choisir un fichier</string>
@@ -98,7 +97,6 @@
 
     <!-- Dialogs -->
     <string name="hockeyapp_dialog_positive_button">D\'accord</string>
-    <string name="hockeyapp_dialog_negative_button">Annuler</string>
     <string name="hockeyapp_dialog_error_title">Erreur</string>
     <string name="hockeyapp_dialog_error_message">Une erreur est survenue.</string>
 
diff --git a/hockeysdk/src/main/res/values-it/strings.xml b/hockeysdk/src/main/res/values-it/strings.xml
index 8c86d5144..5c78a45e3 100644
--- a/hockeysdk/src/main/res/values-it/strings.xml
+++ b/hockeysdk/src/main/res/values-it/strings.xml
@@ -54,7 +54,6 @@
     <string name="hockeyapp_feedback_validate_email_empty">Inserisci un indirizzo e-mail</string>
     <string name="hockeyapp_feedback_validate_name_error">Inserisci il tuo nome</string>
     <string name="hockeyapp_feedback_validate_text_error">Impossibile pubblicare il messaggio. Inserisci un testo per il feedback</string>
-    <string name="hockeyapp_feedback_generic_error">Si è verificato un errore</string>
     <string name="hockeyapp_feedback_attach_file">Allega un file</string>
     <string name="hockeyapp_feedback_attach_picture">Allega un\'immagine</string>
     <string name="hockeyapp_feedback_select_file">Seleziona il file</string>
@@ -98,7 +97,6 @@
 
     <!-- Dialogs -->
     <string name="hockeyapp_dialog_positive_button">OK</string>
-    <string name="hockeyapp_dialog_negative_button">Annulla</string>
     <string name="hockeyapp_dialog_error_title">Errore</string>
     <string name="hockeyapp_dialog_error_message">Si è verificato un errore</string>
 
diff --git a/hockeysdk/src/main/res/values-pt/strings.xml b/hockeysdk/src/main/res/values-pt/strings.xml
index 04e6ab641..bb3df4314 100644
--- a/hockeysdk/src/main/res/values-pt/strings.xml
+++ b/hockeysdk/src/main/res/values-pt/strings.xml
@@ -54,7 +54,6 @@
     <string name="hockeyapp_feedback_validate_email_empty">Por favor preencha seu email</string>
     <string name="hockeyapp_feedback_validate_name_error">Por favor preencha a mensagem</string>
     <string name="hockeyapp_feedback_validate_text_error">A mensagem não pôde ser enviada. Por favor verifique o formato do seu email.</string>
-    <string name="hockeyapp_feedback_generic_error">Ocorreu um erro</string>
     <string name="hockeyapp_feedback_attach_file">Anexar arquivo</string>
     <string name="hockeyapp_feedback_attach_picture">Anexar imagem</string>
     <string name="hockeyapp_feedback_select_file">Selecionar arquivo</string>
@@ -98,7 +97,6 @@
 
     <!-- Dialogs -->
     <string name="hockeyapp_dialog_positive_button">OK</string>
-    <string name="hockeyapp_dialog_negative_button">Cancelar</string>
     <string name="hockeyapp_dialog_error_title">Erro</string>
     <string name="hockeyapp_dialog_error_message">Ocorreu um erro</string>
 
diff --git a/hockeysdk/src/main/res/values-ru/strings.xml b/hockeysdk/src/main/res/values-ru/strings.xml
index 419b29bd3..177ccf888 100644
--- a/hockeysdk/src/main/res/values-ru/strings.xml
+++ b/hockeysdk/src/main/res/values-ru/strings.xml
@@ -54,7 +54,6 @@
     <string name="hockeyapp_feedback_validate_email_empty">Пожалуйста, введите email адрес</string>
     <string name="hockeyapp_feedback_validate_name_error">Пожалуйста, введите имя</string>
     <string name="hockeyapp_feedback_validate_text_error">Сообщение не может быть отправлено. Пожалуйста, введите текст отзыва.</string>
-    <string name="hockeyapp_feedback_generic_error">Произошла ошибка</string>
     <string name="hockeyapp_feedback_attach_file">Прикрепить файл</string>
     <string name="hockeyapp_feedback_attach_picture">Прикрепить изображение</string>
     <string name="hockeyapp_feedback_select_file">Выбрать файл</string>
@@ -97,7 +96,6 @@
 
     <!-- Dialogs -->
     <string name="hockeyapp_dialog_positive_button">OK</string>
-    <string name="hockeyapp_dialog_negative_button">Закрыть</string>
     <string name="hockeyapp_dialog_error_title">Ошибка</string>
     <string name="hockeyapp_dialog_error_message">Произошла ошибка</string>
 
diff --git a/hockeysdk/src/main/res/values-v14/styles.xml b/hockeysdk/src/main/res/values-v14/styles.xml
deleted file mode 100644
index 222f2d9f9..000000000
--- a/hockeysdk/src/main/res/values-v14/styles.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="HockeyApp.EditTextStyle" parent="android:Widget.EditText">
-        <item name="android:layout_marginLeft">20dp</item>
-        <item name="android:layout_marginRight">20dp</item>
-        <item name="android:layout_marginTop">10dp</item>
-        <item name="android:layout_marginBottom">10dp</item>
-        <item name="android:textSize">15sp</item>
-        <item name="android:textColor">@color/hockeyapp_text_normal</item>
-        <item name="android:textColorHint">@color/hockeyapp_text_light</item>
-        <item name="android:typeface">normal</item>
-        <item name="android:imeOptions">actionNext</item>
-    </style>
-
-    <style name="HockeyApp.SingleLineInputStyle" parent="HockeyApp.EditTextStyle">
-        <item name="android:singleLine">true</item>
-    </style>
-
-    <style name="HockeyApp.ButtonStyle" parent="android:Widget.Button">
-        <item name="android:textColor">@color/hockeyapp_text_white</item>
-        <item name="android:textSize">15sp</item>
-        <item name="android:gravity">center</item>
-        <item name="android:background">@drawable/hockeyapp_btn_background</item>
-        <item name="android:textAllCaps">true</item>
-    </style>
-
-</resources>
diff --git a/hockeysdk/src/main/res/values-zh/strings.xml b/hockeysdk/src/main/res/values-zh/strings.xml
index fcf8f643c..235bf2793 100644
--- a/hockeysdk/src/main/res/values-zh/strings.xml
+++ b/hockeysdk/src/main/res/values-zh/strings.xml
@@ -54,7 +54,6 @@
     <string name="hockeyapp_feedback_validate_email_empty">请输入电子邮件</string>
     <string name="hockeyapp_feedback_validate_name_error">请输入姓名</string>
     <string name="hockeyapp_feedback_validate_text_error">请输入反馈内容</string>
-    <string name="hockeyapp_feedback_generic_error">发生错误</string>
     <string name="hockeyapp_feedback_attach_file">添加附件</string>
     <string name="hockeyapp_feedback_attach_picture">添加图片</string>
     <string name="hockeyapp_feedback_select_file">选择文件</string>
@@ -98,7 +97,6 @@
 
     <!-- Dialogs -->
     <string name="hockeyapp_dialog_positive_button">确定</string>
-    <string name="hockeyapp_dialog_negative_button">取消</string>
     <string name="hockeyapp_dialog_error_title">错误</string>
     <string name="hockeyapp_dialog_error_message">发生错误</string>
 
diff --git a/hockeysdk/src/main/res/values/strings.xml b/hockeysdk/src/main/res/values/strings.xml
index b78f787f1..c0a240b31 100644
--- a/hockeysdk/src/main/res/values/strings.xml
+++ b/hockeysdk/src/main/res/values/strings.xml
@@ -1,4 +1,4 @@
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Crash Dialog -->
     <string name="hockeyapp_crash_dialog_app_name_fallback">This app</string>
     <string name="hockeyapp_crash_dialog_title">%s Unexpectedly Quit</string>
@@ -55,12 +55,11 @@
     <string name="hockeyapp_feedback_validate_email_empty">Please enter an email address</string>
     <string name="hockeyapp_feedback_validate_name_error">Please enter your name</string>
     <string name="hockeyapp_feedback_validate_text_error">Message couldn\'t be posted. Please enter a feedback text</string>
-    <string name="hockeyapp_feedback_generic_error">An error has occurred</string>
     <string name="hockeyapp_feedback_attach_file">Attach File</string>
     <string name="hockeyapp_feedback_attach_picture">Attach Picture</string>
     <string name="hockeyapp_feedback_select_file">Select File</string>
     <string name="hockeyapp_feedback_select_picture">Select Picture</string>
-    <string name="hockeyapp_feedback_max_attachments_allowed">Only %d attachments allowed.</string>
+    <string name="hockeyapp_feedback_max_attachments_allowed" tools:ignore="PluralsCandidate">Only %d attachments allowed.</string>
     <string name="hockeyapp_feedback_attachment_loading">Loading…</string>
     <string name="hockeyapp_feedback_attachment_error">Error</string>
     <string name="hockeyapp_feedback_name_hint_required">Name (required)</string>
@@ -98,7 +97,6 @@
 
     <!-- Dialogs -->
     <string name="hockeyapp_dialog_positive_button">OK</string>
-    <string name="hockeyapp_dialog_negative_button">Cancel</string>
     <string name="hockeyapp_dialog_error_title">Error</string>
     <string name="hockeyapp_dialog_error_message">An error has occurred</string>