diff --git a/res/layout-land/mpris_now_playing.xml b/res/layout-land/mpris_now_playing.xml
index b55be4df..6d14a37c 100644
--- a/res/layout-land/mpris_now_playing.xml
+++ b/res/layout-land/mpris_now_playing.xml
@@ -10,7 +10,6 @@
         android:id="@+id/album_art"
         android:layout_width="0dp"
         android:layout_height="match_parent"
-        android:layout_marginRight="25dp"
         android:layout_marginEnd="25dp"
         android:layout_weight="1"
         android:contentDescription="@string/mpris_coverart_description"
diff --git a/res/layout-v21/custom_device_item.xml b/res/layout-v21/custom_device_item.xml
index f5ef9dc1..dd7ecceb 100644
--- a/res/layout-v21/custom_device_item.xml
+++ b/res/layout-v21/custom_device_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
     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:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -11,10 +12,10 @@
         android:id="@+id/deviceNameOrIPBackdrop"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:drawableEnd="@drawable/ic_delete"
-        android:drawableStart="@drawable/ic_delete"
         android:paddingEnd="?android:attr/listPreferredItemPaddingRight"
-        android:paddingStart="?android:attr/listPreferredItemPaddingLeft"/>
+        android:paddingStart="?android:attr/listPreferredItemPaddingLeft"
+        app:drawableEndCompat="@drawable/ic_delete"
+        app:drawableStartCompat="@drawable/ic_delete" />
 
     <FrameLayout
         android:id="@+id/swipeableView"
diff --git a/res/layout/about_person_list_item_entry.xml b/res/layout/about_person_list_item_entry.xml
index b1242688..9a80d468 100644
--- a/res/layout/about_person_list_item_entry.xml
+++ b/res/layout/about_person_list_item_entry.xml
@@ -10,10 +10,8 @@
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:orientation="horizontal"
     android:paddingStart="4dp"
-    android:paddingLeft="4dp"
     android:gravity="center_vertical"
-    android:paddingEnd="?android:attr/scrollbarSize"
-    android:paddingRight="?android:attr/scrollbarSize">
+    android:paddingEnd="?android:attr/scrollbarSize">
 
     <LinearLayout
         android:layout_width="0dp"
@@ -48,7 +46,6 @@
         android:layout_width="36dp"
         android:layout_height="36dp"
         android:layout_marginEnd="@dimen/default_gap"
-        android:layout_marginRight="@dimen/default_gap"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/visit_contributors_homepage"
         android:src="@drawable/ic_baseline_web_24"
diff --git a/res/layout/activity_find_my_phone.xml b/res/layout/activity_find_my_phone.xml
index 3b9c7734..1a764065 100644
--- a/res/layout/activity_find_my_phone.xml
+++ b/res/layout/activity_find_my_phone.xml
@@ -24,7 +24,6 @@
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
             android:layout_alignParentBottom="true"
-            android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
             android:text="@string/findmyphone_found"
             android:textSize="50sp" />
diff --git a/res/layout/activity_presenter.xml b/res/layout/activity_presenter.xml
index 7988132b..d0df824e 100644
--- a/res/layout/activity_presenter.xml
+++ b/res/layout/activity_presenter.xml
@@ -41,7 +41,6 @@
                 android:layout_height="fill_parent"
                 android:contentDescription="@string/mpris_rew"
                 android:layout_weight="0.25"
-                android:layout_marginRight="3dp"
                 android:layout_marginEnd="3dp"
                 android:src="@drawable/ic_previous_black"
                 android:theme="@style/DisableableButton" />
@@ -50,7 +49,6 @@
                 android:id="@+id/next_button"
                 android:layout_width="match_parent"
                 android:layout_height="fill_parent"
-                android:layout_marginLeft="3dp"
                 android:layout_marginStart="3dp"
                 android:layout_weight="0.25"
                 android:contentDescription="@string/mpris_ff"
