diff --git a/build.gradle b/build.gradle
index 56b2558e..fa30527c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,6 +22,7 @@ android {
         proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
 
         multiDexEnabled true
+        vectorDrawables.useSupportLibrary true
     }
     dexOptions {
         javaMaxHeapSize "2g"
diff --git a/res/layout-v23/pairing_explanation_not_trusted.xml b/res/layout-v23/pairing_explanation_not_trusted.xml
new file mode 100644
index 00000000..f1a30a94
--- /dev/null
+++ b/res/layout-v23/pairing_explanation_not_trusted.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/selectableItemBackground"
+    android:clickable="false"
+    android:drawableStart="@drawable/ic_warning"
+    android:drawablePadding="8dp"
+    android:drawableTint="?attr/colorControlNormal"
+    android:paddingTop="16dp"
+    android:paddingBottom="12dp"
+    android:text="@string/on_non_trusted_message">
+
+</TextView>
diff --git a/res/layout-v23/pairing_explanation_text_no_wifi.xml b/res/layout-v23/pairing_explanation_text_no_wifi.xml
new file mode 100644
index 00000000..93ed7592
--- /dev/null
+++ b/res/layout-v23/pairing_explanation_text_no_wifi.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/selectableItemBackground"
+    android:clickable="true"
+    android:drawableStart="@drawable/ic_wifi"
+    android:drawablePadding="8dp"
+    android:drawableTint="?attr/colorControlNormal"
+    android:paddingTop="16dp"
+    android:paddingBottom="12dp"
+    android:text="@string/no_wifi">
+
+</TextView>
diff --git a/res/layout/activity_bigscreen.xml b/res/layout/activity_bigscreen.xml
index 5fa02ad4..eb8b3863 100644
--- a/res/layout/activity_bigscreen.xml
+++ b/res/layout/activity_bigscreen.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.gridlayout.widget.GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:grid="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -12,7 +13,7 @@
         grid:layout_columnWeight="1"
         grid:layout_rowWeight="1"
         android:contentDescription="@string/bigscreen_home"
-        android:src="@drawable/ic_home_black_24dp"
+        app:srcCompat="@drawable/ic_home_black_24dp"
         android:theme="@style/DisableableButton" />
 
     <ImageButton
@@ -22,7 +23,7 @@
         grid:layout_columnWeight="1"
         grid:layout_rowWeight="1"
         android:contentDescription="@string/bigscreen_up"
-        android:src="@drawable/ic_arrow_upward_black_24dp"
+        app:srcCompat="@drawable/ic_arrow_upward_black_24dp"
         android:theme="@style/DisableableButton" />
 
     <ImageButton
@@ -32,7 +33,7 @@
         grid:layout_row="0"
         grid:layout_rowWeight="1"
         android:contentDescription="@string/bigscreen_mic"
-        android:src="@drawable/ic_mic_black"
+        app:srcCompat="@drawable/ic_mic_black"
         android:theme="@style/DisableableButton" />
 
     <ImageButton
@@ -42,7 +43,7 @@
         grid:layout_columnWeight="1"
         grid:layout_rowWeight="1"
         android:contentDescription="@string/bigscreen_left"
-        android:src="@drawable/ic_arrow_back_black_24dp"
+        app:srcCompat="@drawable/ic_arrow_back_black_24dp"
         android:theme="@style/DisableableButton" />
 
     <ImageButton
@@ -52,7 +53,7 @@
         grid:layout_columnWeight="1"
         grid:layout_rowWeight="1"
         android:contentDescription="@string/bigscreen_select"
-        android:src="@drawable/ic_keyboard_return_black_24dp"
+        app:srcCompat="@drawable/ic_keyboard_return_black_24dp"
         android:theme="@style/DisableableButton" />
 
     <ImageButton
@@ -62,7 +63,7 @@
         grid:layout_columnWeight="1"
         grid:layout_rowWeight="1"
         android:contentDescription="@string/bigscreen_right"
-        android:src="@drawable/ic_arrow_forward_black_24dp"
+        app:srcCompat="@drawable/ic_arrow_forward_black_24dp"
         android:theme="@style/DisableableButton" />
 
     <ImageButton
@@ -72,6 +73,6 @@
         grid:layout_columnWeight="1"
         grid:layout_rowWeight="1"
         android:contentDescription="@string/bigscreen_down"
-        android:src="@drawable/ic_arrow_downward_black_24dp"
+        app:srcCompat="@drawable/ic_arrow_downward_black_24dp"
         android:theme="@style/DisableableButton"  />
 </androidx.gridlayout.widget.GridLayout>
diff --git a/res/layout/activity_presenter.xml b/res/layout/activity_presenter.xml
index eb237fc9..e401577e 100644
--- a/res/layout/activity_presenter.xml
+++ b/res/layout/activity_presenter.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/mpris_control_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -32,7 +33,7 @@
             android:layout_weight="0.25"
             android:layout_marginRight="3dp"
             android:layout_marginEnd="3dp"
-            android:src="@drawable/ic_previous_black"
+            app:srcCompat="@drawable/ic_previous_black"
             android:theme="@style/DisableableButton" />
 
         <ImageButton
@@ -43,7 +44,7 @@
             android:layout_marginStart="3dp"
             android:layout_weight="0.25"
             android:contentDescription="@string/mpris_ff"
-            android:src="@drawable/ic_next_black"
+            app:srcCompat="@drawable/ic_next_black"
             android:theme="@style/DisableableButton" />
 
     </LinearLayout>
diff --git a/res/layout/list_item_systemvolume.xml b/res/layout/list_item_systemvolume.xml
index 1abb78f7..28b0a717 100644
--- a/res/layout/list_item_systemvolume.xml
+++ b/res/layout/list_item_systemvolume.xml
@@ -27,7 +27,7 @@
             android:background="@android:color/transparent"
             android:contentDescription="@string/mute"
             android:scaleType="fitXY"
-            android:src="@drawable/ic_volume_black"
+            app:srcCompat="@drawable/ic_volume_black"
             app:tint="?attr/colorHighContrast" />
 
         <SeekBar
diff --git a/res/layout/mpris_control.xml b/res/layout/mpris_control.xml
index f098bc38..50b8da9d 100644
--- a/res/layout/mpris_control.xml
+++ b/res/layout/mpris_control.xml
@@ -46,7 +46,7 @@
         android:baselineAlignBottom="true"
         android:clickable="false"
         android:contentDescription="@string/mpris_play"
-        android:src="@drawable/ic_play_black"
+        app:srcCompat="@drawable/ic_play_black"
         android:theme="@style/DisableableButton" />
 
     <LinearLayout
@@ -61,7 +61,7 @@
             android:layout_height="fill_parent"
             android:layout_weight="0.25"
             android:contentDescription="@string/mpris_previous"
-            android:src="@drawable/ic_previous_black"
+            app:srcCompat="@drawable/ic_previous_black"
             android:theme="@style/DisableableButton" />
 
         <ImageButton
@@ -70,7 +70,7 @@
             android:layout_height="fill_parent"
             android:layout_weight="0.25"
             android:contentDescription="@string/mpris_rew"
-            android:src="@drawable/ic_rewind_black"
+            app:srcCompat="@drawable/ic_rewind_black"
             android:theme="@style/DisableableButton" />
 
         <ImageButton
@@ -79,7 +79,7 @@
             android:layout_height="fill_parent"
             android:layout_weight="0.25"
             android:contentDescription="@string/mpris_stop"
-            android:src="@drawable/ic_stop"
+            app:srcCompat="@drawable/ic_stop"
             android:theme="@style/DisableableButton" />
 
 
@@ -89,7 +89,7 @@
             android:layout_height="fill_parent"
             android:layout_weight="0.25"
             android:contentDescription="@string/mpris_ff"
-            android:src="@drawable/ic_fast_forward_black"
+            app:srcCompat="@drawable/ic_fast_forward_black"
             android:theme="@style/DisableableButton" />
 
         <ImageButton
@@ -98,7 +98,7 @@
             android:layout_height="fill_parent"
             android:layout_weight="0.25"
             android:contentDescription="@string/mpris_next"
-            android:src="@drawable/ic_next_black"
+            app:srcCompat="@drawable/ic_next_black"
             android:theme="@style/DisableableButton" />
     </LinearLayout>
 
@@ -155,7 +155,7 @@
             android:layout_weight="0"
             android:contentDescription="@string/mpris_volume"
             android:maxWidth="30dip"
-            android:src="@drawable/ic_volume_black"
+            app:srcCompat="@drawable/ic_volume_black"
             app:tint="?attr/colorHighContrast" />
 
 
diff --git a/res/layout/pairing_explanation_not_trusted.xml b/res/layout/pairing_explanation_not_trusted.xml
index 7feb2e6f..4ba71416 100644
--- a/res/layout/pairing_explanation_not_trusted.xml
+++ b/res/layout/pairing_explanation_not_trusted.xml
@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?attr/selectableItemBackground"
+    android:clickable="false"
+    android:drawableStart="@drawable/ic_warning"
+    android:drawableLeft="@drawable/ic_warning"
     android:drawablePadding="8dp"
     android:paddingTop="16dp"
     android:paddingBottom="12dp"
-    android:text="@string/on_non_trusted_message"
-    android:drawableStart="@drawable/ic_warning"
-    android:drawableTint="?attr/colorControlNormal"
-    android:clickable="false"
-    >
+    android:text="@string/on_non_trusted_message">
 
 </TextView>
diff --git a/res/layout/pairing_explanation_text_no_wifi.xml b/res/layout/pairing_explanation_text_no_wifi.xml
index adb7fb0a..d05f97a9 100644
--- a/res/layout/pairing_explanation_text_no_wifi.xml
+++ b/res/layout/pairing_explanation_text_no_wifi.xml
@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?attr/selectableItemBackground"
+    android:clickable="true"
+    android:drawableStart="@drawable/ic_wifi"
+    android:drawableLeft="@drawable/ic_wifi"
     android:drawablePadding="8dp"
     android:paddingTop="16dp"
     android:paddingBottom="12dp"
-    android:text="@string/no_wifi"
-    android:drawableLeft="@drawable/ic_wifi"
-    android:drawableTint="?attr/colorControlNormal"
-    android:clickable="true"
-    >
+    android:text="@string/no_wifi">
 
 </TextView>
diff --git a/res/layout/widget_remotecommandplugin.xml b/res/layout/widget_remotecommandplugin.xml
index 1cd959d8..e91534fb 100644
--- a/res/layout/widget_remotecommandplugin.xml
+++ b/res/layout/widget_remotecommandplugin.xml
@@ -41,11 +41,12 @@
         android:id="@+id/not_reachable_message"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:drawableStart="@drawable/ic_error_outline_black_48dp"
         android:drawableLeft="@drawable/ic_error_outline_black_48dp"
         android:drawablePadding="8dip"
-        android:paddingLeft="8dip"
-        android:drawableStart="@drawable/ic_error_outline_black_48dp"
         android:gravity="center_vertical"
+        android:paddingStart="8dip"
+        android:paddingLeft="8dip"
         android:text="@string/unreachable_description"
         android:textAppearance="?android:attr/textAppearanceMedium" />
 </LinearLayout>
\ No newline at end of file