diff --git a/res/layout/trusted_credential.xml b/res/layout/trusted_credential.xml
index ea13939bf57..cc146f8195c 100644
--- a/res/layout/trusted_credential.xml
+++ b/res/layout/trusted_credential.xml
@@ -15,37 +15,37 @@
 -->
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
     android:background="?android:attr/selectableItemBackground"
     android:paddingStart="?android:attr/listPreferredItemPaddingStart"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
     android:paddingTop="15dip"
-    android:paddingBottom="15dip">
+    android:paddingBottom="15dip"
+    android:orientation="horizontal">
 
-    <RelativeLayout
-        android:layout_width="0px"
+    <LinearLayout
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_weight="1">
+        android:layout_weight="1"
+        android:orientation="vertical">
 
         <TextView
             android:id="@+id/trusted_credential_subject_primary"
-            android:layout_width="fill_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textAlignment="viewStart"/>
 
         <TextView
             android:id="@+id/trusted_credential_subject_secondary"
-            android:layout_width="fill_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@id/trusted_credential_subject_primary"
-            android:layout_alignStart="@id/trusted_credential_subject_primary"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:attr/textColorSecondary" />
-
-    </RelativeLayout>
+            android:textColor="?android:attr/textColorSecondary"
+            android:textAlignment="viewStart"/>
+    </LinearLayout>
 
     <!-- Switch is invisible and not gone so that the height is consistent between tabs -->
     <Switch