diff --git a/app/build.gradle b/app/build.gradle
index b8aef3755..4bd235691 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -211,7 +211,6 @@ android {
         versionCode 103001
         versionName getVersionName()
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        vectorDrawables.useSupportLibrary = true
     }
 
     testOptions {
diff --git a/app/src/main/java/org/fdroid/fdroid/FDroidApp.java b/app/src/main/java/org/fdroid/fdroid/FDroidApp.java
index 49674fba3..4d78f0af9 100644
--- a/app/src/main/java/org/fdroid/fdroid/FDroidApp.java
+++ b/app/src/main/java/org/fdroid/fdroid/FDroidApp.java
@@ -37,7 +37,6 @@ import android.os.Build;
 import android.os.Environment;
 import android.os.StrictMode;
 import android.preference.PreferenceManager;
-import android.support.v7.app.AppCompatDelegate;
 import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
@@ -79,10 +78,6 @@ import sun.net.www.protocol.bluetooth.Handler;
 )
 public class FDroidApp extends Application {
 
-    static {
-        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);
-    }
-
     private static final String TAG = "FDroidApp";
 
     public static final String SYSTEM_DIR_NAME = Environment.getRootDirectory().getAbsolutePath();
diff --git a/app/src/main/java/org/fdroid/fdroid/NotificationHelper.java b/app/src/main/java/org/fdroid/fdroid/NotificationHelper.java
index 298f2e65d..59313f8eb 100644
--- a/app/src/main/java/org/fdroid/fdroid/NotificationHelper.java
+++ b/app/src/main/java/org/fdroid/fdroid/NotificationHelper.java
@@ -12,7 +12,6 @@ import android.graphics.Point;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.graphics.drawable.VectorDrawableCompat;
 import android.support.v4.app.NotificationCompat;
 import android.support.v4.app.NotificationManagerCompat;
 import android.support.v4.content.ContextCompat;
