diff --git a/res/drawable/ic_arrow_black.xml b/res/drawable/ic_arrow_black.xml
index b9b41c17..aabf8c6f 100644
--- a/res/drawable/ic_arrow_black.xml
+++ b/res/drawable/ic_arrow_black.xml
@@ -1,4 +1,4 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:viewportWidth="32"
     android:viewportHeight="32"
     android:width="32dp"
diff --git a/src/org/kde/kdeconnect/Plugins/ClibpoardPlugin/ClipboardTileService.kt b/src/org/kde/kdeconnect/Plugins/ClibpoardPlugin/ClipboardTileService.kt
index 128f1fd6..030c9d64 100644
--- a/src/org/kde/kdeconnect/Plugins/ClibpoardPlugin/ClipboardTileService.kt
+++ b/src/org/kde/kdeconnect/Plugins/ClibpoardPlugin/ClipboardTileService.kt
@@ -11,7 +11,6 @@ import android.os.Build
 import android.service.quicksettings.TileService
 import androidx.annotation.RequiresApi
 import org.kde.kdeconnect.BackgroundService
-import org.kde.kdeconnect.Device
 
 @RequiresApi(Build.VERSION_CODES.N)
 class ClipboardTileService : TileService() {
diff --git a/src/org/kde/kdeconnect/async/BackgroundJob.java b/src/org/kde/kdeconnect/async/BackgroundJob.java
index e1c78f82..414546e2 100644
--- a/src/org/kde/kdeconnect/async/BackgroundJob.java
+++ b/src/org/kde/kdeconnect/async/BackgroundJob.java
@@ -6,10 +6,10 @@
 
 package org.kde.kdeconnect.async;
 
-import java.util.concurrent.atomic.AtomicLong;
-
 import androidx.annotation.NonNull;
 
+import java.util.concurrent.atomic.AtomicLong;
+
 public abstract class BackgroundJob<I, R> implements Runnable {
     private static AtomicLong atomicLong = new AtomicLong(0);
     protected volatile boolean canceled;
diff --git a/src/org/kde/kdeconnect/async/BackgroundJobHandler.java b/src/org/kde/kdeconnect/async/BackgroundJobHandler.java
index 8796e7b3..0dcb805e 100644
--- a/src/org/kde/kdeconnect/async/BackgroundJobHandler.java
+++ b/src/org/kde/kdeconnect/async/BackgroundJobHandler.java
@@ -10,6 +10,8 @@ import android.os.Handler;
 import android.os.Looper;
 import android.util.Log;
 
+import androidx.annotation.Nullable;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.BlockingQueue;
@@ -21,8 +23,6 @@ import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
-import androidx.annotation.Nullable;
-
 /**
  * Scheduler for {@link BackgroundJob} objects.
  * <p>