diff --git a/src/main/res/layout/item_device_list.xml b/src/main/res/layout/item_device_list.xml
index 4a5d41d9..93f5ac1f 100644
--- a/src/main/res/layout/item_device_list.xml
+++ b/src/main/res/layout/item_device_list.xml
@@ -1,63 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="4dip">
+    android:paddingBottom="8dp"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
+    android:paddingTop="8dp">
 
     <TextView
         android:id="@+id/name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:layout_toLeftOf="@+id/status"
         android:layout_toStartOf="@+id/status"
+        android:ellipsize="end"
         android:lines="1"
-        android:ellipsize="end" />
+        android:textAppearance="?textAppearanceListItemPrimary" />
 
     <TextView
         android:id="@+id/status"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
-        android:layout_alignBottom="@+id/name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
+        android:layout_alignBottom="@+id/name"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:textAppearance="?textAppearanceListItemSmall" />
 
     <TextView
         android:id="@+id/download_title"
-        android:text="@string/download_title_colon"
-        android:layout_below="@id/name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceSmall" />
+        android:layout_below="@id/name"
+        android:text="@string/download_title_colon"
+        android:textAppearance="?textAppearanceListItemSecondary" />
 
     <TextView
         android:id="@+id/download"
-        android:layout_alignBaseline="@id/download_title"
-        android:layout_toRightOf="@id/download_title"
-        android:layout_toEndOf="@id/download_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceSmall" />
+        android:layout_alignBaseline="@id/download_title"
+        android:layout_toEndOf="@id/download_title"
+        android:layout_toRightOf="@id/download_title"
+        android:textAppearance="?textAppearanceListItemSecondary" />
 
     <TextView
         android:id="@+id/upload_title"
-        android:text="@string/upload_title_colon"
-        android:layout_below="@id/download_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceSmall" />
+        android:layout_below="@id/download_title"
+        android:text="@string/upload_title_colon"
+        android:textAppearance="?textAppearanceListItemSecondary" />
 
     <TextView
         android:id="@+id/upload"
-        android:layout_alignBaseline="@id/upload_title"
-        android:layout_toRightOf="@id/upload_title"
-        android:layout_toEndOf="@id/upload_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceSmall" />
+        android:layout_alignBaseline="@id/upload_title"
+        android:layout_toEndOf="@id/upload_title"
+        android:layout_toRightOf="@id/upload_title"
+        android:textAppearance="?textAppearanceListItemSecondary" />
 
 </RelativeLayout>