diff --git a/res/layout/custom_device_item.xml b/res/layout/custom_device_item.xml
index bc1dfee5..7bc07f73 100644
--- a/res/layout/custom_device_item.xml
+++ b/res/layout/custom_device_item.xml
@@ -12,8 +12,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:paddingEnd="?android:attr/listPreferredItemPaddingRight"
-        android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
-        android:paddingRight="?android:attr/listPreferredItemPaddingRight"
         android:paddingStart="?android:attr/listPreferredItemPaddingLeft"/>
 
     <FrameLayout
@@ -30,8 +28,6 @@
             android:gravity="center_vertical"
             android:minHeight="?android:attr/listPreferredItemHeightSmall"
             android:paddingEnd="?android:attr/listPreferredItemPaddingRight"
-            android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
-            android:paddingRight="?android:attr/listPreferredItemPaddingRight"
             android:paddingStart="?android:attr/listPreferredItemPaddingLeft"
             android:textAppearance="?android:attr/textAppearanceListItemSmall"
             android:visibility="visible"
diff --git a/res/layout/fragment_about.xml b/res/layout/fragment_about.xml
index dc2dec85..8fcfe629 100644
--- a/res/layout/fragment_about.xml
+++ b/res/layout/fragment_about.xml
@@ -182,7 +182,6 @@
                     android:textSize="14sp"
                     android:layout_marginTop="8dp"
                     android:paddingStart="4dp"
-                    android:paddingLeft="4dp"
                     tools:text="Everyone else who has contributed to KDE Connect over the years"
                     tools:ignore="RtlSymmetry" />
             </LinearLayout>
diff --git a/res/layout/list_item_entry.xml b/res/layout/list_item_entry.xml
index 9c44230c..7a5c8474 100644
--- a/res/layout/list_item_entry.xml
+++ b/res/layout/list_item_entry.xml
@@ -9,8 +9,6 @@
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:orientation="vertical"
     android:paddingEnd="?android:attr/scrollbarSize"
-    android:paddingLeft="12dip"
-    android:paddingRight="?android:attr/scrollbarSize"
     android:paddingStart="12dip"
     android:id="@+id/list_item_entry">
 
diff --git a/res/layout/list_item_systemvolume.xml b/res/layout/list_item_systemvolume.xml
index 6c3a295e..a77ecc8c 100644
--- a/res/layout/list_item_systemvolume.xml
+++ b/res/layout/list_item_systemvolume.xml
@@ -24,7 +24,7 @@
             android:layout_gravity="start"
             android:ellipsize="end"
             android:maxLines="1"
-            android:paddingLeft="14dp"
+            android:paddingStart="14dp"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             tools:text="Device name" />
 
diff --git a/res/layout/list_item_with_icon_entry.xml b/res/layout/list_item_with_icon_entry.xml
index 5eaef42c..bdf91ea6 100644
--- a/res/layout/list_item_with_icon_entry.xml
+++ b/res/layout/list_item_with_icon_entry.xml
@@ -19,7 +19,6 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_gravity="center_vertical"
-            android:layout_marginLeft="12dp"
             android:layout_marginStart="12dp"
             android:contentDescription="@string/device_icon_description"
             android:src="@drawable/ic_device_laptop_32dp"
@@ -35,7 +34,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:layout_marginLeft="8dip"
                 android:layout_marginStart="8dip"
                 android:ellipsize="marquee"
                 android:fadingEdge="horizontal"
@@ -49,7 +47,6 @@
                 android:id="@+id/list_item_entry_summary"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="8dip"
                 android:layout_marginStart="8dip"
                 android:singleLine="true"
                 android:text=""
diff --git a/res/layout/mpris_control.xml b/res/layout/mpris_control.xml
index 36d148ca..a92c20de 100644
--- a/res/layout/mpris_control.xml
+++ b/res/layout/mpris_control.xml
@@ -189,7 +189,6 @@
             android:layout_width="30dip"
             android:layout_height="30dip"
             android:layout_marginEnd="10dip"
-            android:layout_marginRight="10dip"
             android:layout_weight="0"
             android:contentDescription="@string/mpris_volume"
             android:maxWidth="30dip"
