diff --git a/app/src/main/java/org/linphone/chat/DevicesAdapter.java b/app/src/main/java/org/linphone/chat/DevicesAdapter.java
index 5d0bf4570..85f9c5999 100644
--- a/app/src/main/java/org/linphone/chat/DevicesAdapter.java
+++ b/app/src/main/java/org/linphone/chat/DevicesAdapter.java
@@ -67,7 +67,7 @@ class DevicesAdapter extends BaseExpandableListAdapter {
                 }
             } else {
                 LayoutInflater inflater = LayoutInflater.from(mContext);
-                view = inflater.inflate(R.layout.chat_device_cell, viewGroup, false);
+                view = inflater.inflate(R.layout.chat_device_cell_as_group, viewGroup, false);
             }
             if (holder == null) {
                 holder = new DeviceChildViewHolder(view);
diff --git a/app/src/main/res/layout/chat_device_cell.xml b/app/src/main/res/layout/chat_device_cell.xml
index 58ef6fc1d..51fda082f 100644
--- a/app/src/main/res/layout/chat_device_cell.xml
+++ b/app/src/main/res/layout/chat_device_cell.xml
@@ -3,7 +3,7 @@
     android:id="@+id/layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/backgroundColor"
+    android:background="?attr/backgroundColor2"
     android:gravity="center_vertical"
     android:orientation="vertical">
 
diff --git a/app/src/main/res/layout/chat_device_cell_as_group.xml b/app/src/main/res/layout/chat_device_cell_as_group.xml
new file mode 100644
index 000000000..0ab0d153e
--- /dev/null
+++ b/app/src/main/res/layout/chat_device_cell_as_group.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/backgroundColor"
+    android:gravity="center_vertical"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:layout_margin="5dp"
+        android:gravity="center_vertical">
+
+        <TextView
+            android:id="@+id/name"
+            style="@style/contact_name_list_cell_font"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="5dp"
+            android:ellipsize="end"
+            android:lines="1"
+            android:maxLines="1" />
+
+        <ImageView
+            android:id="@+id/security_level"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:layout_marginRight="10dp"
+            android:src="@drawable/security_alert_indicator" />
+
+    </RelativeLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_devices.xml b/app/src/main/res/layout/chat_devices.xml
index d76f976d5..85954bbf5 100644
--- a/app/src/main/res/layout/chat_devices.xml
+++ b/app/src/main/res/layout/chat_devices.xml
@@ -48,6 +48,8 @@
         android:layout_height="match_parent"
         android:layout_below="@id/top"
         android:divider="?attr/dividerColor"
+        android:childDivider="?attr/dividerColor"
+        android:dividerHeight="1dp"
         android:groupIndicator="@null" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 0fe5170b8..c36244411 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -11,6 +11,7 @@
         <attr name="primarySubtextLightColor" format="color"/>
 
         <attr name="backgroundColor" format="color"/>
+        <attr name="backgroundColor2" format="color"/>
         <attr name="backgroundContastColor" format="color"/>
         <attr name="dividerColor" format="color"/>
 
diff --git a/app/src/main/res/values/color.xml b/app/src/main/res/values/color.xml
index a492c32cc..f9443534e 100644
--- a/app/src/main/res/values/color.xml
+++ b/app/src/main/res/values/color.xml
@@ -10,6 +10,7 @@
     <color name="colorE">#c4c4c4</color>
     <color name="colorF">#e1e1e1</color>
     <color name="colorG">#f3f3f3</color>
+    <color name="colorG2">#f5f5f5</color>
     <color name="colorH">#ffffff</color>
     <color name="colorI">#ff0000</color>
     <color name="colorJ">#ffa645</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index c7cf51ee5..ce008e215 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -19,6 +19,7 @@
         <item name="primarySubtextLightColor">@color/colorE</item>
 
         <item name="backgroundColor">@color/colorH</item>
+        <item name="backgroundColor2">@color/colorG2</item>
         <item name="backgroundContastColor">@color/colorC</item>
         <item name="dividerColor">@color/colorE</item>
 
@@ -53,6 +54,7 @@
         <item name="primarySubtextLightColor">@color/colorF</item>
 
         <item name="backgroundColor">@color/colorC</item>
+        <item name="backgroundColor2">@color/colorD</item>
         <item name="backgroundContastColor">@color/colorH</item>
         <item name="dividerColor">@color/colorE</item>