diff --git a/app/src/main/res/layout/account_profile_device_list_cell.xml b/app/src/main/res/layout/account_profile_device_list_cell.xml
index ef711a588..1fef8bec3 100644
--- a/app/src/main/res/layout/account_profile_device_list_cell.xml
+++ b/app/src/main/res/layout/account_profile_device_list_cell.xml
@@ -20,13 +20,16 @@
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/header_style"
             android:id="@+id/name"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="23dp"
             android:layout_marginTop="34dp"
             android:text="@{model.name, default=`Pixel 6 Pro`}"
+            android:maxLines="1"
+            android:ellipsize="end"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"/>
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/remove"/>
 
         <androidx.appcompat.widget.AppCompatTextView
             style="@style/tertiary_button_label_style"
@@ -40,7 +43,7 @@
             android:paddingTop="6dp"
             android:paddingBottom="6dp"
             android:gravity="center"
-            android:text="Remove"
+            android:text="@string/manage_account_device_remove"
             android:maxLines="1"
             android:ellipsize="end"
             android:drawableStart="@drawable/trash_simple"
@@ -57,7 +60,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="23dp"
             android:layout_marginTop="30dp"
-            android:text="Last connection:"
+            android:text="@string/manage_account_device_last_connection"
             app:layout_constraintHorizontal_bias="0"
             app:layout_constraintHorizontal_chainStyle="packed"
             app:layout_constraintTop_toBottomOf="@id/name"
diff --git a/app/src/main/res/layout/account_profile_secure_mode_fragment.xml b/app/src/main/res/layout/account_profile_secure_mode_fragment.xml
index 38bd9a712..8ab811853 100644
--- a/app/src/main/res/layout/account_profile_secure_mode_fragment.xml
+++ b/app/src/main/res/layout/account_profile_secure_mode_fragment.xml
@@ -237,7 +237,7 @@
                     android:paddingBottom="21dp"
                     android:paddingStart="17dp"
                     android:paddingEnd="17dp"
-                    android:text="@string/dialog_account_secure_mode_interoperable_summary"
+                    android:text="@string/manage_account_secure_mode_interoperable_summary"
                     android:textSize="14sp"
                     android:gravity="center"
                     app:layout_constraintTop_toBottomOf="@id/interop_mode"
diff --git a/app/src/main/res/layout/assistant_secure_mode_fragment.xml b/app/src/main/res/layout/assistant_secure_mode_fragment.xml
index 5dcc91c63..c032c1b3a 100644
--- a/app/src/main/res/layout/assistant_secure_mode_fragment.xml
+++ b/app/src/main/res/layout/assistant_secure_mode_fragment.xml
@@ -252,7 +252,7 @@
                 android:paddingBottom="21dp"
                 android:paddingStart="17dp"
                 android:paddingEnd="17dp"
-                android:text="@string/dialog_account_secure_mode_interoperable_summary"
+                android:text="@string/manage_account_secure_mode_interoperable_summary"
                 android:textSize="14sp"
                 android:gravity="center"
                 app:layout_constraintTop_toBottomOf="@id/interop_mode"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c8750e55c..7989acce5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -183,7 +183,9 @@
     <string name="manage_account_secure_mode_default_title">Default mode</string>
     <string name="manage_account_secure_mode_interoperable_title">Interoperable mode</string>
     <string name="manage_account_secure_mode_default_summary">Blah</string> <!-- TODO -->
-    <string name="dialog_account_secure_mode_interoperable_summary">Blah</string> <!-- TODO -->
+    <string name="manage_account_secure_mode_interoperable_summary">Blah</string> <!-- TODO -->
+    <string name="manage_account_device_remove">Remove</string>
+    <string name="manage_account_device_last_connection">Last connection:</string>
 
     <string name="friend_presence_status_online">Online</string>
     <string name="friend_presence_status_was_online_on">Online on %s</string>