@@ -526,7 +525,7 @@ class NotificationHelper {
         if (entry.status == AppUpdateStatusManager.Status.Downloading || entry.status == AppUpdateStatusManager.Status.Installing) {
             Bitmap bitmap = Bitmap.createBitmap(largeIconSize.x, largeIconSize.y, Bitmap.Config.ARGB_8888);
             Canvas canvas = new Canvas(bitmap);
-            Drawable downloadIcon = VectorDrawableCompat.create(context.getResources(), R.drawable.ic_notification_download, context.getTheme());
+            Drawable downloadIcon = ContextCompat.getDrawable(context, R.drawable.ic_notification_download);
             if (downloadIcon != null) {
                 downloadIcon.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
                 downloadIcon.draw(canvas);
diff --git a/app/src/main/res/drawable-ldrtl/ic_back_black_24dp.xml b/app/src/main/res/drawable-ldrtl/ic_back_black_24dp.xml
new file mode 100644
index 000000000..ec94ba255
--- /dev/null
+++ b/app/src/main/res/drawable-ldrtl/ic_back_black_24dp.xml
@@ -0,0 +1,7 @@
+<!-- Would like to use the android:autoMirror property, but that is not suppoted on pre-lollipop
+     unless using VectorDrawableCompat (instead of using build-tools to produce .pngs for us). -->
+<vector android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M 4,11 H 16.17 L 10.58,5.41 12,4 20,12 12,20 10.59,18.59 16.17,13 H 4 Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_back_black_24dp.xml b/app/src/main/res/drawable/ic_back_black_24dp.xml
index a5b378a9c..d5dfb2713 100644
--- a/app/src/main/res/drawable/ic_back_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_back_black_24dp.xml
@@ -1,4 +1,4 @@
-<vector android:autoMirrored="true" android:height="24dp"
+<vector android:height="24dp"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
diff --git a/app/src/main/res/layout/activity_app_list.xml b/app/src/main/res/layout/activity_app_list.xml
index 0e3f2969b..8a4b5f53f 100644
--- a/app/src/main/res/layout/activity_app_list.xml
+++ b/app/src/main/res/layout/activity_app_list.xml
@@ -27,7 +27,7 @@
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:srcCompat="@drawable/ic_back_black_24dp" />
+                android:src="@drawable/ic_back_black_24dp" />
 
             <EditText
                 android:layout_width="0dp"
@@ -53,7 +53,7 @@
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:srcCompat="@drawable/ic_close_black_24dp" />
+                android:src="@drawable/ic_close_black_24dp" />
 
         </android.support.constraint.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/apklistitem.xml b/app/src/main/res/layout/apklistitem.xml
index 3383f2c3c..6989b9286 100644
--- a/app/src/main/res/layout/apklistitem.xml
+++ b/app/src/main/res/layout/apklistitem.xml
@@ -64,7 +64,7 @@
                 android:gravity="end"
                 android:textAlignment="viewEnd"
                 tools:text=""
-                tools:visible="gone" />
+                tools:visibility="gone" />
 
       </LinearLayout>
 
@@ -97,7 +97,7 @@
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
             tools:text=""
-            tools:visible="gone" />
+            tools:visibility="gone" />
 
 
       <TextView android:id="@+id/incompatible_reasons"
@@ -108,6 +108,6 @@
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
             tools:text=""
-            tools:visible="gone" />
+            tools:visibility="gone" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/donate_bitcoin.xml b/app/src/main/res/layout/donate_bitcoin.xml
index 9e538fb8e..9beef29cb 100644
--- a/app/src/main/res/layout/donate_bitcoin.xml
+++ b/app/src/main/res/layout/donate_bitcoin.xml
@@ -8,5 +8,5 @@
     android:layout_marginStart="12dp"
     android:layout_marginEnd="12dp"
     android:layout_marginRight="12dp"
-    app:srcCompat="@drawable/donation_option_bitcoin"
+    android:src="@drawable/donation_option_bitcoin"
     android:contentDescription="@string/menu_bitcoin" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/donate_flattr.xml b/app/src/main/res/layout/donate_flattr.xml
index ad9092e77..aaf3631b9 100644
--- a/app/src/main/res/layout/donate_flattr.xml
+++ b/app/src/main/res/layout/donate_flattr.xml
@@ -8,5 +8,5 @@
     android:layout_marginStart="12dp"
     android:layout_marginEnd="12dp"
     android:layout_marginRight="12dp"
-    app:srcCompat="@drawable/donation_option_flattr"
+    android:src="@drawable/donation_option_flattr"
     android:contentDescription="@string/menu_flattr" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/donate_litecoin.xml b/app/src/main/res/layout/donate_litecoin.xml
index 7a84eb367..e9bba5956 100644
--- a/app/src/main/res/layout/donate_litecoin.xml
+++ b/app/src/main/res/layout/donate_litecoin.xml
@@ -4,5 +4,5 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="80dp"
     android:layout_height="20dp"
-    app:srcCompat="@drawable/donation_option_litecoin"
+    android:src="@drawable/donation_option_litecoin"
     android:contentDescription="@string/menu_litecoin" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/main_tab_swap.xml b/app/src/main/res/layout/main_tab_swap.xml
index adc254e3e..616736ae2 100644
--- a/app/src/main/res/layout/main_tab_swap.xml
+++ b/app/src/main/res/layout/main_tab_swap.xml
@@ -56,7 +56,7 @@
         android:id="@+id/image"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:srcCompat="@drawable/nearby_splash"
+        android:src="@drawable/nearby_splash"
         android:importantForAccessibility="no"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
diff --git a/app/src/main/res/layout/share_header_item.xml b/app/src/main/res/layout/share_header_item.xml
index daa2d000d..5ec578b95 100644
--- a/app/src/main/res/layout/share_header_item.xml
+++ b/app/src/main/res/layout/share_header_item.xml
@@ -19,7 +19,7 @@
         android:layout_alignParentTop="true"
         android:scaleType="centerCrop"
         android:layout_gravity="center_horizontal"
-        app:srcCompat="@drawable/ic_nearby_share"
+        android:src="@drawable/ic_nearby_share"
         android:layout_marginRight="10dp"
         android:layout_marginEnd="10dp"
         />
diff --git a/app/src/main/res/layout/swap_join_wifi.xml b/app/src/main/res/layout/swap_join_wifi.xml
index d6a9285d7..8df458f7b 100644
--- a/app/src/main/res/layout/swap_join_wifi.xml
+++ b/app/src/main/res/layout/swap_join_wifi.xml
@@ -6,7 +6,7 @@
       android:layout_height="match_parent"
       xmlns:tools="http://schemas.android.com/tools"
       android:background="@color/swap_blue"
-      tools:context=".views.swap.SwapActivity">
+      tools:context=".views.swap.SwapWorkflowActivity">
 
     <TextView
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/updateable_app_status_item.xml b/app/src/main/res/layout/updateable_app_status_item.xml
index fa72957c3..2b2251e43 100644
--- a/app/src/main/res/layout/updateable_app_status_item.xml
+++ b/app/src/main/res/layout/updateable_app_status_item.xml
@@ -60,7 +60,7 @@
         android:contentDescription="@string/cancel"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:srcCompat="@drawable/ic_cancel"
+        android:src="@drawable/ic_cancel"
         android:background="@android:color/transparent"
         android:layout_marginEnd="16dp"
         android:layout_marginRight="16dp"
diff --git a/app/src/main/res/layout/updates_header.xml b/app/src/main/res/layout/updates_header.xml
index 35a871a4e..4cff7123f 100644
--- a/app/src/main/res/layout/updates_header.xml
+++ b/app/src/main/res/layout/updates_header.xml
@@ -24,7 +24,7 @@
         android:id="@+id/button_download_all"
         android:layout_width="48dp"
         android:layout_height="48dp"
-        app:srcCompat="@drawable/ic_download_progress_0"
+        android:src="@drawable/ic_download_progress_0"
         android:layout_marginEnd="8dp"
         android:layout_marginRight="8dp"
         android:contentDescription="@string/updates__tts__download_updates_for_all_apps"