diff --git a/res/layout/activity_bigscreen.xml b/res/layout/activity_bigscreen.xml
index eb8b3863..5fa02ad4 100644
--- a/res/layout/activity_bigscreen.xml
+++ b/res/layout/activity_bigscreen.xml
@@ -1,6 +1,5 @@
 <?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"
@@ -13,7 +12,7 @@
         grid:layout_columnWeight="1"
         grid:layout_rowWeight="1"
         android:contentDescription="@string/bigscreen_home"
-        app:srcCompat="@drawable/ic_home_black_24dp"
+        android:src="@drawable/ic_home_black_24dp"
         android:theme="@style/DisableableButton" />
 
     <ImageButton
@@ -23,7 +22,7 @@
         grid:layout_columnWeight="1"
         grid:layout_rowWeight="1"
         android:contentDescription="@string/bigscreen_up"
-        app:srcCompat="@drawable/ic_arrow_upward_black_24dp"
+        android:src="@drawable/ic_arrow_upward_black_24dp"
         android:theme="@style/DisableableButton" />
 
     <ImageButton
@@ -33,7 +32,7 @@
         grid:layout_row="0"
         grid:layout_rowWeight="1"
         android:contentDescription="@string/bigscreen_mic"
-        app:srcCompat="@drawable/ic_mic_black"
+        android:src="@drawable/ic_mic_black"
         android:theme="@style/DisableableButton" />
 
     <ImageButton
@@ -43,7 +42,7 @@
         grid:layout_columnWeight="1"
         grid:layout_rowWeight="1"
         android:contentDescription="@string/bigscreen_left"
-        app:srcCompat="@drawable/ic_arrow_back_black_24dp"
+        android:src="@drawable/ic_arrow_back_black_24dp"
         android:theme="@style/DisableableButton" />
 
     <ImageButton
@@ -53,7 +52,7 @@
         grid:layout_columnWeight="1"
         grid:layout_rowWeight="1"
         android:contentDescription="@string/bigscreen_select"
-        app:srcCompat="@drawable/ic_keyboard_return_black_24dp"
+        android:src="@drawable/ic_keyboard_return_black_24dp"
         android:theme="@style/DisableableButton" />
 
     <ImageButton
@@ -63,7 +62,7 @@
         grid:layout_columnWeight="1"
         grid:layout_rowWeight="1"
         android:contentDescription="@string/bigscreen_right"
-        app:srcCompat="@drawable/ic_arrow_forward_black_24dp"
+        android:src="@drawable/ic_arrow_forward_black_24dp"
         android:theme="@style/DisableableButton" />
 
     <ImageButton
@@ -73,6 +72,6 @@
         grid:layout_columnWeight="1"
         grid:layout_rowWeight="1"
         android:contentDescription="@string/bigscreen_down"
-        app:srcCompat="@drawable/ic_arrow_downward_black_24dp"
+        android:src="@drawable/ic_arrow_downward_black_24dp"
         android:theme="@style/DisableableButton"  />
 </androidx.gridlayout.widget.GridLayout>
diff --git a/res/layout/activity_custom_devices.xml b/res/layout/activity_custom_devices.xml
index ba16d8d8..601df33f 100644
--- a/res/layout/activity_custom_devices.xml
+++ b/res/layout/activity_custom_devices.xml
@@ -32,5 +32,5 @@
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/fab_margin"
         app:elevation="@dimen/fab_elevation"
-        app:srcCompat="@drawable/ic_add"/>
+        android:src="@drawable/ic_add"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/res/layout/activity_device.xml b/res/layout/activity_device.xml
index c9491e39..2e6debab 100644
--- a/res/layout/activity_device.xml
+++ b/res/layout/activity_device.xml
@@ -87,7 +87,7 @@
             android:paddingLeft="0dip"
             android:paddingRight="8dip"
             android:paddingStart="0dip"
-            app:srcCompat="@drawable/ic_error_outline_48dp"
+            android:src="@drawable/ic_error_outline_48dp"
             app:tint="?attr/colorHighContrast"
             tools:ignore="UnusedAttribute"/>
 
diff --git a/res/layout/activity_presenter.xml b/res/layout/activity_presenter.xml
index e401577e..eb237fc9 100644
--- a/res/layout/activity_presenter.xml
+++ b/res/layout/activity_presenter.xml
@@ -1,6 +1,5 @@
 <?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"
@@ -33,7 +32,7 @@
             android:layout_weight="0.25"
             android:layout_marginRight="3dp"
             android:layout_marginEnd="3dp"
-            app:srcCompat="@drawable/ic_previous_black"
+            android:src="@drawable/ic_previous_black"
             android:theme="@style/DisableableButton" />
 
         <ImageButton
@@ -44,7 +43,7 @@
             android:layout_marginStart="3dp"
             android:layout_weight="0.25"
             android:contentDescription="@string/mpris_ff"
-            app:srcCompat="@drawable/ic_next_black"
+            android:src="@drawable/ic_next_black"
             android:theme="@style/DisableableButton" />
 
     </LinearLayout>
diff --git a/res/layout/activity_run_command.xml b/res/layout/activity_run_command.xml
index f48d2395..a81ba8c3 100644
--- a/res/layout/activity_run_command.xml
+++ b/res/layout/activity_run_command.xml
@@ -18,7 +18,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="16dp"
-        app:srcCompat="@drawable/ic_action_image_edit_24dp"
+        android:src="@drawable/ic_action_image_edit_24dp"
         app:backgroundTint="@color/primary"
         app:layout_anchor="@id/run_commands_list"
         app:layout_anchorGravity="bottom|end" />
diff --git a/res/layout/list_item_systemvolume.xml b/res/layout/list_item_systemvolume.xml
index 28b0a717..1abb78f7 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"
-            app:srcCompat="@drawable/ic_volume_black"
+            android:src="@drawable/ic_volume_black"
             app:tint="?attr/colorHighContrast" />
 
         <SeekBar
diff --git a/res/layout/list_item_with_icon_entry.xml b/res/layout/list_item_with_icon_entry.xml
index 27a1d5d7..4bc13ebc 100644
--- a/res/layout/list_item_with_icon_entry.xml
+++ b/res/layout/list_item_with_icon_entry.xml
@@ -21,7 +21,7 @@
             android:layout_marginLeft="12dp"
             android:layout_marginStart="12dp"
             android:contentDescription="@string/device_icon_description"
-            app:srcCompat="@drawable/ic_device_laptop_32dp"
+            android:src="@drawable/ic_device_laptop_32dp"
             app:tint="?attr/colorControlNormal"/>
 
         <LinearLayout
diff --git a/res/layout/mpris_control.xml b/res/layout/mpris_control.xml
index 50b8da9d..f098bc38 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"
-        app:srcCompat="@drawable/ic_play_black"
+        android:src="@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"
-            app:srcCompat="@drawable/ic_previous_black"
+            android:src="@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"
-            app:srcCompat="@drawable/ic_rewind_black"
+            android:src="@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"
-            app:srcCompat="@drawable/ic_stop"
+            android:src="@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"
-            app:srcCompat="@drawable/ic_fast_forward_black"
+            android:src="@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"
-            app:srcCompat="@drawable/ic_next_black"
+            android:src="@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"
-            app:srcCompat="@drawable/ic_volume_black"
+            android:src="@drawable/ic_volume_black"
             app:tint="?attr/colorHighContrast" />