diff --git a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/injection/ViewComponent.kt b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/injection/ViewComponent.kt
index 93e7acd80..f43e67b88 100644
--- a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/injection/ViewComponent.kt
+++ b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/injection/ViewComponent.kt
@@ -16,8 +16,8 @@ import io.casey.musikcube.remote.ui.playqueue.fragment.PlayQueueFragment
 import io.casey.musikcube.remote.ui.settings.activity.*
 import io.casey.musikcube.remote.ui.shared.activity.BaseActivity
 import io.casey.musikcube.remote.ui.shared.fragment.BaseFragment
-import io.casey.musikcube.remote.ui.shared.mixin.MetadataProxyMixin
 import io.casey.musikcube.remote.ui.shared.mixin.ItemContextMenuMixin
+import io.casey.musikcube.remote.ui.shared.mixin.MetadataProxyMixin
 import io.casey.musikcube.remote.ui.shared.view.EmptyListView
 import io.casey.musikcube.remote.ui.tracks.activity.TrackListActivity
 import io.casey.musikcube.remote.ui.tracks.fragment.TrackListFragment
diff --git a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/service/gapless/db/GaplessDao.java b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/service/gapless/db/GaplessDao.java
index fe7eea862..fe5419f48 100644
--- a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/service/gapless/db/GaplessDao.java
+++ b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/service/gapless/db/GaplessDao.java
@@ -1,12 +1,12 @@
 package io.casey.musikcube.remote.service.gapless.db;
 
-import java.util.List;
-
 import androidx.room.Dao;
 import androidx.room.Insert;
 import androidx.room.OnConflictStrategy;
 import androidx.room.Query;
 
+import java.util.List;
+
 @Dao
 public interface GaplessDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
diff --git a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/service/playback/impl/streaming/db/OfflineTrackDao.java b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/service/playback/impl/streaming/db/OfflineTrackDao.java
index 79a2d9672..151d52de3 100644
--- a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/service/playback/impl/streaming/db/OfflineTrackDao.java
+++ b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/service/playback/impl/streaming/db/OfflineTrackDao.java
@@ -1,12 +1,12 @@
 package io.casey.musikcube.remote.service.playback.impl.streaming.db;
 
-import java.util.List;
-
 import androidx.room.Dao;
 import androidx.room.Insert;
 import androidx.room.OnConflictStrategy;
 import androidx.room.Query;
 
+import java.util.List;
+
 @Dao
 public interface OfflineTrackDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
diff --git a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/albums/fragment/AlbumBrowseFragment.kt b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/albums/fragment/AlbumBrowseFragment.kt
index ae18d9013..ed3a8be3f 100644
--- a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/albums/fragment/AlbumBrowseFragment.kt
+++ b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/albums/fragment/AlbumBrowseFragment.kt
@@ -22,8 +22,8 @@ import io.casey.musikcube.remote.ui.shared.extension.getLayoutId
 import io.casey.musikcube.remote.ui.shared.extension.getTitleOverride
 import io.casey.musikcube.remote.ui.shared.extension.setupDefaultRecyclerView
 import io.casey.musikcube.remote.ui.shared.fragment.BaseFragment
-import io.casey.musikcube.remote.ui.shared.mixin.MetadataProxyMixin
 import io.casey.musikcube.remote.ui.shared.mixin.ItemContextMenuMixin
+import io.casey.musikcube.remote.ui.shared.mixin.MetadataProxyMixin
 import io.casey.musikcube.remote.ui.shared.mixin.PlaybackMixin
 import io.casey.musikcube.remote.ui.shared.view.EmptyListView
 import io.casey.musikcube.remote.util.Debouncer
