diff --git a/app/src/main/res/drawable-hdpi/ic_device_default_disabled.png b/app/src/main/res/drawable-hdpi/ic_device_default_disabled.png
new file mode 100644
index 000000000..694e9cd94
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_device_default_disabled.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_device_miband_disabled.png b/app/src/main/res/drawable-hdpi/ic_device_miband_disabled.png
new file mode 100644
index 000000000..43cabe9b4
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_device_miband_disabled.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_device_default_disabled.png b/app/src/main/res/drawable-mdpi/ic_device_default_disabled.png
new file mode 100644
index 000000000..113ad06c6
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_device_default_disabled.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_device_miband_disabled.png b/app/src/main/res/drawable-mdpi/ic_device_miband_disabled.png
new file mode 100644
index 000000000..c1d9e92ab
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_device_miband_disabled.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_device_default_disabled.png b/app/src/main/res/drawable-xhdpi/ic_device_default_disabled.png
new file mode 100644
index 000000000..208c6abe8
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_device_default_disabled.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_device_miband_disabled.png b/app/src/main/res/drawable-xhdpi/ic_device_miband_disabled.png
new file mode 100644
index 000000000..e86b4071e
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_device_miband_disabled.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_device_default_disabled.png b/app/src/main/res/drawable-xxhdpi/ic_device_default_disabled.png
new file mode 100644
index 000000000..b4349b1ba
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_device_default_disabled.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_device_miband_disabled.png b/app/src/main/res/drawable-xxhdpi/ic_device_miband_disabled.png
new file mode 100644
index 000000000..db5603a27
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_device_miband_disabled.png differ
diff --git a/app/src/main/res/layout/device_item.xml b/app/src/main/res/layout/device_item.xml
index 34c14667c..edcf7fa3f 100644
--- a/app/src/main/res/layout/device_item.xml
+++ b/app/src/main/res/layout/device_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<GridLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:attr/activatedBackgroundIndicator"
@@ -11,83 +11,89 @@
         android:id="@+id/device_image"
         android:layout_width="48dp"
         android:layout_height="48dp"
-        android:contentDescription="@string/candidate_item_device_image" />
+        android:contentDescription="@string/candidate_item_device_image"
+        tools:src="@drawable/ic_device_pebble" />
 
     <GridLayout
-        android:background="?android:attr/activatedBackgroundIndicator"
-        android:paddingBottom="2dp"
-        android:columnCount="5"
         android:layout_gravity="fill_horizontal"
+        android:background="?android:attr/activatedBackgroundIndicator"
+        android:columnCount="5"
+        android:paddingBottom="2dp"
         android:paddingTop="3dp">
 
-    <TextView
-        android:id="@+id/device_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:singleLine="true"
-        android:typeface="sans" />
+        <TextView
+            android:id="@+id/device_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:typeface="sans"
+            tools:text="My Pebble Watch" />
 
-    <ProgressBar
-        android:id="@+id/device_busy_indicator"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        android:layout_rowSpan="2"
-        android:indeterminate="true" />
+        <ProgressBar
+            android:id="@+id/device_busy_indicator"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_rowSpan="2"
+            android:indeterminate="true"
+            android:visibility="gone"
+            tools:visibility="visible" />
 
-    <android.support.v4.widget.Space
-        android:layout_width="wrap_content"
-        android:layout_rowSpan="2" />
+        <android.support.v4.widget.Space
+            android:layout_width="wrap_content"
+            android:layout_rowSpan="2" />
 
-    <TextView
-        android:id="@+id/battery_label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="@color/secondarytext"
-        android:textStyle="bold"
-        android:paddingLeft="7sp"
-        android:paddingRight="7sp" />
+        <TextView
+            android:id="@+id/battery_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingLeft="7sp"
+            android:paddingRight="7sp"
+            android:textColor="@color/secondarytext"
+            android:textStyle="bold"
+            tools:text="BAT" />
 
-    <ImageView
-        android:src="@drawable/ic_information_outline_grey600_24dp"
-        android:id="@+id/device_info_image"
-        android:layout_width="32dp"
-        android:layout_height="32dp"
-        android:layout_rowSpan="2"
-        android:scaleType="centerInside"
-        android:contentDescription="@string/candidate_item_device_image"
-        android:clickable="true"
-        android:layout_gravity="center_vertical|right" />
+        <ImageView
+            android:id="@+id/device_info_image"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:layout_gravity="center_vertical|right"
+            android:layout_rowSpan="2"
+            android:clickable="true"
+            android:contentDescription="@string/candidate_item_device_image"
+            android:scaleType="centerInside"
+            android:src="@drawable/ic_information_outline_grey600_24dp" />
 
 
-    <TextView
-        android:id="@+id/device_status"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:gravity="start|bottom"
-        android:textStyle="bold"
-        android:layout_gravity="fill_horizontal" />
+        <TextView
+            android:id="@+id/device_status"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="fill_horizontal"
+            android:gravity="start|bottom"
+            android:textStyle="bold"
+            tools:text="@string/connecting" />
 
-    <TextView
-        android:id="@+id/battery_status"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="start|bottom"
-        android:textColor="@color/secondarytext"
-        android:textStyle="bold"
-        android:layout_gravity="end"
-        android:paddingRight="7sp"
-        android:paddingLeft="7sp" />
+        <TextView
+            android:id="@+id/battery_status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end"
+            android:gravity="start|bottom"
+            android:paddingLeft="7sp"
+            android:paddingRight="7sp"
+            android:textColor="@color/secondarytext"
+            android:textStyle="bold"
+            tools:text="100% CHG" />
     </GridLayout>
 
     <ListView
         android:id="@+id/device_item_infos"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_columnSpan="2"
+        android:layout_gravity="fill"
         android:layout_marginStart="@dimen/widget_margin"
         android:gravity="fill_horizontal"
-        android:layout_columnSpan="2"
-        android:visibility="gone"
-        android:layout_gravity="fill"
-        android:paddingLeft="36dp" />
+        android:paddingLeft="36dp"
+        android:visibility="gone" />
 </GridLayout>