diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java
index 15a7188ff..c92d63348 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java
@@ -190,7 +190,6 @@ public class GBDeviceAdapterv2 extends RecyclerView.Adapter<GBDeviceAdapterv2.Vi
                                                      }
         );
 
-        //Info icon is last in the row
         ItemWithDetailsAdapter infoAdapter = new ItemWithDetailsAdapter(context, device.getDeviceInfos());
         infoAdapter.setHorizontalAlignment(true);
         holder.deviceInfoList.setAdapter(infoAdapter);
@@ -213,7 +212,6 @@ public class GBDeviceAdapterv2 extends RecyclerView.Adapter<GBDeviceAdapterv2.Vi
 
         );
 
-        //find lost device, hidden under details
         holder.findDevice.setVisibility(device.isInitialized() ? View.VISIBLE : View.GONE);
         holder.findDevice.setOnClickListener(new View.OnClickListener()
 
diff --git a/app/src/main/res/layout/device_itemv2.xml b/app/src/main/res/layout/device_itemv2.xml
index 765763883..b2911ac86 100644
--- a/app/src/main/res/layout/device_itemv2.xml
+++ b/app/src/main/res/layout/device_itemv2.xml
@@ -13,134 +13,119 @@
         android:foreground="?android:attr/selectableItemBackground"
         card_view:cardCornerRadius="4dp"
         card_view:cardElevation="4dp"
-        card_view:contentPadding="16dp">
+        card_view:contentPadding="8dp">
 
-        <RelativeLayout
+        <android.support.constraint.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
-
             <RelativeLayout
                 android:id="@+id/device_item_infos_box"
-                android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentTop="true"
-                android:layout_marginBottom="8dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="8dp"
+                android:layout_marginRight="8dp"
                 android:focusable="false"
-                android:visibility="gone">
+                android:visibility="gone"
+                card_view:layout_constraintLeft_toLeftOf="parent"
+                card_view:layout_constraintRight_toRightOf="parent">
 
                 <ListView
                     android:id="@+id/device_item_infos"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:focusable="false"
-                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
                     android:layout_toStartOf="@+id/device_action_remove"
+                    android:focusable="false"
                     android:scrollbars="none" />
 
-                <ImageView
-                    android:id="@+id/device_action_find"
-                    android:layout_width="36dp"
-                    android:layout_height="36dp"
-                    android:layout_alignParentRight="true"
-                    android:layout_alignParentTop="true"
-                    android:layout_marginBottom="8dp"
-                    android:layout_marginLeft="8dp"
-                    android:layout_marginRight="0dp"
-                    android:layout_marginTop="8dp"
-                    android:clickable="true"
-                    android:tint="?android:textColorTertiary"
-                    android:background="?android:attr/selectableItemBackground"
-                    card_view:srcCompat="@drawable/ic_action_find_lost_device"
-                    android:contentDescription="@string/controlcenter_find_device" />
-
                 <ImageView
                     android:id="@+id/device_action_remove"
                     android:layout_width="36dp"
                     android:layout_height="36dp"
-                    android:layout_alignParentRight="true"
-                    android:layout_below="@id/device_action_find"
-                    android:layout_marginBottom="8dp"
-                    android:layout_marginLeft="8dp"
-                    android:layout_marginRight="0dp"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentTop="true"
                     android:layout_marginTop="8dp"
-                    android:clickable="true"
-                    android:tint="?android:textColorTertiary"
                     android:background="?android:attr/selectableItemBackground"
-                    card_view:srcCompat="@drawable/ic_remove_device"
-                    android:contentDescription="@string/controlcenter_delete_device" />
+                    android:clickable="true"
+                    android:contentDescription="@string/controlcenter_delete_device"
+                    android:tint="?android:textColorTertiary"
+                    card_view:srcCompat="@drawable/ic_remove_device" />
             </RelativeLayout>
 
-
             <ImageView
                 android:id="@+id/device_image"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
-                android:layout_alignParentLeft="true"
-                android:layout_below="@id/device_item_infos_box"
-                android:contentDescription="@string/candidate_item_device_image"
-                android:clickable="true"
-                android:longClickable="true"
+                android:layout_alignParentStart="true"
+                android:layout_marginStart="8dp"
                 android:background="?android:attr/selectableItemBackground"
-                tools:src="@drawable/ic_device_pebble" />
+                android:clickable="true"
+                android:contentDescription="@string/candidate_item_device_image"
+                android:longClickable="true"
+                card_view:layout_constraintLeft_toLeftOf="parent"
+                tools:src="@drawable/ic_device_pebble"
+                android:layout_marginTop="8dp"
+                card_view:layout_constraintTop_toBottomOf="@+id/device_item_infos_box" />
 
             <TextView
                 android:id="@+id/device_name"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_toRightOf="@id/device_image"
-                android:layout_toLeftOf="@id/device_info_image"
-                android:layout_below="@id/device_item_infos_box"
-                android:gravity="center"
+                android:layout_marginEnd="8dp"
+                android:layout_marginLeft="8dp"
+                android:layout_marginRight="8dp"
+                android:layout_marginStart="8dp"
                 android:maxLines="1"
                 android:textAppearance="@style/TextAppearance.AppCompat.Large"
+                card_view:layout_constraintLeft_toRightOf="@+id/device_image"
+                card_view:layout_constraintRight_toLeftOf="@+id/device_info_image"
                 tools:text="My Pebble Watch"
-                android:layout_alignParentEnd="true" />
+                android:layout_marginTop="8dp"
+                card_view:layout_constraintTop_toBottomOf="@+id/device_item_infos_box" />
 
             <TextView
                 android:id="@+id/device_status"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/device_name"
-                android:layout_toRightOf="@id/device_image"
-                android:layout_toLeftOf="@id/device_info_image"
+                android:layout_marginEnd="8dp"
+                android:layout_marginStart="8dp"
                 android:gravity="center"
                 android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
+                card_view:layout_constraintLeft_toRightOf="@+id/device_image"
+                card_view:layout_constraintRight_toLeftOf="@+id/device_info_image"
+                card_view:layout_constraintTop_toBottomOf="@+id/device_name"
                 tools:text="@string/connecting" />
 
             <ImageView
                 android:id="@+id/device_info_image"
                 android:layout_width="36dp"
                 android:layout_height="36dp"
-                android:layout_alignParentRight="true"
-                android:layout_below="@id/device_item_infos_box"
-                android:layout_marginBottom="8dp"
-                android:layout_marginLeft="8dp"
-                android:layout_marginRight="0dp"
-                android:layout_marginTop="8dp"
+                android:layout_marginEnd="8dp"
+                android:background="?android:attr/selectableItemBackground"
                 android:clickable="true"
                 android:contentDescription="@string/candidate_item_device_image"
                 android:tint="@color/secondarytext"
-                android:background="?android:attr/selectableItemBackground"
-                card_view:srcCompat="@drawable/ic_more_vert" />
-
+                card_view:layout_constraintRight_toRightOf="parent"
+                card_view:srcCompat="@drawable/ic_more_vert"
+                android:layout_marginTop="12dp"
+                card_view:layout_constraintTop_toBottomOf="@+id/device_item_infos_box" />
 
             <LinearLayout
                 android:id="@+id/device_battery_status_box"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_below="@id/device_image"
-                android:layout_marginBottom="8dp"
-                android:layout_marginLeft="0dp"
-                android:layout_marginRight="0dp"
+                android:layout_marginStart="8dp"
                 android:layout_marginTop="8dp"
                 android:minWidth="48dp"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                card_view:layout_constraintLeft_toLeftOf="parent"
+                card_view:layout_constraintTop_toBottomOf="@+id/device_image">
 
                 <ImageView
                     android:id="@+id/device_battery_status"
-                    android:layout_width="match_parent"
+                    android:layout_width="48dp"
                     android:layout_height="36dp"
                     android:tint="@color/secondarytext"
                     card_view:srcCompat="@drawable/level_list_battery" />
@@ -161,21 +146,22 @@
                 android:id="@+id/device_action_fetch_activity_box"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_below="@id/device_image"
-                android:layout_margin="8dp"
-                android:layout_toRightOf="@id/device_battery_status_box"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="8dp"
                 android:gravity="center_vertical"
                 android:minWidth="36dp"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                card_view:layout_constraintLeft_toRightOf="@+id/device_battery_status_box"
+                card_view:layout_constraintTop_toBottomOf="@+id/device_image">
 
                 <ImageView
                     android:id="@+id/device_action_fetch_activity"
-                    android:layout_width="36dp"
-                    android:layout_height="36dp"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:background="?android:attr/selectableItemBackground"
                     android:clickable="true"
                     android:contentDescription="@string/controlcenter_fetch_activity_data"
                     android:tint="@color/secondarytext"
-                    android:background="?android:attr/selectableItemBackground"
                     card_view:srcCompat="@drawable/ic_action_fetch_activity_data" />
 
                 <ProgressBar
@@ -191,59 +177,75 @@
 
             <ImageView
                 android:id="@+id/device_action_take_screenshot"
-                android:layout_width="36dp"
-                android:layout_height="36dp"
-                android:layout_below="@id/device_image"
-                android:layout_margin="8dp"
-                android:layout_toRightOf="@id/device_action_fetch_activity_box"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="8dp"
+                android:background="?android:attr/selectableItemBackground"
                 android:clickable="true"
                 android:contentDescription="@string/controlcenter_take_screenshot"
                 android:tint="@color/secondarytext"
-                android:background="?android:attr/selectableItemBackground"
+                card_view:layout_constraintLeft_toRightOf="@+id/device_action_fetch_activity_box"
+                card_view:layout_constraintTop_toBottomOf="@+id/device_image"
                 card_view:srcCompat="@drawable/ic_screenshot" />
 
             <ImageView
                 android:id="@+id/device_action_manage_apps"
-                android:layout_width="36dp"
-                android:layout_height="36dp"
-                android:layout_below="@id/device_image"
-                android:layout_margin="8dp"
-                android:layout_toRightOf="@id/device_action_take_screenshot"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="8dp"
+                android:background="?android:attr/selectableItemBackground"
                 android:clickable="true"
                 android:contentDescription="@string/title_activity_appmanager"
                 android:tint="@color/secondarytext"
-                android:background="?android:attr/selectableItemBackground"
+                card_view:layout_constraintLeft_toRightOf="@+id/device_action_take_screenshot"
+                card_view:layout_constraintTop_toBottomOf="@+id/device_image"
                 card_view:srcCompat="@drawable/ic_action_manage_apps" />
 
             <ImageView
                 android:id="@+id/device_action_set_alarms"
-                android:layout_width="36dp"
-                android:layout_height="36dp"
-                android:layout_below="@id/device_image"
-                android:layout_margin="8dp"
-                android:layout_toRightOf="@id/device_action_manage_apps"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="8dp"
+                android:background="?android:attr/selectableItemBackground"
                 android:clickable="true"
                 android:contentDescription="@string/controlcenter_start_configure_alarms"
                 android:tint="@color/secondarytext"
-                android:background="?android:attr/selectableItemBackground"
+                card_view:layout_constraintLeft_toRightOf="@+id/device_action_manage_apps"
+                card_view:layout_constraintTop_toBottomOf="@+id/device_image"
                 card_view:srcCompat="@drawable/ic_device_set_alarms" />
 
             <ImageView
                 android:id="@+id/device_action_show_activity_graphs"
-                android:layout_width="36dp"
-                android:layout_height="36dp"
-                android:layout_below="@id/device_image"
-                android:layout_margin="8dp"
-                android:layout_toRightOf="@id/device_action_set_alarms"
-                android:clickable="true"
-                android:tint="@color/secondarytext"
-                card_view:srcCompat="@drawable/ic_activity_graphs"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="8dp"
                 android:background="?android:attr/selectableItemBackground"
-                android:contentDescription="@string/controlcenter_start_activitymonitor" />
+                android:clickable="true"
+                android:contentDescription="@string/controlcenter_start_activitymonitor"
+                android:tint="@color/secondarytext"
+                card_view:layout_constraintLeft_toRightOf="@+id/device_action_set_alarms"
+                card_view:layout_constraintTop_toBottomOf="@+id/device_image"
+                card_view:srcCompat="@drawable/ic_activity_graphs" />
 
+            <ImageView
+                android:id="@+id/device_action_find"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="8dp"
+                android:background="?android:attr/selectableItemBackground"
+                android:clickable="true"
+                android:contentDescription="@string/controlcenter_find_device"
+                android:tint="@color/secondarytext"
+                card_view:layout_constraintLeft_toRightOf="@+id/device_action_show_activity_graphs"
+                card_view:layout_constraintTop_toBottomOf="@+id/device_image"
+                card_view:srcCompat="@drawable/ic_action_find_lost_device" />
 
-
-        </RelativeLayout>
+        </android.support.constraint.ConstraintLayout>
 
     </android.support.v7.widget.CardView>