diff --git a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/category/activity/CategoryBrowseActivity.kt b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/category/activity/CategoryBrowseActivity.kt
index ad67879d1..83ae2055e 100644
--- a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/category/activity/CategoryBrowseActivity.kt
+++ b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/category/activity/CategoryBrowseActivity.kt
@@ -9,7 +9,6 @@ import io.casey.musikcube.remote.ui.category.constant.NavigationType
 import io.casey.musikcube.remote.ui.category.fragment.CategoryBrowseFragment
 import io.casey.musikcube.remote.ui.shared.activity.FragmentActivityWithTransport
 import io.casey.musikcube.remote.ui.shared.fragment.BaseFragment
-import io.casey.musikcube.remote.service.websocket.WebSocketService.State as SocketState
 
 class CategoryBrowseActivity: FragmentActivityWithTransport() {
     private val category
diff --git a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/category/fragment/CategoryBrowseFragment.kt b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/category/fragment/CategoryBrowseFragment.kt
index 874bafebd..bffe3a8af 100644
--- a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/category/fragment/CategoryBrowseFragment.kt
+++ b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/category/fragment/CategoryBrowseFragment.kt
@@ -28,8 +28,8 @@ import io.casey.musikcube.remote.ui.shared.extension.getLayoutId
 import io.casey.musikcube.remote.ui.shared.extension.getTitleOverride
 import io.casey.musikcube.remote.ui.shared.extension.setupDefaultRecyclerView
 import io.casey.musikcube.remote.ui.shared.fragment.BaseFragment
-import io.casey.musikcube.remote.ui.shared.mixin.MetadataProxyMixin
 import io.casey.musikcube.remote.ui.shared.mixin.ItemContextMenuMixin
+import io.casey.musikcube.remote.ui.shared.mixin.MetadataProxyMixin
 import io.casey.musikcube.remote.ui.shared.mixin.PlaybackMixin
 import io.casey.musikcube.remote.ui.shared.view.EmptyListView
 import io.casey.musikcube.remote.util.Debouncer
diff --git a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/download/activity/TrackDownloadActivity.kt b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/download/activity/TrackDownloadActivity.kt
index d619a128a..61d305541 100644
--- a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/download/activity/TrackDownloadActivity.kt
+++ b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/download/activity/TrackDownloadActivity.kt
@@ -9,7 +9,6 @@ import android.net.Uri
 import android.os.Bundle
 import android.os.Environment
 import android.os.Handler
-import android.util.Log
 import android.view.View
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
diff --git a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/playqueue/fragment/PlayQueueFragment.kt b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/playqueue/fragment/PlayQueueFragment.kt
index 2b4c15849..a4efa5a5a 100644
--- a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/playqueue/fragment/PlayQueueFragment.kt
+++ b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/playqueue/fragment/PlayQueueFragment.kt
@@ -14,8 +14,8 @@ import io.casey.musikcube.remote.ui.shared.activity.ITitleProvider
 import io.casey.musikcube.remote.ui.shared.extension.getLayoutId
 import io.casey.musikcube.remote.ui.shared.extension.setupDefaultRecyclerView
 import io.casey.musikcube.remote.ui.shared.fragment.BaseFragment
-import io.casey.musikcube.remote.ui.shared.mixin.MetadataProxyMixin
 import io.casey.musikcube.remote.ui.shared.mixin.ItemContextMenuMixin
+import io.casey.musikcube.remote.ui.shared.mixin.MetadataProxyMixin
 import io.casey.musikcube.remote.ui.shared.mixin.PlaybackMixin
 import io.casey.musikcube.remote.ui.shared.model.DefaultSlidingWindow
 import io.casey.musikcube.remote.ui.shared.model.ITrackListSlidingWindow
diff --git a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/settings/model/ConnectionsDao.java b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/settings/model/ConnectionsDao.java
index c4bb976f5..697186f80 100644
--- a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/settings/model/ConnectionsDao.java
+++ b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/settings/model/ConnectionsDao.java
@@ -1,12 +1,12 @@
 package io.casey.musikcube.remote.ui.settings.model;
 
-import java.util.List;
-
 import androidx.room.Dao;
 import androidx.room.Insert;
 import androidx.room.OnConflictStrategy;
 import androidx.room.Query;
 
+import java.util.List;
+
 @Dao
 public interface ConnectionsDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
diff --git a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/shared/extension/Extensions.kt b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/shared/extension/Extensions.kt
index b31c1a11c..583d524ef 100644
--- a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/shared/extension/Extensions.kt
+++ b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/shared/extension/Extensions.kt
@@ -1,6 +1,5 @@
 package io.casey.musikcube.remote.ui.shared.extension
 
-import android.app.Dialog
 import android.app.SearchManager
 import android.content.Context
 import android.content.Intent
@@ -11,7 +10,6 @@ import android.os.Handler
 import android.text.TextUtils
 import android.util.Base64
 import android.util.Log
-import android.util.TypedValue
 import android.view.Menu
 import android.view.View
 import android.view.inputmethod.InputMethodManager
diff --git a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/tracks/fragment/TrackListFragment.kt b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/tracks/fragment/TrackListFragment.kt
index 908ba1245..45f1584a7 100644
--- a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/tracks/fragment/TrackListFragment.kt
+++ b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/tracks/fragment/TrackListFragment.kt
@@ -18,8 +18,8 @@ import io.casey.musikcube.remote.ui.shared.activity.ITransportObserver
 import io.casey.musikcube.remote.ui.shared.constant.Shared
 import io.casey.musikcube.remote.ui.shared.extension.*
 import io.casey.musikcube.remote.ui.shared.fragment.BaseFragment
-import io.casey.musikcube.remote.ui.shared.mixin.MetadataProxyMixin
 import io.casey.musikcube.remote.ui.shared.mixin.ItemContextMenuMixin
+import io.casey.musikcube.remote.ui.shared.mixin.MetadataProxyMixin
 import io.casey.musikcube.remote.ui.shared.mixin.PlaybackMixin
 import io.casey.musikcube.remote.ui.shared.model.DefaultSlidingWindow
 import io.casey.musikcube.remote.ui.shared.model.ITrackListSlidingWindow
diff --git a/src/musikdroid/app/src/main/res/layout/main_activity.xml b/src/musikdroid/app/src/main/res/layout/main_activity.xml
index afc9f88a3..4d0ddd905 100644
--- a/src/musikdroid/app/src/main/res/layout/main_activity.xml
+++ b/src/musikdroid/app/src/main/res/layout/main_activity.xml
@@ -27,7 +27,7 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <androidx.legacy.widget.Space
+            <View
                 android:layout_width="0dp"
                 android:layout_height="2dp" />
 
@@ -41,7 +41,7 @@
                 android:text="@string/button_play_queue"
                 android:transitionName="play_queue_transition"/>
 
-            <androidx.legacy.widget.Space
+            <View
                 android:layout_width="0dp"
                 android:layout_height="2dp" />
 
@@ -60,7 +60,7 @@
                     android:layout_gravity="center"
                     android:text="@string/button_artists"/>
 
-                <androidx.legacy.widget.Space
+                <View
                     android:layout_width="2dp"
                     android:layout_height="0dp" />
 
@@ -73,7 +73,7 @@
                     android:layout_gravity="center"
                     android:text="@string/button_albums"/>
 
-                <androidx.legacy.widget.Space
+                <View
                     android:layout_width="2dp"
                     android:layout_height="0dp" />
 
@@ -86,7 +86,7 @@
                     android:layout_gravity="center"
                     android:text="@string/button_tracks"/>
 
-                <androidx.legacy.widget.Space
+                <View
                     android:layout_width="2dp"
                     android:layout_height="0dp" />
 
@@ -118,7 +118,7 @@
                     android:layout_height="wrap_content"
                     android:text="@string/button_prev"/>
 
-                <androidx.legacy.widget.Space
+                <View
                     android:layout_width="2dp"
                     android:layout_height="0dp" />
 
@@ -130,7 +130,7 @@
                     android:layout_height="wrap_content"
                     android:text="@string/button_play"/>
 
-                <androidx.legacy.widget.Space
+                <View
                     android:layout_width="2dp"
                     android:layout_height="0dp" />
 
@@ -197,7 +197,7 @@
                     android:layout_gravity="center"
                     android:text="@string/button_shuffle"/>
 
-                <androidx.legacy.widget.Space
+                <View
                     android:layout_width="2dp"
                     android:layout_height="0dp" />
 
@@ -209,7 +209,7 @@
                     android:layout_height="wrap_content"
                     android:text="@string/button_mute"/>
 
-                <androidx.legacy.widget.Space
+                <View
                     android:layout_width="2dp"
                     android:layout_height="0dp" />
 
diff --git a/src/musikdroid/app/src/main/res/layout/remote_eq_activity.xml b/src/musikdroid/app/src/main/res/layout/remote_eq_activity.xml
index c306b65ed..19057b04b 100644
--- a/src/musikdroid/app/src/main/res/layout/remote_eq_activity.xml
+++ b/src/musikdroid/app/src/main/res/layout/remote_eq_activity.xml
@@ -44,7 +44,7 @@
                 android:layout_weight="1.0"
                 android:text="@string/button_revert"/>
 
-            <androidx.legacy.widget.Space
+            <View
                 android:layout_width="2dp"
                 android:layout_height="0dp"/>
 
diff --git a/src/musikdroid/app/src/main/res/layout/settings_activity.xml b/src/musikdroid/app/src/main/res/layout/settings_activity.xml
index c4ae0e555..f622eb0ed 100644
--- a/src/musikdroid/app/src/main/res/layout/settings_activity.xml
+++ b/src/musikdroid/app/src/main/res/layout/settings_activity.xml
@@ -100,7 +100,7 @@
             android:visibility="visible"
             android:text="@string/settings_disable_cert_validation"/>
 
-        <androidx.legacy.widget.Space
+        <View
             android:layout_width="0dp"
             android:layout_height="16dp"/>
 
@@ -130,7 +130,7 @@
 
         </LinearLayout>
 
-        <androidx.legacy.widget.Space
+        <View
             android:layout_width="0dp"
             android:layout_height="16dp"/>
 
@@ -147,7 +147,7 @@
             android:layout_height="match_parent"
             android:layout_marginLeft="24dp"/>
 
-        <androidx.legacy.widget.Space
+        <View
             android:layout_width="0dp"
             android:layout_height="16dp"/>
 
@@ -164,7 +164,7 @@
             android:layout_height="match_parent"
             android:layout_marginLeft="24dp"/>
 
-        <androidx.legacy.widget.Space
+        <View
             android:layout_width="0dp"
             android:layout_height="16dp"/>
 
@@ -181,7 +181,7 @@
             android:layout_height="match_parent"
             android:layout_marginLeft="24dp"/>
 
-        <androidx.legacy.widget.Space
+        <View
             android:layout_width="0dp"
             android:layout_height="16dp"/>
 
diff --git a/src/musikdroid/app/src/main/res/layout/transport_fragment.xml b/src/musikdroid/app/src/main/res/layout/transport_fragment.xml
index 2f4dfcc24..ae9143237 100644
--- a/src/musikdroid/app/src/main/res/layout/transport_fragment.xml
+++ b/src/musikdroid/app/src/main/res/layout/transport_fragment.xml
@@ -22,7 +22,7 @@
             android:layout_weight="1.0"
             android:text="@string/button_prev"/>
 
-        <androidx.legacy.widget.Space
+        <View
             android:layout_width="2dp"
             android:layout_height="0dp"/>
 
@@ -34,7 +34,7 @@
             android:layout_weight="1.0"
             android:text="@string/button_play"/>
 
-        <androidx.legacy.widget.Space
+        <View
             android:layout_width="2dp"
             android:layout_height="0dp"/>
 
@@ -48,7 +48,7 @@
 
     </LinearLayout>
 
-    <androidx.legacy.widget.Space
+    <View
         android:layout_width="0dp"
         android:layout_height="2dp"/>