diff --git a/res/layout/preference_with_button.xml b/res/layout/preference_with_button.xml
index 3e4f4e14..3d6a1de7 100644
--- a/res/layout/preference_with_button.xml
+++ b/res/layout/preference_with_button.xml
@@ -46,7 +46,6 @@
             android:id="@android:id/summary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignLeft="@android:id/title"
             android:layout_alignStart="@android:id/title"
             android:layout_below="@android:id/title"
             android:maxLines="3"
diff --git a/res/layout/view_pair_error.xml b/res/layout/view_pair_error.xml
index ae8f603f..cd764a39 100644
--- a/res/layout/view_pair_error.xml
+++ b/res/layout/view_pair_error.xml
@@ -18,8 +18,6 @@
         android:layout_height="wrap_content"
         android:importantForAccessibility="no"
         android:paddingEnd="8dip"
-        android:paddingLeft="0dip"
-        android:paddingRight="8dip"
         android:paddingStart="0dip"
         android:src="@drawable/ic_error_outline_48dp"
         app:tint="?attr/colorHighContrast"
diff --git a/res/layout/view_pair_request.xml b/res/layout/view_pair_request.xml
index 46b1bf31..a2289c73 100644
--- a/res/layout/view_pair_request.xml
+++ b/res/layout/view_pair_request.xml
@@ -1,6 +1,7 @@
 <?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"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/pairing_buttons"
     android:layout_width="match_parent"
@@ -30,12 +31,11 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:drawablePadding="5dp"
-        android:drawableLeft="@drawable/ic_key"
-        android:drawableStart="@drawable/ic_key"
         android:layout_marginBottom="8dip"
         android:visibility="gone"
         android:text=""
-        android:textAppearance="?android:attr/textAppearanceMedium" />
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        app:drawableStartCompat="@drawable/ic_key" />
 
     <Button
         android:id="@+id/pair_button"
diff --git a/res/layout/widget_remotecommandplugin.xml b/res/layout/widget_remotecommandplugin.xml
index 48c04367..07574982 100644
--- a/res/layout/widget_remotecommandplugin.xml
+++ b/res/layout/widget_remotecommandplugin.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:orientation="vertical" android:layout_width="match_parent"
     android:background="@color/on_secondary"
     android:theme="@style/KdeConnectTheme"
@@ -7,7 +8,7 @@
     <LinearLayout
         android:id="@+id/runcommandWidgetTitleHeader"
         android:background="@color/primary"
-        android:gravity="center_vertical|left"
+        android:gravity="center_vertical|start"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
@@ -42,12 +43,10 @@
         android:id="@+id/not_reachable_message"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:drawableStart="@drawable/ic_error_outline_48dp"
-        android:drawableLeft="@drawable/ic_error_outline_48dp"
         android:drawablePadding="8dip"
         android:gravity="center_vertical"
         android:paddingStart="8dip"
-        android:paddingLeft="8dip"
         android:text="@string/unreachable_description"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        app:drawableStartCompat="@drawable/ic_error_outline_48dp"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/src/org/kde/kdeconnect/Plugins/MouseReceiverPlugin/MouseReceiverService.java b/src/org/kde/kdeconnect/Plugins/MouseReceiverPlugin/MouseReceiverService.java
index c3c538f6..c5a83ded 100644
--- a/src/org/kde/kdeconnect/Plugins/MouseReceiverPlugin/MouseReceiverService.java
+++ b/src/org/kde/kdeconnect/Plugins/MouseReceiverPlugin/MouseReceiverService.java
@@ -72,7 +72,7 @@ public class MouseReceiverService extends AccessibilityService {
             cursorLayout.layoutInDisplayCutoutMode = LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
         }
 
-        cursorLayout.gravity = Gravity.LEFT | Gravity.TOP;
+        cursorLayout.gravity = Gravity.START | Gravity.TOP;
         cursorLayout.x = displayMetrics.widthPixels / 2;
         cursorLayout.y = displayMetrics.heightPixels / 2;