diff --git a/app/src/main/res/layout/fragment_device_list.xml b/app/src/main/res/layout/fragment_device_list.xml
index 5c3ad872b..e32b6771b 100644
--- a/app/src/main/res/layout/fragment_device_list.xml
+++ b/app/src/main/res/layout/fragment_device_list.xml
@@ -27,6 +27,7 @@
         android:id="@+id/text_view_device_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:hint="Device Name"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintTop_toBottomOf="@+id/text_view_your_device"
         app:layout_constraintLeft_toLeftOf="parent"
diff --git a/app/src/main/res/layout/item_transfer_list.xml b/app/src/main/res/layout/item_transfer_list.xml
index 93b291a41..35a5c37e3 100644
--- a/app/src/main/res/layout/item_transfer_list.xml
+++ b/app/src/main/res/layout/item_transfer_list.xml
@@ -12,6 +12,7 @@
       android:layout_height="wrap_content"
       android:gravity="center_vertical"
       android:textColor="#000000"
+      android:hint="File name"
       android:textSize="14sp"
       android:paddingTop="1dp"
       android:paddingBottom="1dp"
diff --git a/app/src/main/res/layout/row_peer_device.xml b/app/src/main/res/layout/row_peer_device.xml
index 82e116fb9..a59e68b14 100644
--- a/app/src/main/res/layout/row_peer_device.xml
+++ b/app/src/main/res/layout/row_peer_device.xml
@@ -9,7 +9,8 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="3"
-        android:gravity="center_vertical"
+        android:gravity="center_horizontal"
+        android:hint="Device Name"
         android:textStyle="bold"
         android:textSize="17sp"
         android:paddingTop="1dp"