diff --git a/app/src/main/res/layout/device_itemv2.xml b/app/src/main/res/layout/device_itemv2.xml
index 04839ae9f..cbde32e0f 100644
--- a/app/src/main/res/layout/device_itemv2.xml
+++ b/app/src/main/res/layout/device_itemv2.xml
@@ -44,69 +44,73 @@
                 </ListView>
             </RelativeLayout>
 
-            <ImageView
-                android:id="@+id/device_image"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_below="@id/device_item_infos_box"
-                android:layout_alignParentStart="true"
-                android:layout_marginTop="2dp"
-                android:background="?android:attr/selectableItemBackground"
-                android:clickable="true"
-                android:contentDescription="@string/candidate_item_device_image"
-                android:tooltipText="@string/candidate_item_device_image"
-                android:focusable="true"
-                android:longClickable="true"
-                card_view:srcCompat="@drawable/ic_device_pebble" />
-
-            <TextView
-                android:id="@+id/device_name"
+            <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_toEndOf="@id/device_image"
-                android:layout_alignParentEnd="true"
-                android:layout_marginEnd="48dp"
+                android:id="@+id/device_name_layout"
                 android:layout_below="@id/device_item_infos_box"
-                android:gravity="center"
-                android:maxLines="1"
-                android:textAppearance="@style/TextAppearance.AppCompat.Large"
-                tools:text="My Pebble Watch" />
+                android:layout_height="wrap_content">
 
-            <TextView
-                android:id="@+id/device_status"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/device_name"
-                android:layout_toEndOf="@id/device_image"
-                android:layout_alignParentEnd="true"
-                android:layout_marginEnd="48dp"
-                android:gravity="center"
-                android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                tools:text="@string/connecting" />
+                <ImageView
+                    android:id="@+id/device_image"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:layout_alignParentStart="true"
+                    android:layout_marginTop="2dp"
+                    android:background="?android:attr/selectableItemBackground"
+                    android:clickable="true"
+                    android:contentDescription="@string/candidate_item_device_image"
+                    android:tooltipText="@string/candidate_item_device_image"
+                    android:focusable="true"
+                    android:longClickable="true"
+                    card_view:srcCompat="@drawable/ic_device_pebble" />
 
-            <ImageView
-                android:id="@+id/device_info_image"
-                android:layout_width="36dp"
-                android:layout_height="36dp"
-                android:layout_alignParentEnd="true"
-                android:layout_below="@id/device_item_infos_box"
-                android:layout_marginBottom="8dp"
-                android:layout_marginStart="8dp"
-                android:layout_marginEnd="0dp"
-                android:layout_marginTop="8dp"
-                android:clickable="true"
-                android:contentDescription="@string/candidate_item_device_image"
-                android:tooltipText="@string/candidate_item_device_image"
-                android:background="?android:attr/selectableItemBackground"
-                card_view:srcCompat="@drawable/ic_more_vert"
-                android:focusable="true"
-                card_view:tint="@color/secondarytext" />
+                <TextView
+                    android:id="@+id/device_name"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_toEndOf="@id/device_image"
+                    android:layout_alignParentEnd="true"
+                    android:layout_marginEnd="48dp"
+                    android:gravity="center"
+                    android:maxLines="1"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Large"
+                    tools:text="My Pebble Watch" />
+
+                <TextView
+                    android:id="@+id/device_status"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/device_name"
+                    android:layout_toEndOf="@id/device_image"
+                    android:layout_alignParentEnd="true"
+                    android:layout_marginEnd="48dp"
+                    android:gravity="center"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
+                    tools:text="@string/connecting" />
+
+                <ImageView
+                    android:id="@+id/device_info_image"
+                    android:layout_width="36dp"
+                    android:layout_height="36dp"
+                    android:layout_alignParentEnd="true"
+                    android:layout_marginBottom="8dp"
+                    android:layout_marginStart="8dp"
+                    android:layout_marginEnd="0dp"
+                    android:layout_marginTop="8dp"
+                    android:clickable="true"
+                    android:contentDescription="@string/candidate_item_device_image"
+                    android:tooltipText="@string/candidate_item_device_image"
+                    android:background="?android:attr/selectableItemBackground"
+                    card_view:srcCompat="@drawable/ic_more_vert"
+                    android:focusable="true"
+                    card_view:tint="@color/secondarytext" />
+            </RelativeLayout>
 
             <com.google.android.flexbox.FlexboxLayout
                 android:id="@+id/device_info_icons"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_below="@id/device_image"
+                android:layout_below="@id/device_name_layout"
                 card_view:flexWrap="wrap">
 
                 <LinearLayout