diff --git a/res/drawable-hdpi/divider_horizontal_holo_light.9.png b/res/drawable-hdpi/divider_horizontal_holo_light.9.png
deleted file mode 100644
index ea38ebbb..00000000
Binary files a/res/drawable-hdpi/divider_horizontal_holo_light.9.png and /dev/null differ
diff --git a/res/drawable-v21/list_divider.xml b/res/drawable-v21/list_divider.xml
deleted file mode 100644
index cd8cd2b6..00000000
--- a/res/drawable-v21/list_divider.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<inset
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:drawable="?attr/dividerHorizontal"
-    android:insetLeft="16dp"
-    android:insetRight="16dp"/>
\ No newline at end of file
diff --git a/res/drawable/list_divider.xml b/res/drawable/list_divider.xml
index c9a33827..cd8cd2b6 100644
--- a/res/drawable/list_divider.xml
+++ b/res/drawable/list_divider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <inset
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:drawable="@drawable/divider_horizontal_holo_light"
+    android:drawable="?attr/dividerHorizontal"
     android:insetLeft="16dp"
     android:insetRight="16dp"/>
\ No newline at end of file
diff --git a/res/layout-v21/custom_device_item.xml b/res/layout-v21/custom_device_item.xml
deleted file mode 100644
index dd7ecceb..00000000
--- a/res/layout-v21/custom_device_item.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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"
-    android:background="?attr/colorButtonNormal">
-
-
-    <TextView
-        android:id="@+id/deviceNameOrIPBackdrop"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingEnd="?android:attr/listPreferredItemPaddingRight"
-        android:paddingStart="?android:attr/listPreferredItemPaddingLeft"
-        app:drawableEndCompat="@drawable/ic_delete"
-        app:drawableStartCompat="@drawable/ic_delete" />
-
-    <FrameLayout
-        android:id="@+id/swipeableView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?android:colorBackground">
-
-        <TextView
-            android:id="@+id/deviceNameOrIP"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?android:selectableItemBackground"
-            android:gravity="center_vertical"
-            android:minHeight="?android:attr/listPreferredItemHeightSmall"
-            android:paddingEnd="?android:attr/listPreferredItemPaddingRight"
-            android:paddingStart="?android:attr/listPreferredItemPaddingLeft"
-            android:textAppearance="?android:attr/textAppearanceListItemSmall"
-            android:visibility="visible"
-            tools:text="192.168.0.1"/>
-
-    </FrameLayout>
-
-</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/custom_device_item.xml b/res/layout/custom_device_item.xml
index 7bc07f73..dd7ecceb 100644
--- a/res/layout/custom_device_item.xml
+++ b/res/layout/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"
@@ -12,7 +13,9 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         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"
@@ -24,7 +27,7 @@
             android:id="@+id/deviceNameOrIP"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?selectableItemBackground"
+            android:background="?android:selectableItemBackground"
             android:gravity="center_vertical"
             android:minHeight="?android:attr/listPreferredItemHeightSmall"
             android:paddingEnd="?android:attr/listPreferredItemPaddingRight"
diff --git a/res/values-v21/styles.xml b/res/values-v21/styles.xml
deleted file mode 100644
index d8fd8b3e..00000000
--- a/res/values-v21/styles.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="KdeConnectTheme.NoActionBar" parent="KdeConnectThemeBase.NoActionBar">
-        <item name="android:statusBarColor">#65000000</item>
-    </style>
-
-</resources>